From 871bea2b1c21a09e5bb4fa91c22a5d48ef2eef56 Mon Sep 17 00:00:00 2001 From: Arjan Tijms Date: Fri, 17 Jun 2022 16:58:58 +0200 Subject: [PATCH 1/8] Implement Jakarta Security glue code. Signed-off-by: Arjan Tijms --- .../batch/glassfish-batch-connector/pom.xml | 4 +- appserver/common/container-common/pom.xml | 6 + .../common/impl/ComponentEnvManagerImpl.java | 931 +++++++++--------- .../javaee/services/CommonResourceProxy.java | 24 +- .../config/ManagedExecutorServiceBase.java | 26 +- appserver/concurrent/concurrent-impl/pom.xml | 4 +- .../ManagedExecutorServiceBaseManager.java | 52 +- .../ManagedExecutorServiceConfig.java | 5 +- ...ManagedScheduledExecutorServiceConfig.java | 5 +- .../connectors-internal-api/pom.xml | 5 + .../internal/api/ConnectorsUtil.java | 79 +- .../connectors/connectors-runtime/pom.xml | 5 + appserver/deployment/dol/pom.xml | 6 +- .../ResourceDescriptorRegistry.java | 159 +-- .../deployment/node/ApplicationNode.java | 53 +- .../node/DeploymentDescriptorNode.java | 118 ++- .../ejb/deployment/node/EjbNode.java | 36 +- appserver/extras/embedded/all/pom.xml | 14 +- .../glassfish-embedded-static-shell/pom.xml | 14 +- appserver/featuresets/glassfish/pom.xml | 18 +- appserver/pom.xml | 38 +- .../web/deployment/node/WebCommonNode.java | 81 +- .../config/support/TranslatedConfigView.java | 30 +- ...SGiObjectInputOutputStreamFactoryImpl.java | 168 ++-- .../deployment/common/JavaEEResourceType.java | 17 +- .../naming/ResourceNamingService.java | 197 ++-- 26 files changed, 1187 insertions(+), 908 deletions(-) diff --git a/appserver/batch/glassfish-batch-connector/pom.xml b/appserver/batch/glassfish-batch-connector/pom.xml index 885938e6aa1..eae7e56a4c5 100755 --- a/appserver/batch/glassfish-batch-connector/pom.xml +++ b/appserver/batch/glassfish-batch-connector/pom.xml @@ -1,6 +1,7 @@ 3.0.0 3.0.0-RC1 + 3.0.0-RC1 2.1.0 @@ -227,17 +228,32 @@ import - - - jakarta.enterprise.concurrent - jakarta.enterprise.concurrent-api - ${jakarta.concurrent-api.version} - - - org.glassfish - jakarta.enterprise.concurrent - ${concurrent.version} - + + + jakarta.enterprise.concurrent + jakarta.enterprise.concurrent-api + ${jakarta.concurrent-api.version} + + + org.glassfish + jakarta.enterprise.concurrent + ${concurrent.version} + + + org.omnifaces + concurrent-connector + ${concurrent2.version} + + + org.omnifaces + concurrent-impl + ${concurrent2.version} + + + org.omnifaces + concurrent-extras + ${concurrent2.version} + diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/WebCommonNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/WebCommonNode.java index 3ced6976945..06bb8c5f346 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/WebCommonNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/WebCommonNode.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2022, 2022 Contributors to the Eclipse Foundation. * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -16,21 +17,69 @@ package org.glassfish.web.deployment.node; -import com.sun.enterprise.deployment.*; -import com.sun.enterprise.deployment.node.*; +import static org.omnifaces.concurrent.deployment.ConcurrencyConstants.CONTEXT_SERVICE; +import static org.omnifaces.concurrent.deployment.ConcurrencyConstants.MANAGED_EXECUTOR; +import static org.omnifaces.concurrent.deployment.ConcurrencyConstants.MANAGED_SCHEDULED_EXECUTOR; +import static org.omnifaces.concurrent.deployment.ConcurrencyConstants.MANAGED_THREAD_FACTORY; + +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; +import java.util.Vector; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.glassfish.web.deployment.descriptor.AppListenerDescriptorImpl; +import org.glassfish.web.deployment.descriptor.ErrorPageDescriptor; +import org.glassfish.web.deployment.descriptor.JspConfigDescriptorImpl; +import org.glassfish.web.deployment.descriptor.LoginConfigurationImpl; +import org.glassfish.web.deployment.descriptor.MimeMappingDescriptor; +import org.glassfish.web.deployment.descriptor.SecurityConstraintImpl; +import org.glassfish.web.deployment.descriptor.ServletFilterDescriptor; +import org.glassfish.web.deployment.descriptor.ServletFilterMappingDescriptor; +import org.glassfish.web.deployment.descriptor.SessionConfigDescriptor; +import org.glassfish.web.deployment.descriptor.TagLibConfigurationDescriptor; +import org.glassfish.web.deployment.descriptor.WebBundleDescriptorImpl; +import org.glassfish.web.deployment.xml.WebTagNames; +import org.omnifaces.concurrent.node.ContextServiceDefinitionNode; +import org.omnifaces.concurrent.node.ManagedExecutorDefinitionNode; +import org.omnifaces.concurrent.node.ManagedScheduledExecutorDefinitionNode; +import org.omnifaces.concurrent.node.ManagedThreadFactoryDefinitionNode; +import org.w3c.dom.Node; + +import com.sun.enterprise.deployment.EnvironmentProperty; +import com.sun.enterprise.deployment.LocaleEncodingMappingDescriptor; +import com.sun.enterprise.deployment.LocaleEncodingMappingListDescriptor; +import com.sun.enterprise.deployment.SecurityRoleDescriptor; +import com.sun.enterprise.deployment.WebComponentDescriptor; +import com.sun.enterprise.deployment.node.AbstractBundleNode; +import com.sun.enterprise.deployment.node.AdministeredObjectDefinitionNode; +import com.sun.enterprise.deployment.node.ConnectionFactoryDefinitionNode; +import com.sun.enterprise.deployment.node.DataSourceDefinitionNode; +import com.sun.enterprise.deployment.node.EjbLocalReferenceNode; +import com.sun.enterprise.deployment.node.EjbReferenceNode; +import com.sun.enterprise.deployment.node.EntityManagerFactoryReferenceNode; +import com.sun.enterprise.deployment.node.EntityManagerReferenceNode; +import com.sun.enterprise.deployment.node.EnvEntryNode; +import com.sun.enterprise.deployment.node.JMSConnectionFactoryDefinitionNode; +import com.sun.enterprise.deployment.node.JMSDestinationDefinitionNode; +import com.sun.enterprise.deployment.node.JndiEnvRefNode; +import com.sun.enterprise.deployment.node.LifecycleCallbackNode; +import com.sun.enterprise.deployment.node.MailSessionNode; +import com.sun.enterprise.deployment.node.MessageDestinationNode; +import com.sun.enterprise.deployment.node.MessageDestinationRefNode; +import com.sun.enterprise.deployment.node.ResourceEnvRefNode; +import com.sun.enterprise.deployment.node.ResourceRefNode; +import com.sun.enterprise.deployment.node.SecurityRoleNode; +import com.sun.enterprise.deployment.node.XMLElement; import com.sun.enterprise.deployment.types.EjbReference; import com.sun.enterprise.deployment.util.DOLUtils; import com.sun.enterprise.deployment.web.LoginConfiguration; import com.sun.enterprise.deployment.web.SessionConfig; import com.sun.enterprise.deployment.xml.TagNames; import com.sun.enterprise.deployment.xml.WebServicesTagNames; -import org.glassfish.web.deployment.descriptor.*; -import org.glassfish.web.deployment.xml.WebTagNames; -import org.w3c.dom.Node; - -import java.util.*; -import java.util.logging.Level; -import java.util.logging.Logger; /** * This node is responsible for handling the web-common xml tree @@ -96,6 +145,11 @@ protected WebCommonNode() { registerElementHandler(new XMLElement(TagNames.JMS_DESTINATION), JMSDestinationDefinitionNode.class, "addResourceDescriptor"); registerElementHandler(new XMLElement(TagNames.MAIL_SESSION), MailSessionNode.class, "addResourceDescriptor"); registerElementHandler(new XMLElement(TagNames.ADMINISTERED_OBJECT), AdministeredObjectDefinitionNode.class, "addResourceDescriptor"); + + registerElementHandler(new XMLElement(MANAGED_EXECUTOR), ManagedExecutorDefinitionNode.class, "addResourceDescriptor"); + registerElementHandler(new XMLElement(MANAGED_THREAD_FACTORY), ManagedThreadFactoryDefinitionNode.class, "addResourceDescriptor"); + registerElementHandler(new XMLElement(MANAGED_SCHEDULED_EXECUTOR), ManagedScheduledExecutorDefinitionNode.class, "addResourceDescriptor"); + registerElementHandler(new XMLElement(CONTEXT_SERVICE), ContextServiceDefinitionNode.class, "addResourceDescriptor"); } /** @@ -104,6 +158,7 @@ protected WebCommonNode() { * * @param newDescriptor the new descriptor */ + @Override public void addDescriptor(Object newDescriptor) { Logger logger = DOLUtils.getDefaultLogger(); if (newDescriptor instanceof EjbReference) { @@ -162,6 +217,7 @@ public void addDescriptor(Object newDescriptor) { * @param element the xml element * @param value it's associated value */ + @Override public void setElementValue(XMLElement element, String value) { if (WebTagNames.WELCOME_FILE.equals(element.getQName())) { descriptor.addWelcomeFile(value); @@ -181,7 +237,7 @@ void addServletMapping(String servletName, String urlPattern) { servletMappings = new HashMap>(); } if (servletMappings.containsKey(servletName)) { - ((Vector) servletMappings.get(servletName)).add(urlPattern); + servletMappings.get(servletName).add(urlPattern); } else { Vector mappings = new Vector(); mappings.add(urlPattern); @@ -195,6 +251,7 @@ void addServletMapping(String servletName, String urlPattern) { * @param element the xml tag identification * @return true if this node is done processing the XML sub tree */ + @Override public boolean endElement(XMLElement element) { if (WebTagNames.DISTRIBUTABLE.equals(element.getQName())) { descriptor.setDistributable(true); @@ -226,6 +283,7 @@ public boolean endElement(XMLElement element) { * @param webBundleDesc descriptor to write * @return the DOM tree top node */ + @Override public Node writeDescriptor(Node parent, T webBundleDesc) { Node jarNode = super.writeDescriptor(parent, webBundleDesc); @@ -429,8 +487,9 @@ static void addInitParam(Node parentNode, String nodeName, Enumeration initParam /** * @return the default spec version level this node complies to */ + @Override public String getSpecVersion() { return SPEC_VERSION; } -} +} \ No newline at end of file diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TranslatedConfigView.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TranslatedConfigView.java index 4872354f854..4123cafc907 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TranslatedConfigView.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TranslatedConfigView.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2022, 2022 Contributors to the Eclipse Foundation. * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -16,25 +17,25 @@ package org.glassfish.config.support; -import com.sun.enterprise.security.store.DomainScopedPasswordAliasStore; -import org.glassfish.api.admin.PasswordAliasStore; -import org.jvnet.hk2.config.ConfigView; -import org.jvnet.hk2.config.ConfigBeanProxy; -//import org.glassfish.security.common.RelativePathResolver; -import org.glassfish.hk2.api.ServiceLocator; - -import java.util.regex.Pattern; -import java.util.regex.Matcher; -import java.util.logging.Logger; +import java.io.IOException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.security.AccessController; import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; +import java.security.PrivilegedAction; import java.security.UnrecoverableKeyException; import java.security.cert.CertificateException; -import java.io.IOException; -import java.security.PrivilegedAction; +import java.util.logging.Logger; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +//import org.glassfish.security.common.RelativePathResolver; +import org.glassfish.hk2.api.ServiceLocator; +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.ConfigView; + +import com.sun.enterprise.security.store.DomainScopedPasswordAliasStore; /** * View that translate configured attributes containing properties like ${foo.bar} into system properties values. @@ -48,6 +49,10 @@ public class TranslatedConfigView implements ConfigView { private static final String ALIAS_TOKEN = "ALIAS"; private static int MAX_SUBSTITUTION_DEPTH = 100; + public static String expandValue(String value) { + return (String) getTranslatedValue(value); + } + public static Object getTranslatedValue(Object value) { if (value != null && value instanceof String) { String stringValue = value.toString(); @@ -130,6 +135,7 @@ public static void setHabitat(ServiceLocator h) { private static DomainScopedPasswordAliasStore domainPasswordAliasStore() { domainPasswordAliasStore = AccessController.doPrivileged(new PrivilegedAction() { + @Override public DomainScopedPasswordAliasStore run() { return habitat.getService(DomainScopedPasswordAliasStore.class); } diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/OSGiObjectInputOutputStreamFactoryImpl.java b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/OSGiObjectInputOutputStreamFactoryImpl.java index 1fdac8141a6..585d73aa7c3 100644 --- a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/OSGiObjectInputOutputStreamFactoryImpl.java +++ b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/OSGiObjectInputOutputStreamFactoryImpl.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2022, 2022 Contributors to the Eclipse Foundation. * Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -16,6 +17,22 @@ package org.glassfish.common.util; +import static com.sun.enterprise.util.Utility.getClassLoader; +import static java.security.AccessController.doPrivileged; +import static java.util.logging.Level.FINER; +import static java.util.logging.Level.WARNING; + +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.ObjectStreamClass; +import java.io.OutputStream; +import java.lang.reflect.Array; +import java.security.PrivilegedExceptionAction; +import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Logger; + import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleEvent; @@ -26,17 +43,10 @@ import com.sun.enterprise.util.CULoggerInfo; -import java.io.*; -import java.lang.reflect.Array; -import java.util.concurrent.ConcurrentHashMap; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * @author Sanjeeb.Sahoo@Sun.COM */ -public class OSGiObjectInputOutputStreamFactoryImpl - implements ObjectInputOutputStreamFactory { +public class OSGiObjectInputOutputStreamFactoryImpl implements ObjectInputOutputStreamFactory { private static final Logger logger = CULoggerInfo.getLogger(); @@ -49,53 +59,41 @@ public class OSGiObjectInputOutputStreamFactoryImpl // private static final long NOT_A_BUNDLE_ID = -1; private static final String NOT_A_BUNDLE_KEY = ":"; - public OSGiObjectInputOutputStreamFactoryImpl(BundleContext ctx) - { + public OSGiObjectInputOutputStreamFactoryImpl(BundleContext ctx) { this.ctx = ctx; ServiceReference ref = ctx.getServiceReference(PackageAdmin.class.getName()); pkgAdm = PackageAdmin.class.cast(ctx.getService(ref)); - BundleTracker bt = new BundleTracker(ctx, Bundle.INSTALLED | Bundle.RESOLVED | Bundle.STARTING | Bundle.ACTIVE, new BundleTrackerCustomizer() { - - @Override - public void modifiedBundle(Bundle bundle, BundleEvent bundleEvent, Object o) { - } - - @Override - public Object addingBundle(Bundle bundle, BundleEvent bundleEvent) { - String key = makeKey(bundle); - name2Id.put(key, bundle.getBundleId()); - if (logger != null && logger.isLoggable(Level.FINER)) { - logger.log(Level.FINER, "BundleTracker.addingBundle BUNDLE " + key + " ==> " + bundle.getBundleId() + " for " + bundle.getSymbolicName()); - } - return null; - } - - @Override - public void removedBundle(Bundle bundle, BundleEvent bundleEvent, Object o) { - String key = makeKey(bundle); - Long bundleID = name2Id.remove(key); - if (logger.isLoggable(Level.FINER)) { - logger.log(Level.FINER, "BundleTracker.removedBundle BUNDLE " + key + " ==> " + bundle.getSymbolicName()); - } - if (bundleID == null) { - logger.log(Level.WARNING, CULoggerInfo.NULL_BUNDLE, key); - } - } - /* - @Override - public Object addingBundle(Bundle bundle, BundleEvent event) { - System.out.println("ADDING BUNDLE ==> " + bundle.getSymbolicName()); - return super.addingBundle(bundle, event); //To change body of overridden methods use File | Settings | File Templates. - } - - @Override - public void removedBundle(Bundle bundle, BundleEvent event, Object object) { - System.out.println("REMOVING BUNDLE ==> " + bundle.getSymbolicName()); - super.removedBundle(bundle, event, object); //To change body of overridden methods use File | Settings | File Templates. - } - */ - }); + BundleTracker bt = new BundleTracker(ctx, Bundle.INSTALLED | Bundle.RESOLVED | Bundle.STARTING | Bundle.ACTIVE, + new BundleTrackerCustomizer() { + + @Override + public void modifiedBundle(Bundle bundle, BundleEvent bundleEvent, Object o) { + } + + @Override + public Object addingBundle(Bundle bundle, BundleEvent bundleEvent) { + String key = makeKey(bundle); + name2Id.put(key, bundle.getBundleId()); + if (logger != null && logger.isLoggable(FINER)) { + logger.log(FINER, "BundleTracker.addingBundle BUNDLE " + key + " ==> " + bundle.getBundleId() + " for " + + bundle.getSymbolicName()); + } + return null; + } + + @Override + public void removedBundle(Bundle bundle, BundleEvent bundleEvent, Object o) { + String key = makeKey(bundle); + Long bundleID = name2Id.remove(key); + if (logger.isLoggable(FINER)) { + logger.log(FINER, "BundleTracker.removedBundle BUNDLE " + key + " ==> " + bundle.getSymbolicName()); + } + if (bundleID == null) { + logger.log(WARNING, CULoggerInfo.NULL_BUNDLE, key); + } + } + }); bt.open(); @@ -105,33 +103,29 @@ private String makeKey(Bundle bundle) { return bundle.getSymbolicName() + ":" + bundle.getVersion(); } - public ObjectInputStream createObjectInputStream(InputStream in) - throws IOException - { + @Override + public ObjectInputStream createObjectInputStream(InputStream in) throws IOException { ClassLoader loader = Thread.currentThread().getContextClassLoader(); + if (loader == null) { + loader = getClassLoader(); + } return new OSGiObjectInputStream(in, loader); } - public ObjectOutputStream createObjectOutputStream(OutputStream out) - throws IOException - { + @Override + public ObjectOutputStream createObjectOutputStream(OutputStream out) throws IOException { return new OSGiObjectOutputStream(out); } - private class OSGiObjectInputStream extends ObjectInputStreamWithLoader - { + private class OSGiObjectInputStream extends ObjectInputStreamWithLoader { - public OSGiObjectInputStream(InputStream in, ClassLoader loader) throws IOException - { + public OSGiObjectInputStream(InputStream in, ClassLoader loader) throws IOException { super(in, loader); } @Override - protected Class resolveClass(ObjectStreamClass desc) - throws IOException, ClassNotFoundException - { - Class clazz = - OSGiObjectInputOutputStreamFactoryImpl.this.resolveClass(this, desc); + protected Class resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException { + Class clazz = OSGiObjectInputOutputStreamFactoryImpl.this.resolveClass(this, desc); if (clazz == null) { clazz = super.resolveClass(desc); @@ -144,25 +138,21 @@ protected Class resolveClass(ObjectStreamClass desc) private class OSGiObjectOutputStream extends ObjectOutputStream { - - private OSGiObjectOutputStream(OutputStream out) throws IOException - { + private OSGiObjectOutputStream(OutputStream out) throws IOException { super(out); } @Override - protected void annotateClass(Class cl) throws IOException - { + protected void annotateClass(Class cl) throws IOException { OSGiObjectInputOutputStreamFactoryImpl.this.annotateClass(this, cl); } } - public Class resolveClass(ObjectInputStream in, final ObjectStreamClass desc) - throws IOException, ClassNotFoundException - { + @Override + public Class resolveClass(ObjectInputStream in, final ObjectStreamClass desc) throws IOException, ClassNotFoundException { String key = in.readUTF(); - if (! NOT_A_BUNDLE_KEY.equals(key)) { + if (!NOT_A_BUNDLE_KEY.equals(key)) { Long bundleId = name2Id.get(key); if (bundleId != null) { final Bundle b = ctx.getBundle(bundleId); @@ -178,8 +168,8 @@ public Class resolveClass(ObjectInputStream in, final ObjectStreamClass desc) return null; } - public void annotateClass(ObjectOutputStream out, Class cl) throws IOException - { + @Override + public void annotateClass(ObjectOutputStream out, Class cl) throws IOException { String key = NOT_A_BUNDLE_KEY; Bundle b = pkgAdm.getBundle(cl); if (b != null) { @@ -190,12 +180,12 @@ public void annotateClass(ObjectOutputStream out, Class cl) throws IOExceptio private Class loadArrayClass(Bundle b, String cname) throws ClassNotFoundException { // We are never called with primitive types, so we don't have to check for primitive types. - assert(cname.charAt(0) == 'L'); // An array - Class component; // component class - int dcount; // dimension - for (dcount = 1; cname.charAt(dcount) == '['; dcount++){ + assert (cname.charAt(0) == 'L'); // An array + Class component; // component class + int dcount; // dimension + for (dcount = 1; cname.charAt(dcount) == '['; dcount++) { } - assert(cname.charAt(dcount) == 'L'); + assert (cname.charAt(dcount) == 'L'); component = loadClassFromBundle(b, cname.substring(dcount + 1, cname.length() - 1)); int dim[] = new int[dcount]; for (int i = 0; i < dcount; i++) { @@ -209,15 +199,15 @@ private Class loadClassFromBundle(final Bundle b, final String cname) throws Cla return b.loadClass(cname); } else { try { - return (Class) java.security.AccessController.doPrivileged( - new java.security.PrivilegedExceptionAction() { - public java.lang.Object run() throws ClassNotFoundException { - return b.loadClass(cname); - } - }); + return (Class) doPrivileged(new PrivilegedExceptionAction() { + @Override + public Object run() throws ClassNotFoundException { + return b.loadClass(cname); + } + }); } catch (java.security.PrivilegedActionException pae) { throw (ClassNotFoundException) pae.getException(); } } } -} +} \ No newline at end of file diff --git a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/JavaEEResourceType.java b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/JavaEEResourceType.java index 06a19e3fa44..03a06256bbf 100644 --- a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/JavaEEResourceType.java +++ b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/JavaEEResourceType.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2022, 2022 Contributors to the Eclipse Foundation. * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -17,11 +18,7 @@ package org.glassfish.deployment.common; /** - * Created with IntelliJ IDEA. - * User: naman - * Date: 5/9/12 - * Time: 2:33 PM - * To change this template use File | Settings | File Templates. + * @author naman */ public enum JavaEEResourceType { /** @@ -35,5 +32,13 @@ public enum JavaEEResourceType { * JMSDD: JMSDestinationDefinitionDescriptor * AODD: AdministeredObjectDefinitionDescriptor */ - MSD, DSD, DSDPOOL, CFD, CFDPOOL, JMSCFDD, JMSCFDDPOOL, JMSDD, AODD; + MSD, DSD, DSDPOOL, CFD, CFDPOOL, JMSCFDD, JMSCFDDPOOL, JMSDD, AODD, + + CSDD, + + MEDD, + + MTFDD, + + MSEDD, } diff --git a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/naming/ResourceNamingService.java b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/naming/ResourceNamingService.java index 1faf5e5def0..b265707f151 100644 --- a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/naming/ResourceNamingService.java +++ b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/naming/ResourceNamingService.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2022, 2022 Contributors to the Eclipse Foundation. * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -16,55 +17,43 @@ package org.glassfish.resourcebase.resources.naming; -import com.sun.logging.LogDomains; +import static java.util.logging.Level.FINEST; + +import java.util.ArrayList; +import java.util.Hashtable; +import java.util.List; +import java.util.logging.Logger; + +import javax.naming.InitialContext; +import javax.naming.NameNotFoundException; +import javax.naming.NamingException; + import org.glassfish.api.admin.ProcessEnvironment; import org.glassfish.api.naming.ComponentNamingUtil; import org.glassfish.api.naming.GlassfishNamingManager; import org.glassfish.api.naming.JNDIBinding; +import org.glassfish.logging.annotation.LogMessagesResourceBundle; +import org.glassfish.logging.annotation.LoggerInfo; import org.glassfish.resourcebase.resources.api.GenericResourceInfo; import org.glassfish.resourcebase.resources.api.ResourceInfo; import org.jvnet.hk2.annotations.Service; import jakarta.inject.Inject; -import javax.naming.InitialContext; -import javax.naming.NameNotFoundException; -import javax.naming.NamingException; -import java.util.ArrayList; -import java.util.Hashtable; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.glassfish.resourcebase.resources.ResourceLoggingConstansts; -import org.glassfish.logging.annotation.LoggerInfo; -import org.glassfish.logging.annotation.LogMessagesResourceBundle; - /** - * Resource naming service which helps to bind resources and internal resource objects - * to appropriate namespace in JNDI. Supports "java:app", "java:module" and normal(physical) - * names. + * Resource naming service which helps to bind resources and internal resource objects to appropriate namespace in JNDI. + * Supports "java:app", "java:module" and normal(physical) names. + * * @author Jagadish Ramu * */ @Service public class ResourceNamingService { - //TODO ASR introduce contract for this service and refactor this service to connector-runtime ? - @Inject - private GlassfishNamingManager namingManager; - - @Inject - private ComponentNamingUtil cnu; - - @Inject - private ProcessEnvironment pe; - @LogMessagesResourceBundle public static final String LOGMESSAGE_RESOURCE = "org.glassfish.resourcebase.resources.LogMessages"; - @LoggerInfo(subsystem="RESOURCE", description="Nucleus Resource", publish=true) - + @LoggerInfo(subsystem = "RESOURCE", description = "Nucleus Resource", publish = true) public static final String LOGGER = "jakarta.enterprise.resources.naming"; private static final Logger _logger = Logger.getLogger(LOGGER, LOGMESSAGE_RESOURCE); @@ -73,178 +62,170 @@ public class ResourceNamingService { public static final String JAVA_MODULE_SCOPE_PREFIX = "java:module/"; public static final String JAVA_GLOBAL_SCOPE_PREFIX = "java:global/"; + // TODO ASR introduce contract for this service and refactor this service to connector-runtime ? + @Inject + private GlassfishNamingManager namingManager; + + @Inject + private ComponentNamingUtil componentNamingUtil; + + @Inject + private ProcessEnvironment processEnvironment; - public void publishObject(GenericResourceInfo resourceInfo, String jndiName, Object object,boolean rebind) - throws NamingException{ + public void publishObject(GenericResourceInfo resourceInfo, String jndiName, Object object, boolean rebind) throws NamingException { String applicationName = resourceInfo.getApplicationName(); String moduleName = resourceInfo.getModuleName(); moduleName = org.glassfish.resourcebase.resources.util.ResourceUtil.getActualModuleName(moduleName); - if(!isGlobalName(resourceInfo.getName()) && applicationName != null && moduleName != null ){ + if (resourceInfo.getName().startsWith(JAVA_MODULE_SCOPE_PREFIX) && applicationName != null && moduleName != null) { Object alreadyBoundObject = null; - if(rebind){ - try{ + if (rebind) { + try { namingManager.unbindModuleObject(applicationName, moduleName, getModuleScopedName(jndiName)); - }catch(NameNotFoundException e){ - //ignore + } catch (NameNotFoundException e) { + // ignore } - }else{ + } else { try { - alreadyBoundObject = namingManager.lookupFromModuleNamespace(applicationName, - moduleName, getModuleScopedName(jndiName), null); + alreadyBoundObject = + namingManager.lookupFromModuleNamespace( + applicationName, moduleName, getModuleScopedName(jndiName), null); } catch (NameNotFoundException e) { - //ignore + // ignore } + if (alreadyBoundObject != null) { - throw new NamingException("Object already bound for jndiName " + - "[ " + jndiName + " ] of module namespace [" + moduleName+ "] " + - "of application ["+applicationName+"] "); + throw new NamingException("Object already bound for jndiName " + "[ " + jndiName + " ] of module namespace [" + + moduleName + "] " + "of application [" + applicationName + "] "); } } JNDIBinding bindings = new ModuleScopedResourceBinding(getModuleScopedName(jndiName), object); List list = new ArrayList(); list.add(bindings); - if(_logger.isLoggable(Level.FINEST)){ - debug("application=" + applicationName + ", module name=" +moduleName+", binding name=" + jndiName); + if (_logger.isLoggable(FINEST)) { + debug("application=" + applicationName + ", module name=" + moduleName + ", binding name=" + jndiName); } namingManager.bindToModuleNamespace(applicationName, moduleName, list); - }else if(!isGlobalName(resourceInfo.getName()) && applicationName != null ) { + } else if (!isGlobalName(resourceInfo.getName()) && applicationName != null) { Object alreadyBoundObject = null; - if(rebind){ - try{ + if (rebind) { + try { namingManager.unbindAppObject(applicationName, getAppScopedName(jndiName)); - }catch(NameNotFoundException e){ - //ignore + } catch (NameNotFoundException e) { + // ignore } - }else{ + } else { try { - alreadyBoundObject = namingManager.lookupFromAppNamespace(applicationName, - getAppScopedName(jndiName), null); + alreadyBoundObject = namingManager.lookupFromAppNamespace(applicationName, getAppScopedName(jndiName), null); } catch (NameNotFoundException e) { - //ignore + // ignore } if (alreadyBoundObject != null) { - throw new NamingException("Object already bound for jndiName " + - "[ " + jndiName + " ] of application's namespace [" + applicationName + "]"); + throw new NamingException("Object already bound for jndiName " + "[ " + jndiName + " ] of application's namespace [" + + applicationName + "]"); } } JNDIBinding bindings = new ApplicationScopedResourceBinding(getAppScopedName(jndiName), object); List list = new ArrayList(); list.add(bindings); - if(_logger.isLoggable(Level.FINEST)){ + if (_logger.isLoggable(FINEST)) { debug("application=" + applicationName + ", binding name=" + jndiName); } namingManager.bindToAppNamespace(applicationName, list); bindAppScopedNameForAppclient(object, jndiName, applicationName); - }else{ + } else { namingManager.publishObject(jndiName, object, true); } } - public void publishObject(ResourceInfo resourceInfo, Object object,boolean rebind) throws NamingException{ + public void publishObject(ResourceInfo resourceInfo, Object object, boolean rebind) throws NamingException { String jndiName = resourceInfo.getName(); publishObject(resourceInfo, jndiName, object, rebind); } - private void bindAppScopedNameForAppclient(Object object, String jndiName, String applicationName) - throws NamingException { - String internalGlobalJavaAppName = - cnu.composeInternalGlobalJavaAppName(applicationName, getAppScopedName(jndiName)); - if(_logger.isLoggable(Level.FINEST)){ + private void bindAppScopedNameForAppclient(Object object, String jndiName, String applicationName) throws NamingException { + String internalGlobalJavaAppName = componentNamingUtil.composeInternalGlobalJavaAppName(applicationName, getAppScopedName(jndiName)); + if (_logger.isLoggable(FINEST)) { debug("binding app-scoped-resource for appclient : " + internalGlobalJavaAppName); } namingManager.publishObject(internalGlobalJavaAppName, object, true); } - public void unpublishObject(GenericResourceInfo resourceInfo, String jndiName) throws NamingException { String applicationName = resourceInfo.getApplicationName(); String moduleName = resourceInfo.getModuleName(); moduleName = org.glassfish.resourcebase.resources.util.ResourceUtil.getActualModuleName(moduleName); - if(!isGlobalName(resourceInfo.getName()) && applicationName != null && moduleName != null){ + if (!isGlobalName(resourceInfo.getName()) && applicationName != null && moduleName != null) { namingManager.unbindModuleObject(applicationName, moduleName, getModuleScopedName(jndiName)); - }else if(!isGlobalName(resourceInfo.getName()) && applicationName != null) { + } else if (!isGlobalName(resourceInfo.getName()) && applicationName != null) { namingManager.unbindAppObject(applicationName, getAppScopedName(jndiName)); unbindAppScopedNameForAppclient(jndiName, applicationName); - }else{ + } else { namingManager.unpublishObject(jndiName); } } private void unbindAppScopedNameForAppclient(String jndiName, String applicationName) throws NamingException { - String internalGlobalJavaAppName = - cnu.composeInternalGlobalJavaAppName(applicationName, getAppScopedName(jndiName)); + String internalGlobalJavaAppName = componentNamingUtil.composeInternalGlobalJavaAppName(applicationName, getAppScopedName(jndiName)); namingManager.unpublishObject(internalGlobalJavaAppName); } private boolean isGlobalName(String jndiName) { return jndiName.startsWith(JAVA_GLOBAL_SCOPE_PREFIX) || - (!jndiName.startsWith(JAVA_APP_SCOPE_PREFIX) && - !jndiName.startsWith(JAVA_MODULE_SCOPE_PREFIX)); + (!jndiName.startsWith(JAVA_APP_SCOPE_PREFIX) && !jndiName.startsWith(JAVA_MODULE_SCOPE_PREFIX)); } - public Object lookup(GenericResourceInfo resourceInfo, String name, Hashtable env) throws NamingException{ + public Object lookup(GenericResourceInfo resourceInfo, String name, Hashtable env) throws NamingException { String applicationName = resourceInfo.getApplicationName(); String moduleName = resourceInfo.getModuleName(); moduleName = org.glassfish.resourcebase.resources.util.ResourceUtil.getActualModuleName(moduleName); - if(!isGlobalName(resourceInfo.getName()) && applicationName != null && moduleName != null){ + if (!isGlobalName(resourceInfo.getName()) && applicationName != null && moduleName != null) { return namingManager.lookupFromModuleNamespace(applicationName, moduleName, getModuleScopedName(name), env); - }else if(!isGlobalName(resourceInfo.getName()) && applicationName != null) { - if(pe.getProcessType().isServer() || pe.getProcessType().isEmbedded()){ + } + + if (!isGlobalName(resourceInfo.getName()) && applicationName != null) { + if (processEnvironment.getProcessType().isServer() || processEnvironment.getProcessType().isEmbedded()) { return namingManager.lookupFromAppNamespace(applicationName, getAppScopedName(name), env); - }else{ - String internalGlobalJavaAppName = - cnu.composeInternalGlobalJavaAppName(applicationName, getAppScopedName(name)); - if(_logger.isLoggable(Level.FINEST)){ - debug("appclient lookup : " + internalGlobalJavaAppName); - } - return namingManager.getInitialContext().lookup(internalGlobalJavaAppName); } - }else{ - if(env != null){ - InitialContext ic = new InitialContext(env); - return ic.lookup(name); - }else{ - return namingManager.getInitialContext().lookup(name); + + String internalGlobalJavaAppName = componentNamingUtil.composeInternalGlobalJavaAppName(applicationName, getAppScopedName(name)); + if (_logger.isLoggable(FINEST)) { + debug("appclient lookup : " + internalGlobalJavaAppName); } - } - } - public Object lookup(GenericResourceInfo resourceInfo, String name) throws NamingException{ - return lookup(resourceInfo, name, null); - } + return namingManager.getInitialContext().lookup(internalGlobalJavaAppName); - private String getModuleScopedName(String name){ + } -/* - if(!name.startsWith(JAVA_MODULE_SCOPE_PREFIX) && !name.startsWith(JAVA_GLOBAL_SCOPE_PREFIX)){ - return JAVA_MODULE_SCOPE_PREFIX+name; + if (env != null) { + return new InitialContext(env).lookup(name); } -*/ - return name; + return namingManager.getInitialContext().lookup(name); + } - private String getAppScopedName(String name){ + public Object lookup(GenericResourceInfo resourceInfo, String name) throws NamingException { + return lookup(resourceInfo, name, null); + } -/* - if(!name.startsWith(JAVA_APP_SCOPE_PREFIX) && !name.startsWith(JAVA_GLOBAL_SCOPE_PREFIX)){ - return JAVA_APP_SCOPE_PREFIX+name; - } -*/ + private String getModuleScopedName(String name) { + return name; + } + private String getAppScopedName(String name) { return name; } private void debug(String message) { - if(_logger.isLoggable(Level.FINEST)) { + if (_logger.isLoggable(FINEST)) { _logger.finest("[ASR] [ResourceNamingService] : " + message); } } -} +} \ No newline at end of file From 00fd115af74d045dd58dc552e6a8305adb785cae Mon Sep 17 00:00:00 2001 From: Arjan Tijms Date: Sun, 19 Jun 2022 00:09:26 +0200 Subject: [PATCH 2/8] Splitting out dol-core Signed-off-by: Arjan Tijms --- .../amx/impl/j2ee/RegistrationSupport.java | 11 +- .../common/impl/ComponentEnvManagerImpl.java | 2 +- .../impl/EntityManagerFactoryWrapper.java | 7 +- .../common/impl/JavaModuleNamingProxy.java | 8 +- .../javaee/services/CommonResourceProxy.java | 2 +- .../javaee/services/JMSCFResourcePMProxy.java | 3 +- .../connectors/connectors-runtime/pom.xml | 5 + .../AdministeredObjectDefinitionHandler.java | 31 +++- .../ConnectionFactoryDefinitionHandler.java | 31 +++- appserver/deployment/dol-core/pom.xml | 92 +++++++++++ .../deployment/core}/MetadataSource.java | 2 +- .../deployment/core}/ResourceDescriptor.java | 2 +- .../core}/ResourcePropertyDescriptor.java | 2 +- appserver/deployment/dol/pom.xml | 16 ++ .../AbstractConnectorResourceDescriptor.java | 2 + ...dministeredObjectDefinitionDescriptor.java | 1 + .../ApplicationClientDescriptor.java | 1 + .../CommonResourceBundleDescriptor.java | 2 + .../deployment/CommonResourceDescriptor.java | 3 + ...ConnectionFactoryDefinitionDescriptor.java | 1 + .../DataSourceDefinitionDescriptor.java | 2 + .../deployment/EnvironmentProperty.java | 1 + .../deployment/InjectionTarget.java | 1 + ...ConnectionFactoryDefinitionDescriptor.java | 1 + .../JMSDestinationDefinitionDescriptor.java | 1 + .../deployment/JndiNameEnvironment.java | 3 + .../LifecycleCallbackDescriptor.java | 2 + .../deployment/MailSessionDescriptor.java | 2 + .../ResourceDescriptorRegistry.java | 1 + .../WritableJndiNameEnvironment.java | 1 + .../annotation/context/EjbBundleContext.java | 7 +- .../context/ResourceContainerContext.java | 10 +- .../context/ResourceContainerContextImpl.java | 14 +- .../AnnotatedElementHandlerFactory.java | 6 +- .../handlers/DeclareRolesHandler.java | 7 +- .../EntityManagerFactoryReferenceHandler.java | 3 +- .../EntityManagerReferenceHandler.java | 3 +- .../handlers/ManagedBeanHandler.java | 6 +- .../handlers/PostConstructHandler.java | 3 +- .../handlers/PreDestroyHandler.java | 3 +- .../annotation/handlers/ResourceHandler.java | 9 +- .../PersistenceDeploymentDescriptorFile.java | 7 +- ...LSWebServicesDeploymentDescriptorFile.java | 6 +- .../deployment/node/AbstractBundleNode.java | 5 +- .../deployment/node/ApplicationNode.java | 8 +- .../node/ContextServiceDefinitionNode.java | 55 +++++++ .../node/DeploymentDescriptorNode.java | 9 +- .../node/ManagedExecutorDefinitionNode.java | 57 +++++++ ...anagedScheduledExecutorDefinitionNode.java | 80 +++++++++ .../ManagedThreadFactoryDefinitionNode.java | 80 +++++++++ .../deployment/node/ResourcePropertyNode.java | 7 +- .../node/appclient/AppClientNode.java | 2 +- .../node/connector/AdminObjectNode.java | 5 +- .../node/connector/ConfigPropertyNode.java | 8 +- .../node/runtime/AppClientRuntimeNode.java | 2 +- .../node/runtime/ServiceRefNode.java | 7 +- .../WebServiceEndpointRuntimeNode.java | 9 +- .../gf/ApplicationRuntimeNode.java | 2 +- .../node/runtime/common/MessageNode.java | 8 +- .../deployment/node/ws/WLServiceRefNode.java | 7 +- .../deployment/node/ws/WLWebServiceNode.java | 5 +- .../node/ws/WLWebServicesDescriptorNode.java | 4 +- .../util/AppClientTracerVisitor.java | 4 +- .../deployment/util/ApplicationValidator.java | 23 ++- .../deployment/util/ComponentVisitor.java | 3 +- .../deployment/util/DefaultDOLVisitor.java | 9 +- .../deployment/util/ManagedBeanVisitor.java | 5 +- .../util/ModuleContentValidator.java | 5 +- .../deployment/util/ResourceValidator.java | 22 ++- appserver/deployment/pom.xml | 2 +- .../InternalInterceptorBindingImpl.java | 8 +- .../annotation/handlers/EJBHandler.java | 2 +- .../deployment/descriptor/EjbDescriptor.java | 2 +- .../deployment/node/EjbInterceptorNode.java | 2 +- .../ejb/deployment/node/EjbNode.java | 82 +++++---- .../node/runtime/EjbBundleRuntimeNode.java | 2 +- appserver/extras/embedded/all/pom.xml | 6 + appserver/featuresets/web/pom.xml | 11 ++ .../handlers/DataSourceDefinitionHandler.java | 10 +- ...JMSConnectionFactoryDefinitionHandler.java | 116 ++++++------- .../JMSDestinationDefinitionHandler.java | 114 ++++++------- appserver/pom.xml | 2 +- .../handler/MailSessionDefinitionHandler.java | 107 ++++++------ .../web/TomcatDeploymentConfig.java | 12 +- .../web/WebModuleContextConfig.java | 6 +- .../descriptor/WebBundleDescriptorImpl.java | 27 ++- .../WebComponentDescriptorImpl.java | 7 +- .../descriptor/WebFragmentDescriptor.java | 19 ++- .../web/deployment/node/WebBundleNode.java | 5 +- .../web/deployment/node/WebCommonNode.java | 155 +++++++++--------- .../node/runtime/gf/WebBundleRuntimeNode.java | 2 +- .../util/WebBundleTracerVisitor.java | 6 +- .../deployment/util/WebBundleValidator.java | 7 +- 93 files changed, 1083 insertions(+), 383 deletions(-) create mode 100755 appserver/deployment/dol-core/pom.xml rename appserver/deployment/{dol/src/main/java/com/sun/enterprise/deployment => dol-core/src/main/java/com/sun/enterprise/deployment/core}/MetadataSource.java (95%) rename appserver/deployment/{dol/src/main/java/com/sun/enterprise/deployment => dol-core/src/main/java/com/sun/enterprise/deployment/core}/ResourceDescriptor.java (97%) rename appserver/deployment/{dol/src/main/java/com/sun/enterprise/deployment => dol-core/src/main/java/com/sun/enterprise/deployment/core}/ResourcePropertyDescriptor.java (97%) create mode 100644 appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ContextServiceDefinitionNode.java create mode 100644 appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ManagedExecutorDefinitionNode.java create mode 100644 appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ManagedScheduledExecutorDefinitionNode.java create mode 100644 appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ManagedThreadFactoryDefinitionNode.java diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/RegistrationSupport.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/RegistrationSupport.java index ac928baea2b..5fd328c1713 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/RegistrationSupport.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/RegistrationSupport.java @@ -23,9 +23,18 @@ import com.sun.enterprise.config.serverbeans.ResourcePool; import com.sun.enterprise.config.serverbeans.ResourceRef; import com.sun.enterprise.config.serverbeans.Server; -import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.Application; +import com.sun.enterprise.deployment.ApplicationClientDescriptor; +import com.sun.enterprise.deployment.BundleDescriptor; +import com.sun.enterprise.deployment.ConnectorDescriptor; +import com.sun.enterprise.deployment.EjbBundleDescriptor; +import com.sun.enterprise.deployment.EjbDescriptor; +import com.sun.enterprise.deployment.EjbSessionDescriptor; +import com.sun.enterprise.deployment.WebBundleDescriptor; +import com.sun.enterprise.deployment.WebComponentDescriptor; import com.sun.enterprise.deployment.archivist.Archivist; import com.sun.enterprise.deployment.archivist.ArchivistFactory; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.io.DeploymentDescriptorFile; import java.io.ByteArrayOutputStream; import java.lang.reflect.Constructor; diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/ComponentEnvManagerImpl.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/ComponentEnvManagerImpl.java index d3db5b748a7..ba08bd23295 100644 --- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/ComponentEnvManagerImpl.java +++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/ComponentEnvManagerImpl.java @@ -87,10 +87,10 @@ import com.sun.enterprise.deployment.MailSessionDescriptor; import com.sun.enterprise.deployment.ManagedBeanDescriptor; import com.sun.enterprise.deployment.MessageDestinationReferenceDescriptor; -import com.sun.enterprise.deployment.ResourceDescriptor; import com.sun.enterprise.deployment.ResourceEnvReferenceDescriptor; import com.sun.enterprise.deployment.ResourceReferenceDescriptor; import com.sun.enterprise.deployment.ServiceReferenceDescriptor; +import com.sun.enterprise.deployment.core.ResourceDescriptor; import com.sun.enterprise.deployment.util.DOLUtils; import com.sun.enterprise.naming.spi.NamingObjectFactory; import com.sun.enterprise.naming.spi.NamingUtils; diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/EntityManagerFactoryWrapper.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/EntityManagerFactoryWrapper.java index 4122cb4a013..c4ad366c85b 100644 --- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/EntityManagerFactoryWrapper.java +++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/EntityManagerFactoryWrapper.java @@ -17,7 +17,12 @@ package com.sun.enterprise.container.common.impl; import com.sun.enterprise.container.common.spi.util.ComponentEnvManager; -import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.Application; +import com.sun.enterprise.deployment.ApplicationClientDescriptor; +import com.sun.enterprise.deployment.BundleDescriptor; +import com.sun.enterprise.deployment.EjbDescriptor; +import com.sun.enterprise.deployment.WebBundleDescriptor; +import com.sun.enterprise.deployment.core.*; import com.sun.logging.LogDomains; import org.glassfish.api.invocation.ComponentInvocation; import static org.glassfish.api.invocation.ComponentInvocation.ComponentInvocationType; diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/JavaModuleNamingProxy.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/JavaModuleNamingProxy.java index 141a2f30a9e..e02ee5699ff 100644 --- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/JavaModuleNamingProxy.java +++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/JavaModuleNamingProxy.java @@ -23,9 +23,6 @@ import org.glassfish.internal.data.ApplicationInfo; import org.glassfish.internal.data.ApplicationRegistry; -import com.sun.enterprise.deployment.*; - - import jakarta.inject.Inject; import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PostConstruct; @@ -34,6 +31,11 @@ import javax.naming.NamingException; import com.sun.enterprise.container.common.spi.util.ComponentEnvManager; +import com.sun.enterprise.deployment.Application; +import com.sun.enterprise.deployment.BundleDescriptor; +import com.sun.enterprise.deployment.EjbDescriptor; +import com.sun.enterprise.deployment.JndiNameEnvironment; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.container.common.spi.ManagedBeanManager; import com.sun.logging.LogDomains; diff --git a/appserver/common/container-common/src/main/java/org/glassfish/javaee/services/CommonResourceProxy.java b/appserver/common/container-common/src/main/java/org/glassfish/javaee/services/CommonResourceProxy.java index 06c4377f1b2..4154a018148 100644 --- a/appserver/common/container-common/src/main/java/org/glassfish/javaee/services/CommonResourceProxy.java +++ b/appserver/common/container-common/src/main/java/org/glassfish/javaee/services/CommonResourceProxy.java @@ -32,7 +32,7 @@ import org.omnifaces.concurrent.services.JndiLookupNotifier; import com.sun.appserv.connectors.internal.api.ConnectorsUtil; -import com.sun.enterprise.deployment.ResourceDescriptor; +import com.sun.enterprise.deployment.core.ResourceDescriptor; import jakarta.inject.Inject; diff --git a/appserver/common/container-common/src/main/java/org/glassfish/javaee/services/JMSCFResourcePMProxy.java b/appserver/common/container-common/src/main/java/org/glassfish/javaee/services/JMSCFResourcePMProxy.java index 1097cd370e1..76093cbc867 100644 --- a/appserver/common/container-common/src/main/java/org/glassfish/javaee/services/JMSCFResourcePMProxy.java +++ b/appserver/common/container-common/src/main/java/org/glassfish/javaee/services/JMSCFResourcePMProxy.java @@ -17,7 +17,8 @@ package org.glassfish.javaee.services; import com.sun.appserv.connectors.internal.api.ConnectorsUtil; -import com.sun.enterprise.deployment.ResourceDescriptor; +import com.sun.enterprise.deployment.core.ResourceDescriptor; + import org.glassfish.hk2.api.PerLookup; import org.glassfish.internal.api.Globals; import org.jvnet.hk2.annotations.Service; diff --git a/appserver/connectors/connectors-runtime/pom.xml b/appserver/connectors/connectors-runtime/pom.xml index 02ce412b82a..61f2a0fbfcb 100644 --- a/appserver/connectors/connectors-runtime/pom.xml +++ b/appserver/connectors/connectors-runtime/pom.xml @@ -105,6 +105,11 @@ internal-api ${project.version} + + org.glassfish.main.deployment + dol-core + ${project.version} + org.glassfish.main.deployment dol diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/AdministeredObjectDefinitionHandler.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/AdministeredObjectDefinitionHandler.java index 1e66bf3d5a2..a0a3350c0de 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/AdministeredObjectDefinitionHandler.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/AdministeredObjectDefinitionHandler.java @@ -17,9 +17,13 @@ package com.sun.enterprise.connectors.deployment.annotation.handlers; -import com.sun.enterprise.deployment.*; -import com.sun.enterprise.deployment.annotation.context.*; -import com.sun.enterprise.deployment.annotation.handlers.AbstractResourceHandler; +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.Collection; +import java.util.Properties; +import java.util.Set; +import java.util.logging.Level; + import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; @@ -28,16 +32,25 @@ import org.glassfish.deployment.common.RootDeploymentDescriptor; import org.jvnet.hk2.annotations.Service; +import com.sun.enterprise.deployment.AdministeredObjectDefinitionDescriptor; +import com.sun.enterprise.deployment.EjbBundleDescriptor; +import com.sun.enterprise.deployment.EjbDescriptor; +import com.sun.enterprise.deployment.WebBundleDescriptor; +import com.sun.enterprise.deployment.annotation.context.EjbBundleContext; +import com.sun.enterprise.deployment.annotation.context.EjbContext; +import com.sun.enterprise.deployment.annotation.context.EjbInterceptorContext; +import com.sun.enterprise.deployment.annotation.context.ResourceContainerContext; +import com.sun.enterprise.deployment.annotation.context.WebBundleContext; +import com.sun.enterprise.deployment.annotation.context.WebComponentContext; +import com.sun.enterprise.deployment.annotation.context.WebComponentsContext; +import com.sun.enterprise.deployment.annotation.handlers.AbstractResourceHandler; +import com.sun.enterprise.deployment.core.MetadataSource; +import com.sun.enterprise.deployment.core.ResourceDescriptor; + import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.AroundTimeout; import jakarta.interceptor.Interceptors; import jakarta.resource.AdministeredObjectDefinition; -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.util.Collection; -import java.util.Properties; -import java.util.Set; -import java.util.logging.Level; /** * @author Dapeng Hu diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/ConnectionFactoryDefinitionHandler.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/ConnectionFactoryDefinitionHandler.java index ed23682b9ea..e1fc6794413 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/ConnectionFactoryDefinitionHandler.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/ConnectionFactoryDefinitionHandler.java @@ -17,9 +17,13 @@ package com.sun.enterprise.connectors.deployment.annotation.handlers; -import com.sun.enterprise.deployment.*; -import com.sun.enterprise.deployment.annotation.context.*; -import com.sun.enterprise.deployment.annotation.handlers.AbstractResourceHandler; +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.Collection; +import java.util.Properties; +import java.util.Set; +import java.util.logging.Level; + import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; @@ -28,16 +32,25 @@ import org.glassfish.deployment.common.RootDeploymentDescriptor; import org.jvnet.hk2.annotations.Service; +import com.sun.enterprise.deployment.ConnectionFactoryDefinitionDescriptor; +import com.sun.enterprise.deployment.EjbBundleDescriptor; +import com.sun.enterprise.deployment.EjbDescriptor; +import com.sun.enterprise.deployment.WebBundleDescriptor; +import com.sun.enterprise.deployment.annotation.context.EjbBundleContext; +import com.sun.enterprise.deployment.annotation.context.EjbContext; +import com.sun.enterprise.deployment.annotation.context.EjbInterceptorContext; +import com.sun.enterprise.deployment.annotation.context.ResourceContainerContext; +import com.sun.enterprise.deployment.annotation.context.WebBundleContext; +import com.sun.enterprise.deployment.annotation.context.WebComponentContext; +import com.sun.enterprise.deployment.annotation.context.WebComponentsContext; +import com.sun.enterprise.deployment.annotation.handlers.AbstractResourceHandler; +import com.sun.enterprise.deployment.core.MetadataSource; +import com.sun.enterprise.deployment.core.ResourceDescriptor; + import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.AroundTimeout; import jakarta.interceptor.Interceptors; import jakarta.resource.ConnectionFactoryDefinition; -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.util.Collection; -import java.util.Properties; -import java.util.Set; -import java.util.logging.Level; /** * @author Dapeng Hu diff --git a/appserver/deployment/dol-core/pom.xml b/appserver/deployment/dol-core/pom.xml new file mode 100755 index 00000000000..291f72d1737 --- /dev/null +++ b/appserver/deployment/dol-core/pom.xml @@ -0,0 +1,92 @@ + + + + + 4.0.0 + + + org.glassfish.main.deployment + deployment + 7.0.0-SNAPSHOT + + + dol-core + glassfish-jar + + Deployment Object Library CORE + + + + hzhang_jn + Hong Zhang + http://blogs.sun.com/misty + Oracle, Inc. + + lead + developer + + + + tjquinn + Tim Quinn + http://blogs.sun.com/quinn + Oracle, Inc. + + developer + + + + dochez + Jerome Dochez + http://blogs.sun.com/dochez + Oracle, Inc. + + developer + + + + shingwaichan + Shing Wai Chan + Oracle, Inc. + + developer + + + + + + + org.glassfish.main.deployment + deployment-common + ${project.version} + + + + + + + src/main/java + + **/*.properties + + + + + diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/MetadataSource.java b/appserver/deployment/dol-core/src/main/java/com/sun/enterprise/deployment/core/MetadataSource.java similarity index 95% rename from appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/MetadataSource.java rename to appserver/deployment/dol-core/src/main/java/com/sun/enterprise/deployment/core/MetadataSource.java index 62c2df3e0a1..7ce488755f8 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/MetadataSource.java +++ b/appserver/deployment/dol-core/src/main/java/com/sun/enterprise/deployment/core/MetadataSource.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.deployment; +package com.sun.enterprise.deployment.core; /** * This class is to use where the metadata comes from. diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ResourceDescriptor.java b/appserver/deployment/dol-core/src/main/java/com/sun/enterprise/deployment/core/ResourceDescriptor.java similarity index 97% rename from appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ResourceDescriptor.java rename to appserver/deployment/dol-core/src/main/java/com/sun/enterprise/deployment/core/ResourceDescriptor.java index a01aa19f4f3..4d53b3709e2 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ResourceDescriptor.java +++ b/appserver/deployment/dol-core/src/main/java/com/sun/enterprise/deployment/core/ResourceDescriptor.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.deployment; +package com.sun.enterprise.deployment.core; import org.glassfish.deployment.common.Descriptor; import org.glassfish.deployment.common.JavaEEResourceType; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ResourcePropertyDescriptor.java b/appserver/deployment/dol-core/src/main/java/com/sun/enterprise/deployment/core/ResourcePropertyDescriptor.java similarity index 97% rename from appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ResourcePropertyDescriptor.java rename to appserver/deployment/dol-core/src/main/java/com/sun/enterprise/deployment/core/ResourcePropertyDescriptor.java index bc144b3311e..9b34ed9afe0 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ResourcePropertyDescriptor.java +++ b/appserver/deployment/dol-core/src/main/java/com/sun/enterprise/deployment/core/ResourcePropertyDescriptor.java @@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -package com.sun.enterprise.deployment; +package com.sun.enterprise.deployment.core; import org.glassfish.deployment.common.Descriptor; diff --git a/appserver/deployment/dol/pom.xml b/appserver/deployment/dol/pom.xml index faab08eecd4..eb205b5e954 100755 --- a/appserver/deployment/dol/pom.xml +++ b/appserver/deployment/dol/pom.xml @@ -72,6 +72,11 @@ + + org.glassfish.main.deployment + dol-core + ${project.version} + org.glassfish.hk2 hk2-core @@ -139,6 +144,17 @@ nucleus-resources ${project.version} + + org.glassfish.main.admin + admin-util + ${project.version} + + + org.glassfish.main.security + security-services + ${project.version} + + org.omnifaces concurrent-extras diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/AbstractConnectorResourceDescriptor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/AbstractConnectorResourceDescriptor.java index fdd605f878c..ae5bb15096b 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/AbstractConnectorResourceDescriptor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/AbstractConnectorResourceDescriptor.java @@ -18,6 +18,8 @@ import java.util.Properties; +import com.sun.enterprise.deployment.core.ResourceDescriptor; + /** * @author Dapeng Hu */ diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/AdministeredObjectDefinitionDescriptor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/AdministeredObjectDefinitionDescriptor.java index b1cdc3c74a8..f531fafe773 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/AdministeredObjectDefinitionDescriptor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/AdministeredObjectDefinitionDescriptor.java @@ -16,6 +16,7 @@ package com.sun.enterprise.deployment; +import com.sun.enterprise.deployment.core.ResourcePropertyDescriptor; import com.sun.enterprise.deployment.util.DOLUtils; import static org.glassfish.deployment.common.JavaEEResourceType.*; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ApplicationClientDescriptor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ApplicationClientDescriptor.java index 7acddb8597e..eb6610851df 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ApplicationClientDescriptor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ApplicationClientDescriptor.java @@ -16,6 +16,7 @@ package com.sun.enterprise.deployment; +import com.sun.enterprise.deployment.core.ResourceDescriptor; import com.sun.enterprise.deployment.node.appclient.AppClientNode; import com.sun.enterprise.deployment.runtime.JavaWebStartAccessDescriptor; import com.sun.enterprise.deployment.types.EjbReference; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/CommonResourceBundleDescriptor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/CommonResourceBundleDescriptor.java index 858e6155f3d..444b6d54af2 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/CommonResourceBundleDescriptor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/CommonResourceBundleDescriptor.java @@ -18,6 +18,8 @@ import org.glassfish.deployment.common.JavaEEResourceType; +import com.sun.enterprise.deployment.core.ResourceDescriptor; + import java.util.HashSet; import java.util.Set; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/CommonResourceDescriptor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/CommonResourceDescriptor.java index 39c3c8e3730..9d9f1b8a35a 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/CommonResourceDescriptor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/CommonResourceDescriptor.java @@ -18,6 +18,9 @@ import org.glassfish.deployment.common.Descriptor; import org.glassfish.deployment.common.JavaEEResourceType; + +import com.sun.enterprise.deployment.core.ResourceDescriptor; + import java.util.Set; /** diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ConnectionFactoryDefinitionDescriptor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ConnectionFactoryDefinitionDescriptor.java index 899d2b2d3ef..1b08db321db 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ConnectionFactoryDefinitionDescriptor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ConnectionFactoryDefinitionDescriptor.java @@ -16,6 +16,7 @@ package com.sun.enterprise.deployment; +import com.sun.enterprise.deployment.core.ResourcePropertyDescriptor; import com.sun.enterprise.deployment.util.DOLUtils; import jakarta.resource.spi.TransactionSupport.TransactionSupportLevel; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/DataSourceDefinitionDescriptor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/DataSourceDefinitionDescriptor.java index 0a4e7bcf7dd..a5b8f6090dc 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/DataSourceDefinitionDescriptor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/DataSourceDefinitionDescriptor.java @@ -16,6 +16,8 @@ package com.sun.enterprise.deployment; +import com.sun.enterprise.deployment.core.ResourceDescriptor; +import com.sun.enterprise.deployment.core.ResourcePropertyDescriptor; import com.sun.enterprise.deployment.util.DOLUtils; import java.util.Properties; import java.util.logging.Level; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/EnvironmentProperty.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/EnvironmentProperty.java index eb947bf6200..34a03b4c0e1 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/EnvironmentProperty.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/EnvironmentProperty.java @@ -16,6 +16,7 @@ package com.sun.enterprise.deployment; +import com.sun.enterprise.deployment.core.MetadataSource; import com.sun.enterprise.deployment.runtime.application.wls.ApplicationParam; import com.sun.enterprise.deployment.web.ContextParameter; import com.sun.enterprise.deployment.web.EnvironmentEntry; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/InjectionTarget.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/InjectionTarget.java index f8e76bcc1f3..1f17c5c227c 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/InjectionTarget.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/InjectionTarget.java @@ -16,6 +16,7 @@ package com.sun.enterprise.deployment; +import com.sun.enterprise.deployment.core.MetadataSource; import com.sun.enterprise.deployment.util.TypeUtil; import java.io.Serializable; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/JMSConnectionFactoryDefinitionDescriptor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/JMSConnectionFactoryDefinitionDescriptor.java index 88f504fc977..4bb028df884 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/JMSConnectionFactoryDefinitionDescriptor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/JMSConnectionFactoryDefinitionDescriptor.java @@ -16,6 +16,7 @@ package com.sun.enterprise.deployment; +import com.sun.enterprise.deployment.core.ResourcePropertyDescriptor; import com.sun.enterprise.deployment.util.DOLUtils; import static org.glassfish.deployment.common.JavaEEResourceType.JMSCFDD; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/JMSDestinationDefinitionDescriptor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/JMSDestinationDefinitionDescriptor.java index 941b97580e1..1f31accf1b2 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/JMSDestinationDefinitionDescriptor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/JMSDestinationDefinitionDescriptor.java @@ -16,6 +16,7 @@ package com.sun.enterprise.deployment; +import com.sun.enterprise.deployment.core.ResourcePropertyDescriptor; import com.sun.enterprise.deployment.util.DOLUtils; import static org.glassfish.deployment.common.JavaEEResourceType.JMSDD; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/JndiNameEnvironment.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/JndiNameEnvironment.java index b76f067d4d1..f9ca8af9138 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/JndiNameEnvironment.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/JndiNameEnvironment.java @@ -17,6 +17,9 @@ package com.sun.enterprise.deployment; import org.glassfish.deployment.common.JavaEEResourceType; + +import com.sun.enterprise.deployment.core.ResourceDescriptor; + import java.util.List; import java.util.Set; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/LifecycleCallbackDescriptor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/LifecycleCallbackDescriptor.java index dc4e791155b..de7e6ec2952 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/LifecycleCallbackDescriptor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/LifecycleCallbackDescriptor.java @@ -18,6 +18,8 @@ import org.glassfish.deployment.common.Descriptor; +import com.sun.enterprise.deployment.core.MetadataSource; + import java.lang.reflect.Method; /** diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/MailSessionDescriptor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/MailSessionDescriptor.java index 29b7b204d42..4eba3c75be8 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/MailSessionDescriptor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/MailSessionDescriptor.java @@ -16,6 +16,8 @@ package com.sun.enterprise.deployment; +import com.sun.enterprise.deployment.core.ResourceDescriptor; +import com.sun.enterprise.deployment.core.ResourcePropertyDescriptor; import com.sun.enterprise.deployment.util.DOLUtils; import java.util.Properties; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ResourceDescriptorRegistry.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ResourceDescriptorRegistry.java index e0ba7489923..2a41b0b5ba6 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ResourceDescriptorRegistry.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ResourceDescriptorRegistry.java @@ -38,6 +38,7 @@ import org.glassfish.deployment.common.JavaEEResourceType; +import com.sun.enterprise.deployment.core.ResourceDescriptor; import com.sun.enterprise.util.LocalStringManagerImpl; /** diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/WritableJndiNameEnvironment.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/WritableJndiNameEnvironment.java index e29d0025ec8..0bf1fe94e76 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/WritableJndiNameEnvironment.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/WritableJndiNameEnvironment.java @@ -16,6 +16,7 @@ package com.sun.enterprise.deployment; +import com.sun.enterprise.deployment.core.ResourceDescriptor; import com.sun.enterprise.deployment.types.EjbReference; /** diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/context/EjbBundleContext.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/context/EjbBundleContext.java index 337c05a8438..5c4372646a2 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/context/EjbBundleContext.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/context/EjbBundleContext.java @@ -22,7 +22,12 @@ package com.sun.enterprise.deployment.annotation.context; -import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.EjbBundleDescriptor; +import com.sun.enterprise.deployment.EjbDescriptor; +import com.sun.enterprise.deployment.EjbInterceptor; +import com.sun.enterprise.deployment.ServiceReferenceDescriptor; +import com.sun.enterprise.deployment.WebServiceEndpoint; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.types.HandlerChainContainer; import com.sun.enterprise.deployment.types.ServiceReferenceContainer; import org.glassfish.apf.AnnotatedElementHandler; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/context/ResourceContainerContext.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/context/ResourceContainerContext.java index 4e32a9105ad..8401d8e306a 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/context/ResourceContainerContext.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/context/ResourceContainerContext.java @@ -16,7 +16,15 @@ package com.sun.enterprise.deployment.annotation.context; -import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.EntityManagerFactoryReferenceDescriptor; +import com.sun.enterprise.deployment.EntityManagerReferenceDescriptor; +import com.sun.enterprise.deployment.EnvironmentProperty; +import com.sun.enterprise.deployment.LifecycleCallbackDescriptor; +import com.sun.enterprise.deployment.ManagedBeanDescriptor; +import com.sun.enterprise.deployment.MessageDestinationReferenceDescriptor; +import com.sun.enterprise.deployment.ResourceEnvReferenceDescriptor; +import com.sun.enterprise.deployment.ResourceReferenceDescriptor; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.types.EjbReference; import org.glassfish.deployment.common.JavaEEResourceType; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/context/ResourceContainerContextImpl.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/context/ResourceContainerContextImpl.java index e5b4409b0a5..bcc3e06760f 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/context/ResourceContainerContextImpl.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/context/ResourceContainerContextImpl.java @@ -16,7 +16,19 @@ package com.sun.enterprise.deployment.annotation.context; -import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.Application; +import com.sun.enterprise.deployment.BundleDescriptor; +import com.sun.enterprise.deployment.EjbDescriptor; +import com.sun.enterprise.deployment.EntityManagerFactoryReferenceDescriptor; +import com.sun.enterprise.deployment.EntityManagerReferenceDescriptor; +import com.sun.enterprise.deployment.EnvironmentProperty; +import com.sun.enterprise.deployment.LifecycleCallbackDescriptor; +import com.sun.enterprise.deployment.ManagedBeanDescriptor; +import com.sun.enterprise.deployment.MessageDestinationReferenceDescriptor; +import com.sun.enterprise.deployment.ResourceEnvReferenceDescriptor; +import com.sun.enterprise.deployment.ResourceReferenceDescriptor; +import com.sun.enterprise.deployment.WritableJndiNameEnvironment; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.types.*; import org.glassfish.apf.context.AnnotationContext; import org.glassfish.deployment.common.Descriptor; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/factory/AnnotatedElementHandlerFactory.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/factory/AnnotatedElementHandlerFactory.java index 869fc677adf..78d29090099 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/factory/AnnotatedElementHandlerFactory.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/factory/AnnotatedElementHandlerFactory.java @@ -16,10 +16,14 @@ package com.sun.enterprise.deployment.annotation.factory; -import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.ApplicationClientDescriptor; +import com.sun.enterprise.deployment.ConnectorDescriptor; +import com.sun.enterprise.deployment.EjbBundleDescriptor; +import com.sun.enterprise.deployment.WebBundleDescriptor; import com.sun.enterprise.deployment.annotation.context.AppClientContext; import com.sun.enterprise.deployment.annotation.context.EjbBundleContext; import com.sun.enterprise.deployment.annotation.context.WebBundleContext; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.annotation.context.RarBundleContext; import org.glassfish.apf.AnnotatedElementHandler; import org.glassfish.deployment.common.RootDeploymentDescriptor; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/DeclareRolesHandler.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/DeclareRolesHandler.java index ac937bef5a4..d843920f143 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/DeclareRolesHandler.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/DeclareRolesHandler.java @@ -16,10 +16,15 @@ package com.sun.enterprise.deployment.annotation.handlers; -import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.EjbDescriptor; +import com.sun.enterprise.deployment.RoleReference; +import com.sun.enterprise.deployment.SecurityRoleDescriptor; +import com.sun.enterprise.deployment.WebBundleDescriptor; import com.sun.enterprise.deployment.annotation.context.EjbContext; import com.sun.enterprise.deployment.annotation.context.WebBundleContext; import com.sun.enterprise.deployment.annotation.context.WebComponentContext; +import com.sun.enterprise.deployment.core.*; + import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/EntityManagerFactoryReferenceHandler.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/EntityManagerFactoryReferenceHandler.java index e582e7b0c70..1547671b21f 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/EntityManagerFactoryReferenceHandler.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/EntityManagerFactoryReferenceHandler.java @@ -18,8 +18,9 @@ import com.sun.enterprise.deployment.EntityManagerFactoryReferenceDescriptor; import com.sun.enterprise.deployment.InjectionTarget; -import com.sun.enterprise.deployment.MetadataSource; import com.sun.enterprise.deployment.annotation.context.ResourceContainerContext; +import com.sun.enterprise.deployment.core.MetadataSource; + import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/EntityManagerReferenceHandler.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/EntityManagerReferenceHandler.java index e3478952800..ad300b50302 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/EntityManagerReferenceHandler.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/EntityManagerReferenceHandler.java @@ -18,9 +18,10 @@ import com.sun.enterprise.deployment.EntityManagerReferenceDescriptor; import com.sun.enterprise.deployment.InjectionTarget; -import com.sun.enterprise.deployment.MetadataSource; import com.sun.enterprise.deployment.annotation.context.AppClientContext; import com.sun.enterprise.deployment.annotation.context.ResourceContainerContext; +import com.sun.enterprise.deployment.core.MetadataSource; + import org.glassfish.apf.*; import org.jvnet.hk2.annotations.Service; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ManagedBeanHandler.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ManagedBeanHandler.java index d3807550b53..f26fdff078d 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ManagedBeanHandler.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ManagedBeanHandler.java @@ -16,8 +16,12 @@ package com.sun.enterprise.deployment.annotation.handlers; -import com.sun.enterprise.deployment.*; import com.sun.enterprise.deployment.annotation.context.ResourceContainerContext; +import com.sun.enterprise.deployment.core.*; +import com.sun.enterprise.deployment.InterceptorDescriptor; +import com.sun.enterprise.deployment.LifecycleCallbackDescriptor; +import com.sun.enterprise.deployment.ManagedBeanDescriptor; +import com.sun.enterprise.deployment.MethodDescriptor; import com.sun.enterprise.deployment.annotation.context.ManagedBeanContext; import com.sun.enterprise.deployment.util.TypeUtil; import org.glassfish.apf.*; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/PostConstructHandler.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/PostConstructHandler.java index ba87dd38875..b03a3553dc5 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/PostConstructHandler.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/PostConstructHandler.java @@ -17,8 +17,9 @@ package com.sun.enterprise.deployment.annotation.handlers; import com.sun.enterprise.deployment.LifecycleCallbackDescriptor; -import com.sun.enterprise.deployment.MetadataSource; import com.sun.enterprise.deployment.annotation.context.ResourceContainerContext; +import com.sun.enterprise.deployment.core.MetadataSource; + import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/PreDestroyHandler.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/PreDestroyHandler.java index 983ac39bf38..6be0d51a65c 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/PreDestroyHandler.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/PreDestroyHandler.java @@ -17,8 +17,9 @@ package com.sun.enterprise.deployment.annotation.handlers; import com.sun.enterprise.deployment.LifecycleCallbackDescriptor; -import com.sun.enterprise.deployment.MetadataSource; import com.sun.enterprise.deployment.annotation.context.ResourceContainerContext; +import com.sun.enterprise.deployment.core.MetadataSource; + import org.glassfish.apf.*; import org.jvnet.hk2.annotations.Service; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ResourceHandler.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ResourceHandler.java index fac7f81f98b..7f2ba7683d8 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ResourceHandler.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ResourceHandler.java @@ -16,10 +16,17 @@ package com.sun.enterprise.deployment.annotation.handlers; -import com.sun.enterprise.deployment.*; import com.sun.enterprise.deployment.util.DOLUtils; +import com.sun.enterprise.deployment.EnvironmentProperty; +import com.sun.enterprise.deployment.InjectionTarget; +import com.sun.enterprise.deployment.MessageDestinationReferenceDescriptor; +import com.sun.enterprise.deployment.ResourceEnvReferenceDescriptor; +import com.sun.enterprise.deployment.ResourceReferenceDescriptor; +import com.sun.enterprise.deployment.WSDolSupport; import com.sun.enterprise.deployment.annotation.context.ResourceContainerContext; import com.sun.enterprise.deployment.annotation.context.ResourceContainerContextImpl; +import com.sun.enterprise.deployment.core.*; + import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/PersistenceDeploymentDescriptorFile.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/PersistenceDeploymentDescriptorFile.java index 9578e5532c3..ada9bb812a2 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/PersistenceDeploymentDescriptorFile.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/PersistenceDeploymentDescriptorFile.java @@ -16,7 +16,12 @@ package com.sun.enterprise.deployment.io; -import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.Application; +import com.sun.enterprise.deployment.ApplicationClientDescriptor; +import com.sun.enterprise.deployment.EjbBundleDescriptor; +import com.sun.enterprise.deployment.PersistenceUnitsDescriptor; +import com.sun.enterprise.deployment.WebBundleDescriptor; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.node.PersistenceNode; import com.sun.enterprise.deployment.node.RootXMLNode; import org.glassfish.deployment.common.Descriptor; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/runtime/WLSWebServicesDeploymentDescriptorFile.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/runtime/WLSWebServicesDeploymentDescriptorFile.java index 3e77543552d..fddd8e794f3 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/runtime/WLSWebServicesDeploymentDescriptorFile.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/runtime/WLSWebServicesDeploymentDescriptorFile.java @@ -16,8 +16,12 @@ package com.sun.enterprise.deployment.io.runtime; -import com.sun.enterprise.deployment.*; import com.sun.enterprise.deployment.util.DOLUtils; +import com.sun.enterprise.deployment.BundleDescriptor; +import com.sun.enterprise.deployment.EjbBundleDescriptor; +import com.sun.enterprise.deployment.WebBundleDescriptor; +import com.sun.enterprise.deployment.WebServicesDescriptor; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.io.ConfigurationDeploymentDescriptorFile; import com.sun.enterprise.deployment.node.RootXMLNode; import com.sun.enterprise.deployment.node.ws.WLDescriptorConstants; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/AbstractBundleNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/AbstractBundleNode.java index a5ddea803e5..11536031cc4 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/AbstractBundleNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/AbstractBundleNode.java @@ -16,8 +16,11 @@ package com.sun.enterprise.deployment.node; -import com.sun.enterprise.deployment.*; import com.sun.enterprise.deployment.xml.TagNames; +import com.sun.enterprise.deployment.Application; +import com.sun.enterprise.deployment.BundleDescriptor; +import com.sun.enterprise.deployment.MessageDestinationDescriptor; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.util.DOLUtils; import java.util.Collection; import java.util.Collections; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ApplicationNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ApplicationNode.java index 1bd18e22e2e..1f9a46f27b5 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ApplicationNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ApplicationNode.java @@ -34,10 +34,6 @@ import org.glassfish.deployment.common.ModuleDescriptor; import org.jvnet.hk2.annotations.Service; -import org.omnifaces.concurrent.node.ContextServiceDefinitionNode; -import org.omnifaces.concurrent.node.ManagedExecutorDefinitionNode; -import org.omnifaces.concurrent.node.ManagedScheduledExecutorDefinitionNode; -import org.omnifaces.concurrent.node.ManagedThreadFactoryDefinitionNode; import org.w3c.dom.Node; import com.sun.enterprise.deployment.Application; @@ -116,7 +112,7 @@ public String registerBundle(Map publicIDToDTD) { @Override public Map registerRuntimeBundle(final Map publicIDToDTD, Map> versionUpgrades) { final Map result = new HashMap(); - for (ConfigurationDeploymentDescriptorFile confDD : DOLUtils.getConfigurationDeploymentDescriptorFiles(habitat, EarType.ARCHIVE_TYPE)) { + for (ConfigurationDeploymentDescriptorFile confDD : DOLUtils.getConfigurationDeploymentDescriptorFiles(serviceLocator, EarType.ARCHIVE_TYPE)) { confDD.registerBundle(result, publicIDToDTD, versionUpgrades); } return result; @@ -147,7 +143,7 @@ public ApplicationNode() { registerElementHandler(new XMLElement(TagNames.ENVIRONMENT_PROPERTY), EnvEntryNode.class, "addEnvironmentProperty"); registerElementHandler(new XMLElement(TagNames.EJB_REFERENCE), EjbReferenceNode.class); registerElementHandler(new XMLElement(TagNames.EJB_LOCAL_REFERENCE), EjbLocalReferenceNode.class); - JndiEnvRefNode serviceRefNode = habitat.getService(JndiEnvRefNode.class, WebServicesTagNames.SERVICE_REF); + JndiEnvRefNode serviceRefNode = serviceLocator.getService(JndiEnvRefNode.class, WebServicesTagNames.SERVICE_REF); if (serviceRefNode != null) { registerElementHandler(new XMLElement(WebServicesTagNames.SERVICE_REF), serviceRefNode.getClass(),"addServiceReferenceDescriptor"); } diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ContextServiceDefinitionNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ContextServiceDefinitionNode.java new file mode 100644 index 00000000000..2bf486f98f6 --- /dev/null +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ContextServiceDefinitionNode.java @@ -0,0 +1,55 @@ +/* + * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0, which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the + * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + * version 2 with the GNU Classpath Exception, which is available at + * https://www.gnu.org/software/classpath/license.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + */ +package com.sun.enterprise.deployment.node; + +import static com.sun.enterprise.deployment.xml.TagNames.RESOURCE_PROPERTY; + +import java.util.Map; + +import org.omnifaces.concurrent.deployment.ContextServiceDefinitionDescriptor; +import org.omnifaces.concurrent.node.ContextServiceDefinitionNodeDelegate; +import org.w3c.dom.Node; + +public class ContextServiceDefinitionNode extends DeploymentDescriptorNode { + public final static XMLElement tag = new XMLElement(ContextServiceDefinitionNodeDelegate.getQname()); + + ContextServiceDefinitionNodeDelegate delegate = new ContextServiceDefinitionNodeDelegate(); + + public ContextServiceDefinitionNode() { + registerElementHandler( + new XMLElement(RESOURCE_PROPERTY), + ResourcePropertyNode.class, + delegate.getHandlerAdMethodName()); + } + + @Override + protected Map getDispatchTable() { + return delegate.getDispatchTable(super.getDispatchTable()); + } + + @Override + public Node writeDescriptor(Node parent, String nodeName, ContextServiceDefinitionDescriptor contextServiceDefinitionDescriptor) { + Node node = delegate.getDescriptor(parent, nodeName, contextServiceDefinitionDescriptor); + new ResourcePropertyNode().writeDescriptor(node, contextServiceDefinitionDescriptor); + + return node; + } + + @Override + public ContextServiceDefinitionDescriptor getDescriptor() { + return delegate.getDescriptor(); + } +} \ No newline at end of file diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/DeploymentDescriptorNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/DeploymentDescriptorNode.java index d669670b93e..823f49d0499 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/DeploymentDescriptorNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/DeploymentDescriptorNode.java @@ -55,10 +55,10 @@ import com.sun.enterprise.deployment.LifecycleCallbackDescriptor; import com.sun.enterprise.deployment.MailSessionDescriptor; import com.sun.enterprise.deployment.MessageDestinationReferenceDescriptor; -import com.sun.enterprise.deployment.ResourceDescriptor; import com.sun.enterprise.deployment.ResourceEnvReferenceDescriptor; import com.sun.enterprise.deployment.ResourceReferenceDescriptor; import com.sun.enterprise.deployment.ServiceReferenceDescriptor; +import com.sun.enterprise.deployment.core.ResourceDescriptor; import com.sun.enterprise.deployment.node.runtime.RuntimeBundleNode; import com.sun.enterprise.deployment.types.EjbReference; import com.sun.enterprise.deployment.util.DOLUtils; @@ -89,8 +89,7 @@ */ public abstract class DeploymentDescriptorNode implements XMLNode { - - protected ServiceLocator habitat = Globals.getDefaultHabitat(); + protected ServiceLocator serviceLocator = Globals.getDefaultHabitat(); private static final String QNAME_SEPARATOR = ":"; @@ -325,7 +324,7 @@ public XMLNode getHandlerFor(XMLElement element) { } private Class getExtensionHandler(final XMLElement element) { - DeploymentDescriptorNode extNode = (DeploymentDescriptorNode) habitat.getService(XMLNode.class, + DeploymentDescriptorNode extNode = (DeploymentDescriptorNode) serviceLocator.getService(XMLNode.class, element.getQName()); if (extNode == null) { return null; @@ -841,7 +840,7 @@ protected void writeServiceReferenceDescriptors(Node parentNode, Iterator refs) return; } - JndiEnvRefNode serviceRefNode = habitat.getService(JndiEnvRefNode.class, WebServicesTagNames.SERVICE_REF); + JndiEnvRefNode serviceRefNode = serviceLocator.getService(JndiEnvRefNode.class, WebServicesTagNames.SERVICE_REF); if (serviceRefNode != null) { while (refs.hasNext()) { ServiceReferenceDescriptor next = (ServiceReferenceDescriptor) refs.next(); diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ManagedExecutorDefinitionNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ManagedExecutorDefinitionNode.java new file mode 100644 index 00000000000..ea228d067d6 --- /dev/null +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ManagedExecutorDefinitionNode.java @@ -0,0 +1,57 @@ +/* + * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0, which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the + * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + * version 2 with the GNU Classpath Exception, which is available at + * https://www.gnu.org/software/classpath/license.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + */ +package com.sun.enterprise.deployment.node; + +import static com.sun.enterprise.deployment.xml.TagNames.RESOURCE_PROPERTY; + +import java.util.Map; + +import org.omnifaces.concurrent.deployment.ManagedExecutorDefinitionDescriptor; +import org.omnifaces.concurrent.node.ManagedExecutorDefinitionNodeDelegate; +import org.w3c.dom.Node; + +public class ManagedExecutorDefinitionNode extends DeploymentDescriptorNode { + + public final static XMLElement tag = new XMLElement(ManagedExecutorDefinitionNodeDelegate.getQname()); + + ManagedExecutorDefinitionNodeDelegate delegate = new ManagedExecutorDefinitionNodeDelegate(); + + public ManagedExecutorDefinitionNode() { + registerElementHandler( + new XMLElement(RESOURCE_PROPERTY), + ResourcePropertyNode.class, + delegate.getHandlerAdMethodName()); + } + + @Override + protected Map getDispatchTable() { + return delegate.getDispatchTable(super.getDispatchTable()); + } + + @Override + public Node writeDescriptor(Node parent, String nodeName, ManagedExecutorDefinitionDescriptor managedExecutorDefinitionDescriptor) { + Node node = delegate.getDescriptor(parent, nodeName, managedExecutorDefinitionDescriptor); + new ResourcePropertyNode().writeDescriptor(node, managedExecutorDefinitionDescriptor); + + return node; + } + + @Override + public ManagedExecutorDefinitionDescriptor getDescriptor() { + return delegate.getDescriptor(); + } + +} diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ManagedScheduledExecutorDefinitionNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ManagedScheduledExecutorDefinitionNode.java new file mode 100644 index 00000000000..75d8d791ddb --- /dev/null +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ManagedScheduledExecutorDefinitionNode.java @@ -0,0 +1,80 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright (c) [2022] Payara Foundation and/or its affiliates. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common Development + * and Distribution License("CDDL") (collectively, the "License"). You + * may not use this file except in compliance with the License. You can + * obtain a copy of the License at + * https://github.com/payara/Payara/blob/master/LICENSE.txt + * See the License for the specific + * language governing permissions and limitations under the License. + * + * When distributing the software, include this License Header Notice in each + * file and include the License file at glassfish/legal/LICENSE.txt. + * + * GPL Classpath Exception: + * The Payara Foundation designates this particular file as subject to the "Classpath" + * exception as provided by the Payara Foundation in the GPL Version 2 section of the License + * file that accompanied this code. + * + * Modifications: + * If applicable, add the following below the License Header, with the fields + * enclosed by brackets [] replaced by your own identifying information: + * "Portions Copyright [year] [name of copyright owner]" + * + * Contributor(s): + * If you wish your version of this file to be governed by only the CDDL or + * only the GPL Version 2, indicate your decision by adding "[Contributor] + * elects to include this software in this distribution under the [CDDL or GPL + * Version 2] license." If you don't indicate a single choice of license, a + * recipient has the option to distribute your version of this file under + * either the CDDL, the GPL Version 2 or to extend the choice of license to + * its licensees as provided above. However, if you add GPL Version 2 code + * and therefore, elected the GPL Version 2 license, then the option applies + * only if the new code is made subject to such option by the copyright + * holder. + */ +package com.sun.enterprise.deployment.node; + +import static com.sun.enterprise.deployment.xml.TagNames.RESOURCE_PROPERTY; + +import java.util.Map; + +import org.omnifaces.concurrent.deployment.ManagedScheduledExecutorDefinitionDescriptor; +import org.omnifaces.concurrent.node.ManagedScheduledExecutorDefinitionNodeDelegate; +import org.w3c.dom.Node; + +public class ManagedScheduledExecutorDefinitionNode extends DeploymentDescriptorNode { + + public final static XMLElement tag = new XMLElement(ManagedScheduledExecutorDefinitionNodeDelegate.getQname()); + + ManagedScheduledExecutorDefinitionNodeDelegate delegate = new ManagedScheduledExecutorDefinitionNodeDelegate(); + + public ManagedScheduledExecutorDefinitionNode() { + registerElementHandler( + new XMLElement(RESOURCE_PROPERTY), + ResourcePropertyNode.class, + delegate.getHandlerAdMethodName()); + } + + @Override + protected Map getDispatchTable() { + return delegate.getDispatchTable(super.getDispatchTable()); + } + + @Override + public Node writeDescriptor(Node parent, String nodeName, ManagedScheduledExecutorDefinitionDescriptor managedScheduledExecutorDefinitionDescriptor) { + Node node = delegate.getDescriptor(parent, nodeName, managedScheduledExecutorDefinitionDescriptor); + new ResourcePropertyNode().writeDescriptor(node, managedScheduledExecutorDefinitionDescriptor); + + return node; + } + + @Override + public ManagedScheduledExecutorDefinitionDescriptor getDescriptor() { + return delegate.getDescriptor(); + } +} diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ManagedThreadFactoryDefinitionNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ManagedThreadFactoryDefinitionNode.java new file mode 100644 index 00000000000..98976958c7f --- /dev/null +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ManagedThreadFactoryDefinitionNode.java @@ -0,0 +1,80 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright (c) [2022] Payara Foundation and/or its affiliates. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common Development + * and Distribution License("CDDL") (collectively, the "License"). You + * may not use this file except in compliance with the License. You can + * obtain a copy of the License at + * https://github.com/payara/Payara/blob/master/LICENSE.txt + * See the License for the specific + * language governing permissions and limitations under the License. + * + * When distributing the software, include this License Header Notice in each + * file and include the License file at glassfish/legal/LICENSE.txt. + * + * GPL Classpath Exception: + * The Payara Foundation designates this particular file as subject to the "Classpath" + * exception as provided by the Payara Foundation in the GPL Version 2 section of the License + * file that accompanied this code. + * + * Modifications: + * If applicable, add the following below the License Header, with the fields + * enclosed by brackets [] replaced by your own identifying information: + * "Portions Copyright [year] [name of copyright owner]" + * + * Contributor(s): + * If you wish your version of this file to be governed by only the CDDL or + * only the GPL Version 2, indicate your decision by adding "[Contributor] + * elects to include this software in this distribution under the [CDDL or GPL + * Version 2] license." If you don't indicate a single choice of license, a + * recipient has the option to distribute your version of this file under + * either the CDDL, the GPL Version 2 or to extend the choice of license to + * its licensees as provided above. However, if you add GPL Version 2 code + * and therefore, elected the GPL Version 2 license, then the option applies + * only if the new code is made subject to such option by the copyright + * holder. + */ +package com.sun.enterprise.deployment.node; + +import static com.sun.enterprise.deployment.xml.TagNames.RESOURCE_PROPERTY; + +import java.util.Map; + +import org.omnifaces.concurrent.deployment.ManagedThreadFactoryDefinitionDescriptor; +import org.omnifaces.concurrent.node.ManagedThreadFactoryDefinitionNodeDelegate; +import org.w3c.dom.Node; + +public class ManagedThreadFactoryDefinitionNode extends DeploymentDescriptorNode { + + public final static XMLElement tag = new XMLElement(ManagedThreadFactoryDefinitionNodeDelegate.getQname()); + + ManagedThreadFactoryDefinitionNodeDelegate delegate = new ManagedThreadFactoryDefinitionNodeDelegate(); + + public ManagedThreadFactoryDefinitionNode() { + registerElementHandler( + new XMLElement(RESOURCE_PROPERTY), + ResourcePropertyNode.class, + delegate.getHandlerAdMethodName()); + } + + @Override + protected Map getDispatchTable() { + return delegate.getDispatchTable(super.getDispatchTable()); + } + + @Override + public Node writeDescriptor(Node parent, String nodeName, ManagedThreadFactoryDefinitionDescriptor managedThreadFactoryDefinitionDescriptor) { + Node node = delegate.getDescriptor(parent, nodeName, managedThreadFactoryDefinitionDescriptor); + new ResourcePropertyNode().writeDescriptor(node, managedThreadFactoryDefinitionDescriptor); + + return node; + } + + @Override + public ManagedThreadFactoryDefinitionDescriptor getDescriptor() { + return delegate.getDescriptor(); + } +} diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ResourcePropertyNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ResourcePropertyNode.java index c655e606257..44badf4e44c 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ResourcePropertyNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ResourcePropertyNode.java @@ -16,7 +16,12 @@ package com.sun.enterprise.deployment.node; -import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.ConnectionFactoryDefinitionDescriptor; +import com.sun.enterprise.deployment.DataSourceDefinitionDescriptor; +import com.sun.enterprise.deployment.JMSConnectionFactoryDefinitionDescriptor; +import com.sun.enterprise.deployment.JMSDestinationDefinitionDescriptor; +import com.sun.enterprise.deployment.MailSessionDescriptor; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.xml.TagNames; import org.glassfish.deployment.common.Descriptor; import org.w3c.dom.Node; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/appclient/AppClientNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/appclient/AppClientNode.java index 553fd220ea9..7f2c5c3e30f 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/appclient/AppClientNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/appclient/AppClientNode.java @@ -80,7 +80,7 @@ public AppClientNode() { registerElementHandler(new XMLElement(TagNames.ENVIRONMENT_PROPERTY), EnvEntryNode.class, "addEnvironmentProperty"); registerElementHandler(new XMLElement(TagNames.EJB_REFERENCE), EjbReferenceNode.class); registerElementHandler(new XMLElement(TagNames.EJB_LOCAL_REFERENCE), EjbLocalReferenceNode.class); - JndiEnvRefNode serviceRefNode = habitat.getService(JndiEnvRefNode.class, WebServicesTagNames.SERVICE_REF); + JndiEnvRefNode serviceRefNode = serviceLocator.getService(JndiEnvRefNode.class, WebServicesTagNames.SERVICE_REF); if (serviceRefNode != null) { registerElementHandler(new XMLElement(WebServicesTagNames.SERVICE_REF), serviceRefNode.getClass(),"addServiceReferenceDescriptor"); } diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/connector/AdminObjectNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/connector/AdminObjectNode.java index aff30fcd995..37c740b8f32 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/connector/AdminObjectNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/connector/AdminObjectNode.java @@ -16,7 +16,10 @@ package com.sun.enterprise.deployment.node.connector; -import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.AdminObject; +import com.sun.enterprise.deployment.ConnectorConfigProperty; +import com.sun.enterprise.deployment.ConnectorDescriptor; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; import com.sun.enterprise.deployment.node.DescriptorFactory; import com.sun.enterprise.deployment.node.XMLElement; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/connector/ConfigPropertyNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/connector/ConfigPropertyNode.java index 7a8cd3724f7..a830dffc89d 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/connector/ConfigPropertyNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/connector/ConfigPropertyNode.java @@ -16,7 +16,13 @@ package com.sun.enterprise.deployment.node.connector; -import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.AdminObject; +import com.sun.enterprise.deployment.ConnectionDefDescriptor; +import com.sun.enterprise.deployment.ConnectorConfigProperty; +import com.sun.enterprise.deployment.ConnectorDescriptor; +import com.sun.enterprise.deployment.MessageListener; +import com.sun.enterprise.deployment.OutboundResourceAdapter; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; import com.sun.enterprise.deployment.node.DescriptorFactory; import com.sun.enterprise.deployment.xml.ConnectorTagNames; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/AppClientRuntimeNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/AppClientRuntimeNode.java index 94345705c4b..4bfbb0079e3 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/AppClientRuntimeNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/AppClientRuntimeNode.java @@ -40,7 +40,7 @@ public class AppClientRuntimeNode extends RuntimeBundleNode { public ApplicationRuntimeNode(Application descriptor) { super(descriptor); //trigger registration in standard node, if it hasn't happened - habitat.getService(ApplicationNode.class); + serviceLocator.getService(ApplicationNode.class); } /** diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/common/MessageNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/common/MessageNode.java index 29509a468e1..11ac3992e74 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/common/MessageNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/common/MessageNode.java @@ -16,7 +16,13 @@ package com.sun.enterprise.deployment.node.runtime.common; -import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.BundleDescriptor; +import com.sun.enterprise.deployment.EjbDescriptor; +import com.sun.enterprise.deployment.MethodDescriptor; +import com.sun.enterprise.deployment.ServiceRefPortInfo; +import com.sun.enterprise.deployment.WebBundleDescriptor; +import com.sun.enterprise.deployment.WebServiceEndpoint; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; import com.sun.enterprise.deployment.node.MethodNode; import com.sun.enterprise.deployment.node.XMLElement; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ws/WLServiceRefNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ws/WLServiceRefNode.java index 9ac2b624c25..f2fa07a8fd9 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ws/WLServiceRefNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ws/WLServiceRefNode.java @@ -16,7 +16,12 @@ package com.sun.enterprise.deployment.node.ws; -import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.JndiNameEnvironment; +import com.sun.enterprise.deployment.NameValuePairDescriptor; +import com.sun.enterprise.deployment.ServiceRefPortInfo; +import com.sun.enterprise.deployment.ServiceReferenceDescriptor; +import com.sun.enterprise.deployment.WebBundleDescriptor; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; import com.sun.enterprise.deployment.node.NameValuePairNode; import com.sun.enterprise.deployment.node.XMLElement; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ws/WLWebServiceNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ws/WLWebServiceNode.java index a5d83b8aca9..2c68b0a6d3c 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ws/WLWebServiceNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ws/WLWebServiceNode.java @@ -16,7 +16,10 @@ package com.sun.enterprise.deployment.node.ws; -import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.WebService; +import com.sun.enterprise.deployment.WebServiceEndpoint; +import com.sun.enterprise.deployment.WebServicesDescriptor; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.node.*; import com.sun.enterprise.deployment.util.DOLUtils; import com.sun.enterprise.deployment.xml.WebServicesTagNames; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ws/WLWebServicesDescriptorNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ws/WLWebServicesDescriptorNode.java index 9955fc4e62a..16d22d72260 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ws/WLWebServicesDescriptorNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ws/WLWebServicesDescriptorNode.java @@ -16,7 +16,9 @@ package com.sun.enterprise.deployment.node.ws; -import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.WebService; +import com.sun.enterprise.deployment.WebServicesDescriptor; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.node.*; import com.sun.enterprise.deployment.xml.TagNames; import com.sun.enterprise.deployment.xml.WebServicesTagNames; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/AppClientTracerVisitor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/AppClientTracerVisitor.java index 17c96414fef..f211804e6d0 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/AppClientTracerVisitor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/AppClientTracerVisitor.java @@ -16,7 +16,9 @@ package com.sun.enterprise.deployment.util; -import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.ApplicationClientDescriptor; +import com.sun.enterprise.deployment.BundleDescriptor; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.types.*; import java.util.Iterator; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ApplicationValidator.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ApplicationValidator.java index e48c1a30168..1ba17d6a14f 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ApplicationValidator.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ApplicationValidator.java @@ -29,7 +29,28 @@ import java.util.*; import java.util.logging.Level; -import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.AbstractConnectorResourceDescriptor; +import com.sun.enterprise.deployment.AdministeredObjectDefinitionDescriptor; +import com.sun.enterprise.deployment.Application; +import com.sun.enterprise.deployment.ApplicationClientDescriptor; +import com.sun.enterprise.deployment.BundleDescriptor; +import com.sun.enterprise.deployment.CommonResourceBundleDescriptor; +import com.sun.enterprise.deployment.CommonResourceValidator; +import com.sun.enterprise.deployment.ConnectionFactoryDefinitionDescriptor; +import com.sun.enterprise.deployment.ConnectorDescriptor; +import com.sun.enterprise.deployment.DataSourceDefinitionDescriptor; +import com.sun.enterprise.deployment.EjbBundleDescriptor; +import com.sun.enterprise.deployment.EjbDescriptor; +import com.sun.enterprise.deployment.EjbIORConfigurationDescriptor; +import com.sun.enterprise.deployment.EnvironmentProperty; +import com.sun.enterprise.deployment.InjectionCapable; +import com.sun.enterprise.deployment.MailSessionDescriptor; +import com.sun.enterprise.deployment.ManagedBeanDescriptor; +import com.sun.enterprise.deployment.ResourceEnvReferenceDescriptor; +import com.sun.enterprise.deployment.ResourceReferenceDescriptor; +import com.sun.enterprise.deployment.ServiceReferenceDescriptor; +import com.sun.enterprise.deployment.WebBundleDescriptor; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.types.EjbReference; import com.sun.enterprise.deployment.types.MessageDestinationReferencer; import com.sun.enterprise.deployment.web.EnvironmentEntry; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ComponentVisitor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ComponentVisitor.java index 154184f70e5..a0ad3111465 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ComponentVisitor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ComponentVisitor.java @@ -22,7 +22,8 @@ package com.sun.enterprise.deployment.util; -import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.BundleDescriptor; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.types.EjbReference; import com.sun.enterprise.deployment.types.MessageDestinationReferencer; import org.glassfish.deployment.common.DescriptorVisitor; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/DefaultDOLVisitor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/DefaultDOLVisitor.java index 8066606120f..3321d6230b2 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/DefaultDOLVisitor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/DefaultDOLVisitor.java @@ -18,7 +18,14 @@ import org.glassfish.deployment.common.Descriptor; import org.glassfish.deployment.common.DescriptorVisitor; -import com.sun.enterprise.deployment.*; + +import com.sun.enterprise.deployment.BundleDescriptor; +import com.sun.enterprise.deployment.JndiNameEnvironment; +import com.sun.enterprise.deployment.MessageDestinationDescriptor; +import com.sun.enterprise.deployment.ResourceEnvReferenceDescriptor; +import com.sun.enterprise.deployment.ResourceReferenceDescriptor; +import com.sun.enterprise.deployment.ServiceReferenceDescriptor; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.types.*; import java.util.Iterator; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ManagedBeanVisitor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ManagedBeanVisitor.java index 822bb4ee532..ca16d0c6727 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ManagedBeanVisitor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ManagedBeanVisitor.java @@ -16,10 +16,11 @@ package com.sun.enterprise.deployment.util; -import com.sun.enterprise.deployment.*; - import java.util.Iterator; +import com.sun.enterprise.deployment.ManagedBeanDescriptor; +import com.sun.enterprise.deployment.core.*; + public interface ManagedBeanVisitor extends ComponentVisitor { public void accept(ManagedBeanDescriptor managedBean); diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ModuleContentValidator.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ModuleContentValidator.java index 25d1f4430f7..60779d0dfbe 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ModuleContentValidator.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ModuleContentValidator.java @@ -16,7 +16,10 @@ package com.sun.enterprise.deployment.util; -import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.BundleDescriptor; +import com.sun.enterprise.deployment.ServiceReferenceDescriptor; +import com.sun.enterprise.deployment.WebService; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.web.SecurityConstraint; import com.sun.enterprise.deployment.web.UserDataConstraint; import com.sun.enterprise.util.LocalStringManagerImpl; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ResourceValidator.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ResourceValidator.java index 2b2198ad772..255324ca216 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ResourceValidator.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ResourceValidator.java @@ -17,9 +17,29 @@ package com.sun.enterprise.deployment.util; import com.sun.enterprise.config.serverbeans.*; -import com.sun.enterprise.deployment.*; import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.deployment.AbstractConnectorResourceDescriptor; import com.sun.enterprise.deployment.Application; +import com.sun.enterprise.deployment.ApplicationClientDescriptor; +import com.sun.enterprise.deployment.BundleDescriptor; +import com.sun.enterprise.deployment.ConnectorDescriptor; +import com.sun.enterprise.deployment.EjbBundleDescriptor; +import com.sun.enterprise.deployment.EjbDescriptor; +import com.sun.enterprise.deployment.EjbReferenceDescriptor; +import com.sun.enterprise.deployment.EntityManagerFactoryReferenceDescriptor; +import com.sun.enterprise.deployment.EntityManagerReferenceDescriptor; +import com.sun.enterprise.deployment.EnvironmentProperty; +import com.sun.enterprise.deployment.JndiNameEnvironment; +import com.sun.enterprise.deployment.ManagedBeanDescriptor; +import com.sun.enterprise.deployment.MessageDestinationReferenceDescriptor; +import com.sun.enterprise.deployment.PersistenceUnitDescriptor; +import com.sun.enterprise.deployment.PersistenceUnitsDescriptor; +import com.sun.enterprise.deployment.ResourceEnvReferenceDescriptor; +import com.sun.enterprise.deployment.ResourceReferenceDescriptor; +import com.sun.enterprise.deployment.ServiceReferenceDescriptor; +import com.sun.enterprise.deployment.WebBundleDescriptor; +import com.sun.enterprise.deployment.core.*; + import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.api.deployment.DeployCommandParameters; import org.glassfish.api.deployment.DeploymentContext; diff --git a/appserver/deployment/pom.xml b/appserver/deployment/pom.xml index 28b8982ac47..4287191ae71 100755 --- a/appserver/deployment/pom.xml +++ b/appserver/deployment/pom.xml @@ -24,7 +24,6 @@ org.glassfish.main glassfish-parent 7.0.0-SNAPSHOT - ../pom.xml org.glassfish.main.deployment @@ -36,6 +35,7 @@ dtds schemas + dol-core dol jakartaee-core jakartaee-full diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/InternalInterceptorBindingImpl.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/InternalInterceptorBindingImpl.java index 9b5c26449a5..8633d5af109 100755 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/InternalInterceptorBindingImpl.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/InternalInterceptorBindingImpl.java @@ -18,10 +18,14 @@ package com.sun.ejb.containers; import com.sun.enterprise.container.common.spi.util.ComponentEnvManager; +import com.sun.enterprise.deployment.BundleDescriptor; +import com.sun.enterprise.deployment.EjbBundleDescriptor; +import com.sun.enterprise.deployment.EjbDescriptor; +import com.sun.enterprise.deployment.JndiNameEnvironment; +import com.sun.enterprise.deployment.core.*; + import org.glassfish.deployment.common.ModuleDescriptor; import org.glassfish.hk2.api.ServiceLocator; - -import com.sun.enterprise.deployment.*; import org.glassfish.api.invocation.ComponentInvocation; import java.util.Collection; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/EJBHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/EJBHandler.java index a9bc5cc326c..47c08d74d2d 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/EJBHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/EJBHandler.java @@ -27,9 +27,9 @@ import com.sun.enterprise.deployment.EjbReferenceDescriptor; import com.sun.enterprise.deployment.InjectionTarget; -import com.sun.enterprise.deployment.MetadataSource; import com.sun.enterprise.deployment.annotation.context.ResourceContainerContext; import com.sun.enterprise.deployment.annotation.handlers.AbstractResourceHandler; +import com.sun.enterprise.deployment.core.MetadataSource; import com.sun.enterprise.util.LocalStringManagerImpl; import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/EjbDescriptor.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/EjbDescriptor.java index ba9248b8537..b080f573d36 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/EjbDescriptor.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/EjbDescriptor.java @@ -64,11 +64,11 @@ import com.sun.enterprise.deployment.InterceptorDescriptor; import com.sun.enterprise.deployment.LifecycleCallbackDescriptor; import com.sun.enterprise.deployment.LifecycleCallbackDescriptor.CallbackType; +import com.sun.enterprise.deployment.core.ResourceDescriptor; import com.sun.enterprise.deployment.MessageDestinationReferenceDescriptor; import com.sun.enterprise.deployment.MethodDescriptor; import com.sun.enterprise.deployment.MethodPermission; import com.sun.enterprise.deployment.OrderedSet; -import com.sun.enterprise.deployment.ResourceDescriptor; import com.sun.enterprise.deployment.ResourceEnvReferenceDescriptor; import com.sun.enterprise.deployment.ResourceReferenceDescriptor; import com.sun.enterprise.deployment.RoleReference; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/EjbInterceptorNode.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/EjbInterceptorNode.java index 8a4b9742038..8ff27024d03 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/EjbInterceptorNode.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/EjbInterceptorNode.java @@ -75,7 +75,7 @@ public EjbInterceptorNode() { EnvEntryNode.class, "addEnvironmentProperty"); registerElementHandler(new XMLElement(TagNames.EJB_REFERENCE), EjbReferenceNode.class); registerElementHandler(new XMLElement(TagNames.EJB_LOCAL_REFERENCE), EjbLocalReferenceNode.class); - JndiEnvRefNode serviceRefNode = habitat.getService(JndiEnvRefNode.class, WebServicesTagNames.SERVICE_REF); + JndiEnvRefNode serviceRefNode = serviceLocator.getService(JndiEnvRefNode.class, WebServicesTagNames.SERVICE_REF); if (serviceRefNode != null) { registerElementHandler(new XMLElement(WebServicesTagNames.SERVICE_REF), serviceRefNode.getClass(),"addServiceReferenceDescriptor"); } diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/EjbNode.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/EjbNode.java index 160bf460c0b..f40cd9755e3 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/EjbNode.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/EjbNode.java @@ -17,6 +17,22 @@ package org.glassfish.ejb.deployment.node; +import static com.sun.enterprise.deployment.xml.TagNames.ADMINISTERED_OBJECT; +import static com.sun.enterprise.deployment.xml.TagNames.CONNECTION_FACTORY; +import static com.sun.enterprise.deployment.xml.TagNames.DATA_SOURCE; +import static com.sun.enterprise.deployment.xml.TagNames.EJB_LOCAL_REFERENCE; +import static com.sun.enterprise.deployment.xml.TagNames.EJB_REFERENCE; +import static com.sun.enterprise.deployment.xml.TagNames.ENVIRONMENT_PROPERTY; +import static com.sun.enterprise.deployment.xml.TagNames.JMS_CONNECTION_FACTORY; +import static com.sun.enterprise.deployment.xml.TagNames.JMS_DESTINATION; +import static com.sun.enterprise.deployment.xml.TagNames.MAIL_SESSION; +import static com.sun.enterprise.deployment.xml.TagNames.MESSAGE_DESTINATION_REFERENCE; +import static com.sun.enterprise.deployment.xml.TagNames.PERSISTENCE_CONTEXT_REF; +import static com.sun.enterprise.deployment.xml.TagNames.PERSISTENCE_UNIT_REF; +import static com.sun.enterprise.deployment.xml.TagNames.RESOURCE_ENV_REFERENCE; +import static com.sun.enterprise.deployment.xml.TagNames.RESOURCE_REFERENCE; +import static com.sun.enterprise.deployment.xml.WebServicesTagNames.SERVICE_REF; +import static org.glassfish.ejb.deployment.EjbTagNames.SECURITY_IDENTITY; import static org.omnifaces.concurrent.deployment.ConcurrencyConstants.CONTEXT_SERVICE; import static org.omnifaces.concurrent.deployment.ConcurrencyConstants.MANAGED_EXECUTOR; import static org.omnifaces.concurrent.deployment.ConcurrencyConstants.MANAGED_SCHEDULED_EXECUTOR; @@ -29,10 +45,6 @@ import org.glassfish.ejb.deployment.EjbTagNames; import org.glassfish.ejb.deployment.descriptor.EjbBundleDescriptorImpl; import org.glassfish.ejb.deployment.descriptor.EjbDescriptor; -import org.omnifaces.concurrent.node.ContextServiceDefinitionNode; -import org.omnifaces.concurrent.node.ManagedExecutorDefinitionNode; -import org.omnifaces.concurrent.node.ManagedScheduledExecutorDefinitionNode; -import org.omnifaces.concurrent.node.ManagedThreadFactoryDefinitionNode; import org.w3c.dom.Node; import com.sun.enterprise.deployment.LifecycleCallbackDescriptor; @@ -41,6 +53,7 @@ import com.sun.enterprise.deployment.RunAsIdentityDescriptor; import com.sun.enterprise.deployment.node.AdministeredObjectDefinitionNode; import com.sun.enterprise.deployment.node.ConnectionFactoryDefinitionNode; +import com.sun.enterprise.deployment.node.ContextServiceDefinitionNode; import com.sun.enterprise.deployment.node.DataSourceDefinitionNode; import com.sun.enterprise.deployment.node.DisplayableComponentNode; import com.sun.enterprise.deployment.node.EjbLocalReferenceNode; @@ -52,6 +65,9 @@ import com.sun.enterprise.deployment.node.JMSDestinationDefinitionNode; import com.sun.enterprise.deployment.node.JndiEnvRefNode; import com.sun.enterprise.deployment.node.MailSessionNode; +import com.sun.enterprise.deployment.node.ManagedExecutorDefinitionNode; +import com.sun.enterprise.deployment.node.ManagedScheduledExecutorDefinitionNode; +import com.sun.enterprise.deployment.node.ManagedThreadFactoryDefinitionNode; import com.sun.enterprise.deployment.node.MessageDestinationRefNode; import com.sun.enterprise.deployment.node.ResourceEnvRefNode; import com.sun.enterprise.deployment.node.ResourceRefNode; @@ -60,13 +76,12 @@ import com.sun.enterprise.deployment.types.EjbReference; import com.sun.enterprise.deployment.util.DOLUtils; import com.sun.enterprise.deployment.xml.TagNames; -import com.sun.enterprise.deployment.xml.WebServicesTagNames; /** - * This class is responsible for handling all common information - * shared by all types of enterprise beans (MDB, session, entity) + * This class is responsible for handling all common information shared by all types of enterprise beans (MDB, session, + * entity) * - * @author Jerome Dochez + * @author Jerome Dochez * @version */ public abstract class EjbNode extends DisplayableComponentNode { @@ -74,27 +89,26 @@ public abstract class EjbNode extends DisplayableCompon /** Creates new EjbNode */ public EjbNode() { super(); - registerElementHandler(new XMLElement(TagNames.ENVIRONMENT_PROPERTY), - EnvEntryNode.class, "addEnvironmentProperty"); - registerElementHandler(new XMLElement(TagNames.EJB_REFERENCE), EjbReferenceNode.class); - registerElementHandler(new XMLElement(TagNames.EJB_LOCAL_REFERENCE), EjbLocalReferenceNode.class); - JndiEnvRefNode serviceRefNode = habitat.getService(JndiEnvRefNode.class, WebServicesTagNames.SERVICE_REF); + registerElementHandler(new XMLElement(ENVIRONMENT_PROPERTY), EnvEntryNode.class, "addEnvironmentProperty"); + registerElementHandler(new XMLElement(EJB_REFERENCE), EjbReferenceNode.class); + registerElementHandler(new XMLElement(EJB_LOCAL_REFERENCE), EjbLocalReferenceNode.class); + JndiEnvRefNode serviceRefNode = serviceLocator.getService(JndiEnvRefNode.class, SERVICE_REF); if (serviceRefNode != null) { - registerElementHandler(new XMLElement(WebServicesTagNames.SERVICE_REF), serviceRefNode.getClass(),"addServiceReferenceDescriptor"); + registerElementHandler(new XMLElement(SERVICE_REF), serviceRefNode.getClass(), "addServiceReferenceDescriptor"); } - registerElementHandler(new XMLElement(TagNames.RESOURCE_REFERENCE), ResourceRefNode.class, "addResourceReferenceDescriptor"); - registerElementHandler(new XMLElement(TagNames.DATA_SOURCE), DataSourceDefinitionNode.class, "addResourceDescriptor"); - registerElementHandler(new XMLElement(TagNames.MAIL_SESSION), MailSessionNode.class, "addResourceDescriptor"); - registerElementHandler(new XMLElement(TagNames.CONNECTION_FACTORY), ConnectionFactoryDefinitionNode.class, "addResourceDescriptor"); - registerElementHandler(new XMLElement(TagNames.ADMINISTERED_OBJECT), AdministeredObjectDefinitionNode.class, "addResourceDescriptor"); - registerElementHandler(new XMLElement(TagNames.JMS_CONNECTION_FACTORY), JMSConnectionFactoryDefinitionNode.class, "addResourceDescriptor"); - registerElementHandler(new XMLElement(TagNames.JMS_DESTINATION), JMSDestinationDefinitionNode.class, "addResourceDescriptor"); - - registerElementHandler(new XMLElement(EjbTagNames.SECURITY_IDENTITY), SecurityIdentityNode.class); - registerElementHandler(new XMLElement(TagNames.RESOURCE_ENV_REFERENCE), ResourceEnvRefNode.class, "addResourceEnvReferenceDescriptor"); - registerElementHandler(new XMLElement(TagNames.MESSAGE_DESTINATION_REFERENCE), MessageDestinationRefNode.class); - registerElementHandler(new XMLElement(TagNames.PERSISTENCE_CONTEXT_REF), EntityManagerReferenceNode.class, "addEntityManagerReferenceDescriptor"); - registerElementHandler(new XMLElement(TagNames.PERSISTENCE_UNIT_REF), EntityManagerFactoryReferenceNode.class, "addEntityManagerFactoryReferenceDescriptor"); + registerElementHandler(new XMLElement(RESOURCE_REFERENCE), ResourceRefNode.class, "addResourceReferenceDescriptor"); + registerElementHandler(new XMLElement(DATA_SOURCE), DataSourceDefinitionNode.class, "addResourceDescriptor"); + registerElementHandler(new XMLElement(MAIL_SESSION), MailSessionNode.class, "addResourceDescriptor"); + registerElementHandler(new XMLElement(CONNECTION_FACTORY), ConnectionFactoryDefinitionNode.class, "addResourceDescriptor"); + registerElementHandler(new XMLElement(ADMINISTERED_OBJECT), AdministeredObjectDefinitionNode.class, "addResourceDescriptor"); + registerElementHandler(new XMLElement(JMS_CONNECTION_FACTORY), JMSConnectionFactoryDefinitionNode.class, "addResourceDescriptor"); + registerElementHandler(new XMLElement(JMS_DESTINATION), JMSDestinationDefinitionNode.class, "addResourceDescriptor"); + + registerElementHandler(new XMLElement(SECURITY_IDENTITY), SecurityIdentityNode.class); + registerElementHandler(new XMLElement(RESOURCE_ENV_REFERENCE), ResourceEnvRefNode.class, "addResourceEnvReferenceDescriptor"); + registerElementHandler(new XMLElement(MESSAGE_DESTINATION_REFERENCE), MessageDestinationRefNode.class); + registerElementHandler(new XMLElement(PERSISTENCE_CONTEXT_REF), EntityManagerReferenceNode.class, "addEntityManagerReferenceDescriptor"); + registerElementHandler(new XMLElement(PERSISTENCE_UNIT_REF), EntityManagerFactoryReferenceNode.class, "addEntityManagerFactoryReferenceDescriptor"); // Use special method for overrides because more than one schedule can be specified on a single method registerElementHandler(new XMLElement(EjbTagNames.TIMER), ScheduledTimerNode.class, "addScheduledTimerDescriptorFromDD"); @@ -106,13 +120,13 @@ public EjbNode() { } @Override - public void addDescriptor(Object newDescriptor) { + public void addDescriptor(Object newDescriptor) { if (newDescriptor instanceof EjbReference) { if (DOLUtils.getDefaultLogger().isLoggable(Level.FINE)) { DOLUtils.getDefaultLogger().fine("Adding ejb ref " + newDescriptor); } getEjbDescriptor().addEjbReferenceDescriptor((EjbReference) newDescriptor); - } else if (newDescriptor instanceof RunAsIdentityDescriptor) { + } else if (newDescriptor instanceof RunAsIdentityDescriptor) { if (DOLUtils.getDefaultLogger().isLoggable(Level.FINE)) { DOLUtils.getDefaultLogger().fine("Adding security-identity" + newDescriptor); } @@ -164,17 +178,17 @@ protected void writeCommonHeaderEjbDescriptor(Node ejbNode, EjbDescriptor descri * @param parent node for the DOM tree * @param the EJB descriptor the security information to be retrieved */ - protected void writeSecurityIdentityDescriptor(Node parent, EjbDescriptor descriptor) { - if (!descriptor.getUsesCallerIdentity() && descriptor.getRunAsIdentity()==null) { + protected void writeSecurityIdentityDescriptor(Node parent, EjbDescriptor descriptor) { + if (!descriptor.getUsesCallerIdentity() && descriptor.getRunAsIdentity() == null) { return; } SecurityIdentityNode node = new SecurityIdentityNode(); - node.writeDescriptor(parent, EjbTagNames.SECURITY_IDENTITY, descriptor); + node.writeDescriptor(parent, SECURITY_IDENTITY, descriptor); } /** - * write the security role references to the DOM Tree + * write the security role references to the DOM Tree * * @param parentNode for the DOM tree * @param refs iterator over the RoleReference descriptors to write @@ -193,7 +207,7 @@ protected static void writeAroundInvokeDescriptors(Node parentNode, Iterator aro } AroundInvokeNode subNode = new AroundInvokeNode(); - for(; aroundInvokeDescs.hasNext();) { + for (; aroundInvokeDescs.hasNext();) { LifecycleCallbackDescriptor next = (LifecycleCallbackDescriptor) aroundInvokeDescs.next(); subNode.writeDescriptor(parentNode, EjbTagNames.AROUND_INVOKE_METHOD, next); } diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/EjbBundleRuntimeNode.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/EjbBundleRuntimeNode.java index 25d81fcb578..e835b9d36ff 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/EjbBundleRuntimeNode.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/EjbBundleRuntimeNode.java @@ -46,7 +46,7 @@ public class EjbBundleRuntimeNode extends public EjbBundleRuntimeNode(EjbBundleDescriptorImpl descriptor) { super(descriptor); //trigger registration in standard node, if it hasn't happened - habitat.getService(EjbBundleNode.class); + serviceLocator.getService(EjbBundleNode.class); registerElementHandler(new XMLElement(RuntimeTagNames.SECURITY_ROLE_MAPPING), SecurityRoleMappingNode.class); registerElementHandler(new XMLElement(RuntimeTagNames.EJBS), diff --git a/appserver/extras/embedded/all/pom.xml b/appserver/extras/embedded/all/pom.xml index de9ddef0c9e..b5deb317e3b 100644 --- a/appserver/extras/embedded/all/pom.xml +++ b/appserver/extras/embedded/all/pom.xml @@ -157,6 +157,12 @@ ${project.version} true + + org.glassfish.main.deployment + dol-core + ${project.version} + true + org.glassfish.main.deployment dol diff --git a/appserver/featuresets/web/pom.xml b/appserver/featuresets/web/pom.xml index cee9bf9fb21..04c769b5636 100644 --- a/appserver/featuresets/web/pom.xml +++ b/appserver/featuresets/web/pom.xml @@ -358,6 +358,17 @@ + + org.glassfish.main.deployment + dol-core + ${project.version} + + + * + * + + + org.glassfish.main.deployment dol diff --git a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/deployment/annotation/handlers/DataSourceDefinitionHandler.java b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/deployment/annotation/handlers/DataSourceDefinitionHandler.java index ab1702fbf03..39cd5b882b2 100644 --- a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/deployment/annotation/handlers/DataSourceDefinitionHandler.java +++ b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/deployment/annotation/handlers/DataSourceDefinitionHandler.java @@ -37,8 +37,6 @@ import com.sun.enterprise.deployment.DataSourceDefinitionDescriptor; import com.sun.enterprise.deployment.EjbBundleDescriptor; import com.sun.enterprise.deployment.EjbDescriptor; -import com.sun.enterprise.deployment.MetadataSource; -import com.sun.enterprise.deployment.ResourceDescriptor; import com.sun.enterprise.deployment.WebBundleDescriptor; import com.sun.enterprise.deployment.annotation.context.EjbBundleContext; import com.sun.enterprise.deployment.annotation.context.EjbContext; @@ -48,6 +46,8 @@ import com.sun.enterprise.deployment.annotation.context.WebComponentContext; import com.sun.enterprise.deployment.annotation.context.WebComponentsContext; import com.sun.enterprise.deployment.annotation.handlers.AbstractResourceHandler; +import com.sun.enterprise.deployment.core.MetadataSource; +import com.sun.enterprise.deployment.core.ResourceDescriptor; import jakarta.annotation.sql.DataSourceDefinition; import jakarta.interceptor.AroundInvoke; @@ -66,14 +66,12 @@ public DataSourceDefinitionHandler() { } @Override - protected HandlerProcessingResult processAnnotation(AnnotationInfo ainfo, ResourceContainerContext[] rcContexts) - throws AnnotationProcessorException { + protected HandlerProcessingResult processAnnotation(AnnotationInfo ainfo, ResourceContainerContext[] rcContexts) throws AnnotationProcessorException { DataSourceDefinition dataSourceDefnAn = (DataSourceDefinition) ainfo.getAnnotation(); return processAnnotation(dataSourceDefnAn, ainfo, rcContexts); } - protected HandlerProcessingResult processAnnotation(DataSourceDefinition dataSourceDefnAn, AnnotationInfo aiInfo, - ResourceContainerContext[] rcContexts) throws AnnotationProcessorException { + protected HandlerProcessingResult processAnnotation(DataSourceDefinition dataSourceDefnAn, AnnotationInfo aiInfo, ResourceContainerContext[] rcContexts) throws AnnotationProcessorException { Class annotatedClass = (Class) aiInfo.getAnnotatedElement(); Annotation[] annotations = annotatedClass.getAnnotations(); boolean warClass = isAWebComponentClass(annotations); diff --git a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSConnectionFactoryDefinitionHandler.java b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSConnectionFactoryDefinitionHandler.java index e805edd94d5..d5b2c30d3b2 100644 --- a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSConnectionFactoryDefinitionHandler.java +++ b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSConnectionFactoryDefinitionHandler.java @@ -16,9 +16,13 @@ package com.sun.enterprise.connectors.jms.deployment.annotation.handlers; -import com.sun.enterprise.deployment.*; -import com.sun.enterprise.deployment.annotation.context.*; -import com.sun.enterprise.deployment.annotation.handlers.AbstractResourceHandler; +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.Collection; +import java.util.Properties; +import java.util.Set; +import java.util.logging.Level; + import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; @@ -27,16 +31,25 @@ import org.glassfish.deployment.common.RootDeploymentDescriptor; import org.jvnet.hk2.annotations.Service; +import com.sun.enterprise.deployment.EjbBundleDescriptor; +import com.sun.enterprise.deployment.EjbDescriptor; +import com.sun.enterprise.deployment.JMSConnectionFactoryDefinitionDescriptor; +import com.sun.enterprise.deployment.WebBundleDescriptor; +import com.sun.enterprise.deployment.annotation.context.EjbBundleContext; +import com.sun.enterprise.deployment.annotation.context.EjbContext; +import com.sun.enterprise.deployment.annotation.context.EjbInterceptorContext; +import com.sun.enterprise.deployment.annotation.context.ResourceContainerContext; +import com.sun.enterprise.deployment.annotation.context.WebBundleContext; +import com.sun.enterprise.deployment.annotation.context.WebComponentContext; +import com.sun.enterprise.deployment.annotation.context.WebComponentsContext; +import com.sun.enterprise.deployment.annotation.handlers.AbstractResourceHandler; +import com.sun.enterprise.deployment.core.MetadataSource; +import com.sun.enterprise.deployment.core.ResourceDescriptor; + import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.AroundTimeout; import jakarta.interceptor.Interceptors; import jakarta.jms.JMSConnectionFactoryDefinition; -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.util.Collection; -import java.util.Properties; -import java.util.Set; -import java.util.logging.Level; @Service @AnnotationHandlerFor(JMSConnectionFactoryDefinition.class) @@ -45,17 +58,14 @@ public class JMSConnectionFactoryDefinitionHandler extends AbstractResourceHandl public JMSConnectionFactoryDefinitionHandler() { } - protected HandlerProcessingResult processAnnotation(AnnotationInfo ainfo, ResourceContainerContext[] rcContexts) - throws AnnotationProcessorException { - JMSConnectionFactoryDefinition jmsConnectionFactoryDefnAn = - (JMSConnectionFactoryDefinition)ainfo.getAnnotation(); + @Override + protected HandlerProcessingResult processAnnotation(AnnotationInfo ainfo, ResourceContainerContext[] rcContexts) throws AnnotationProcessorException { + JMSConnectionFactoryDefinition jmsConnectionFactoryDefnAn = (JMSConnectionFactoryDefinition) ainfo.getAnnotation(); return processAnnotation(jmsConnectionFactoryDefnAn, ainfo, rcContexts); } - protected HandlerProcessingResult processAnnotation(JMSConnectionFactoryDefinition jmsConnectionFactoryDefnAn, AnnotationInfo aiInfo, - ResourceContainerContext[] rcContexts) - throws AnnotationProcessorException { - Class annotatedClass = (Class)aiInfo.getAnnotatedElement(); + protected HandlerProcessingResult processAnnotation(JMSConnectionFactoryDefinition jmsConnectionFactoryDefnAn, AnnotationInfo aiInfo, ResourceContainerContext[] rcContexts) throws AnnotationProcessorException { + Class annotatedClass = (Class) aiInfo.getAnnotatedElement(); Annotation[] annotations = annotatedClass.getAnnotations(); boolean warClass = isAWebComponentClass(annotations); boolean ejbClass = isAEjbComponentClass(annotations); @@ -89,9 +99,8 @@ private void setDefaultTransactionSupport(JMSConnectionFactoryDefinitionDescript } /** - * To take care of the case where an ejb is provided in a .war and - * annotation processor will process this class twice (once for ejb and - * once for web-bundle-context, which is a bug).
+ * To take care of the case where an ejb is provided in a .war and annotation processor will process this class twice + * (once for ejb and once for web-bundle-context, which is a bug).
* This method helps to overcome the issue, partially.
* Checks whether both the annotated class and the context are either ejb or web. * @@ -101,16 +110,12 @@ private void setDefaultTransactionSupport(JMSConnectionFactoryDefinitionDescript * @param context resource-container-context * @return boolean indicates whether the annotation can be processed. */ - private boolean canProcessAnnotation(Class annotatedClass, boolean ejbClass, boolean warClass, - ResourceContainerContext context) { + private boolean canProcessAnnotation(Class annotatedClass, boolean ejbClass, boolean warClass, ResourceContainerContext context) { if (ejbClass) { - if (!(context instanceof EjbBundleContext || - context instanceof EjbContext || - context instanceof EjbInterceptorContext - )) { + if (!(context instanceof EjbBundleContext || context instanceof EjbContext || context instanceof EjbInterceptorContext)) { if (logger.isLoggable(Level.FINEST)) { - logger.log(Level.FINEST, "Ignoring @JMSConnectionFactoryDefinition annotation processing as the class is " + - "an EJB class and context is not one of EJBContext"); + logger.log(Level.FINEST, "Ignoring @JMSConnectionFactoryDefinition annotation processing as the class is " + + "an EJB class and context is not one of EJBContext"); } return false; } @@ -120,18 +125,17 @@ private boolean canProcessAnnotation(Class annotatedClass, boolean ejbClass, EjbDescriptor[] ejbDescriptor = ejbBundleDescriptor.getEjbByClassName(annotatedClass.getName()); if (ejbDescriptor == null || ejbDescriptor.length == 0) { if (logger.isLoggable(Level.FINEST)) { - logger.log(Level.FINEST, "Ignoring @JMSConnectionFactoryDefinition annotation processing as the class " + - "[ " + annotatedClass + " ] is " + - "not an EJB class and the context is EJBContext"); + logger.log(Level.FINEST, "Ignoring @JMSConnectionFactoryDefinition annotation processing as the class " + "[ " + + annotatedClass + " ] is " + "not an EJB class and the context is EJBContext"); } return false; } } else if (warClass) { if (!(context instanceof WebBundleContext || context instanceof WebComponentsContext - || context instanceof WebComponentContext )) { + || context instanceof WebComponentContext)) { if (logger.isLoggable(Level.FINEST)) { - logger.log(Level.FINEST, "Ignoring @JMSConnectionFactoryDefinition annotation processing as the class is " + - "an Web class and context is not one of WebContext"); + logger.log(Level.FINEST, "Ignoring @JMSConnectionFactoryDefinition annotation processing as the class is " + + "an Web class and context is not one of WebContext"); } return false; } @@ -141,36 +145,33 @@ private boolean canProcessAnnotation(Class annotatedClass, boolean ejbClass, Collection extDesc = webBundleDescriptor.getExtensionsDescriptors(); for (RootDeploymentDescriptor desc : extDesc) { if (desc instanceof EjbBundleDescriptor) { - EjbBundleDescriptor ejbBundleDesc = (EjbBundleDescriptor)desc; + EjbBundleDescriptor ejbBundleDesc = (EjbBundleDescriptor) desc; EjbDescriptor[] ejbDescs = ejbBundleDesc.getEjbByClassName(annotatedClass.getName()); if (ejbDescs != null && ejbDescs.length > 0) { if (logger.isLoggable(Level.FINEST)) { - logger.log(Level.FINEST, "Ignoring @JMSConnectionFactoryDefinition annotation processing as the class " + - "[ " + annotatedClass + " ] is " + - "not an Web class and the context is WebContext"); + logger.log(Level.FINEST, "Ignoring @JMSConnectionFactoryDefinition annotation processing as the class " + "[ " + + annotatedClass + " ] is " + "not an Web class and the context is WebContext"); } return false; } else if (ejbBundleDesc.getInterceptorByClassName(annotatedClass.getName()) != null) { - if (logger.isLoggable(Level.FINEST)) { - logger.log(Level.FINEST, "Ignoring @JMSConnectionFactoryDefinition annotation processing " + - "as the class " + - "[ " + annotatedClass + " ] is " + - "not an Web class and the context is WebContext"); - } - return false; + if (logger.isLoggable(Level.FINEST)) { + logger.log(Level.FINEST, "Ignoring @JMSConnectionFactoryDefinition annotation processing " + "as the class " + + "[ " + annotatedClass + " ] is " + "not an Web class and the context is WebContext"); + } + return false; } else { Method[] methods = annotatedClass.getDeclaredMethods(); for (Method method : methods) { Annotation annotations[] = method.getAnnotations(); for (Annotation annotation : annotations) { - if (annotation.annotationType().equals(AroundInvoke.class) || - annotation.annotationType().equals(AroundTimeout.class) || - annotation.annotationType().equals(Interceptors.class)) { + if (annotation.annotationType().equals(AroundInvoke.class) + || annotation.annotationType().equals(AroundTimeout.class) + || annotation.annotationType().equals(Interceptors.class)) { if (logger.isLoggable(Level.FINEST)) { - logger.log(Level.FINEST, "Ignoring @JMSConnectionFactoryDefinition annotation processing " + - "as the class " + - "[ " + annotatedClass + " ] is " + - "not an Web class, an interceptor and the context is WebContext"); + logger.log(Level.FINEST, + "Ignoring @JMSConnectionFactoryDefinition annotation processing " + "as the class " + "[ " + + annotatedClass + " ] is " + + "not an Web class, an interceptor and the context is WebContext"); } return false; } @@ -183,8 +184,7 @@ private boolean canProcessAnnotation(Class annotatedClass, boolean ejbClass, return true; } - private boolean isDefinitionAlreadyPresent(Set jmscfdDescs, - JMSConnectionFactoryDefinitionDescriptor desc) { + private boolean isDefinitionAlreadyPresent(Set jmscfdDescs, JMSConnectionFactoryDefinitionDescriptor desc) { for (ResourceDescriptor descriptor : jmscfdDescs) { if (descriptor.equals(desc)) { return true; @@ -197,7 +197,7 @@ private void merge(Set jmscfdDescs, JMSConnectionFactoryDefi for (ResourceDescriptor descriptor : jmscfdDescs) { if (descriptor instanceof JMSConnectionFactoryDefinitionDescriptor) { - JMSConnectionFactoryDefinitionDescriptor desc = (JMSConnectionFactoryDefinitionDescriptor)descriptor; + JMSConnectionFactoryDefinitionDescriptor desc = (JMSConnectionFactoryDefinitionDescriptor) descriptor; if (desc.getName().equals(defn.name())) { if (desc.getInterfaceName() == null) { @@ -229,7 +229,7 @@ private void merge(Set jmscfdDescs, JMSConnectionFactoryDefi } if (desc.getPassword() == null) { - if (defn.password() != null /*ALLOW EMPTY PASSWORDS && !defn.password().equals("")*/) { + if (defn.password() != null /* ALLOW EMPTY PASSWORDS && !defn.password().equals("") */) { desc.setPassword(defn.password()); } } @@ -266,7 +266,7 @@ private void merge(Set jmscfdDescs, JMSConnectionFactoryDefi if (index > 0 && index < property.length() - 1) { String name = property.substring(0, index).trim(); String value = property.substring(index + 1).trim(); - //add to properties only when not already present + // add to properties only when not already present if (properties.get(name) == null) { properties.put(name, value); } @@ -304,7 +304,7 @@ private JMSConnectionFactoryDefinitionDescriptor createDescriptor(JMSConnectionF desc.setUser(defn.user()); } - if (defn.password() != null /*ALLOW EMPTY PASSWORDS && !defn.password().equals("")*/) { + if (defn.password() != null /* ALLOW EMPTY PASSWORDS && !defn.password().equals("") */) { desc.setPassword(defn.password()); } diff --git a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSDestinationDefinitionHandler.java b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSDestinationDefinitionHandler.java index bea89b30c5b..df05bd28cf7 100644 --- a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSDestinationDefinitionHandler.java +++ b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSDestinationDefinitionHandler.java @@ -16,9 +16,13 @@ package com.sun.enterprise.connectors.jms.deployment.annotation.handlers; -import com.sun.enterprise.deployment.*; -import com.sun.enterprise.deployment.annotation.context.*; -import com.sun.enterprise.deployment.annotation.handlers.AbstractResourceHandler; +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.Collection; +import java.util.Properties; +import java.util.Set; +import java.util.logging.Level; + import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; @@ -27,16 +31,25 @@ import org.glassfish.deployment.common.RootDeploymentDescriptor; import org.jvnet.hk2.annotations.Service; +import com.sun.enterprise.deployment.EjbBundleDescriptor; +import com.sun.enterprise.deployment.EjbDescriptor; +import com.sun.enterprise.deployment.JMSDestinationDefinitionDescriptor; +import com.sun.enterprise.deployment.WebBundleDescriptor; +import com.sun.enterprise.deployment.annotation.context.EjbBundleContext; +import com.sun.enterprise.deployment.annotation.context.EjbContext; +import com.sun.enterprise.deployment.annotation.context.EjbInterceptorContext; +import com.sun.enterprise.deployment.annotation.context.ResourceContainerContext; +import com.sun.enterprise.deployment.annotation.context.WebBundleContext; +import com.sun.enterprise.deployment.annotation.context.WebComponentContext; +import com.sun.enterprise.deployment.annotation.context.WebComponentsContext; +import com.sun.enterprise.deployment.annotation.handlers.AbstractResourceHandler; +import com.sun.enterprise.deployment.core.MetadataSource; +import com.sun.enterprise.deployment.core.ResourceDescriptor; + import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.AroundTimeout; import jakarta.interceptor.Interceptors; import jakarta.jms.JMSDestinationDefinition; -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.util.Collection; -import java.util.Properties; -import java.util.Set; -import java.util.logging.Level; @Service @AnnotationHandlerFor(JMSDestinationDefinition.class) @@ -45,17 +58,14 @@ public class JMSDestinationDefinitionHandler extends AbstractResourceHandler { public JMSDestinationDefinitionHandler() { } - protected HandlerProcessingResult processAnnotation(AnnotationInfo ainfo, ResourceContainerContext[] rcContexts) - throws AnnotationProcessorException { - JMSDestinationDefinition jmsDestinationDefnAn = - (JMSDestinationDefinition)ainfo.getAnnotation(); + @Override + protected HandlerProcessingResult processAnnotation(AnnotationInfo ainfo, ResourceContainerContext[] rcContexts) throws AnnotationProcessorException { + JMSDestinationDefinition jmsDestinationDefnAn = (JMSDestinationDefinition) ainfo.getAnnotation(); return processAnnotation(jmsDestinationDefnAn, ainfo, rcContexts); } - protected HandlerProcessingResult processAnnotation(JMSDestinationDefinition jmsDestinationDefnAn, AnnotationInfo aiInfo, - ResourceContainerContext[] rcContexts) - throws AnnotationProcessorException { - Class annotatedClass = (Class)aiInfo.getAnnotatedElement(); + protected HandlerProcessingResult processAnnotation(JMSDestinationDefinition jmsDestinationDefnAn, AnnotationInfo aiInfo, ResourceContainerContext[] rcContexts) throws AnnotationProcessorException { + Class annotatedClass = (Class) aiInfo.getAnnotatedElement(); Annotation[] annotations = annotatedClass.getAnnotations(); boolean warClass = isAWebComponentClass(annotations); boolean ejbClass = isAEjbComponentClass(annotations); @@ -73,13 +83,13 @@ protected HandlerProcessingResult processAnnotation(JMSDestinationDefinition jms context.addResourceDescriptor(desc); } } + return getDefaultProcessedResult(); } /** - * To take care of the case where an ejb is provided in a .war and - * annotation processor will process this class twice (once for ejb and - * once for web-bundle-context, which is a bug).
+ * To take care of the case where an ejb is provided in a .war and annotation processor will process this class twice + * (once for ejb and once for web-bundle-context, which is a bug).
* This method helps to overcome the issue, partially.
* Checks whether both the annotated class and the context are either ejb or web. * @@ -89,16 +99,12 @@ protected HandlerProcessingResult processAnnotation(JMSDestinationDefinition jms * @param context resource-container-context * @return boolean indicates whether the annotation can be processed. */ - private boolean canProcessAnnotation(Class annotatedClass, boolean ejbClass, boolean warClass, - ResourceContainerContext context) { + private boolean canProcessAnnotation(Class annotatedClass, boolean ejbClass, boolean warClass, ResourceContainerContext context) { if (ejbClass) { - if (!(context instanceof EjbBundleContext || - context instanceof EjbContext || - context instanceof EjbInterceptorContext - )) { + if (!(context instanceof EjbBundleContext || context instanceof EjbContext || context instanceof EjbInterceptorContext)) { if (logger.isLoggable(Level.FINEST)) { - logger.log(Level.FINEST, "Ignoring @JMSDestinationDefinition annotation processing as the class is " + - "an EJB class and context is not one of EJBContext"); + logger.log(Level.FINEST, "Ignoring @JMSDestinationDefinition annotation processing as the class is " + + "an EJB class and context is not one of EJBContext"); } return false; } @@ -108,18 +114,17 @@ private boolean canProcessAnnotation(Class annotatedClass, boolean ejbClass, EjbDescriptor[] ejbDescriptor = ejbBundleDescriptor.getEjbByClassName(annotatedClass.getName()); if (ejbDescriptor == null || ejbDescriptor.length == 0) { if (logger.isLoggable(Level.FINEST)) { - logger.log(Level.FINEST, "Ignoring @JMSDestinationDefinition annotation processing as the class " + - "[ " + annotatedClass + " ] is " + - "not an EJB class and the context is EJBContext"); + logger.log(Level.FINEST, "Ignoring @JMSDestinationDefinition annotation processing as the class " + "[ " + + annotatedClass + " ] is " + "not an EJB class and the context is EJBContext"); } return false; } } else if (warClass) { if (!(context instanceof WebBundleContext || context instanceof WebComponentsContext - || context instanceof WebComponentContext )) { + || context instanceof WebComponentContext)) { if (logger.isLoggable(Level.FINEST)) { - logger.log(Level.FINEST, "Ignoring @JMSDestinationDefinition annotation processing as the class is " + - "an Web class and context is not one of WebContext"); + logger.log(Level.FINEST, "Ignoring @JMSDestinationDefinition annotation processing as the class is " + + "an Web class and context is not one of WebContext"); } return false; } @@ -129,36 +134,33 @@ private boolean canProcessAnnotation(Class annotatedClass, boolean ejbClass, Collection extDesc = webBundleDescriptor.getExtensionsDescriptors(); for (RootDeploymentDescriptor desc : extDesc) { if (desc instanceof EjbBundleDescriptor) { - EjbBundleDescriptor ejbBundleDesc = (EjbBundleDescriptor)desc; + EjbBundleDescriptor ejbBundleDesc = (EjbBundleDescriptor) desc; EjbDescriptor[] ejbDescs = ejbBundleDesc.getEjbByClassName(annotatedClass.getName()); if (ejbDescs != null && ejbDescs.length > 0) { if (logger.isLoggable(Level.FINEST)) { - logger.log(Level.FINEST, "Ignoring @JMSDestinationDefinition annotation processing as the class " + - "[ " + annotatedClass + " ] is " + - "not an Web class and the context is WebContext"); + logger.log(Level.FINEST, "Ignoring @JMSDestinationDefinition annotation processing as the class " + "[ " + + annotatedClass + " ] is " + "not an Web class and the context is WebContext"); } return false; } else if (ejbBundleDesc.getInterceptorByClassName(annotatedClass.getName()) != null) { - if (logger.isLoggable(Level.FINEST)) { - logger.log(Level.FINEST, "Ignoring @JMSDestinationDefinition annotation processing " + - "as the class " + - "[ " + annotatedClass + " ] is " + - "not an Web class and the context is WebContext"); - } - return false; + if (logger.isLoggable(Level.FINEST)) { + logger.log(Level.FINEST, "Ignoring @JMSDestinationDefinition annotation processing " + "as the class " + "[ " + + annotatedClass + " ] is " + "not an Web class and the context is WebContext"); + } + return false; } else { Method[] methods = annotatedClass.getDeclaredMethods(); for (Method method : methods) { Annotation annotations[] = method.getAnnotations(); for (Annotation annotation : annotations) { - if (annotation.annotationType().equals(AroundInvoke.class) || - annotation.annotationType().equals(AroundTimeout.class) || - annotation.annotationType().equals(Interceptors.class)) { + if (annotation.annotationType().equals(AroundInvoke.class) + || annotation.annotationType().equals(AroundTimeout.class) + || annotation.annotationType().equals(Interceptors.class)) { if (logger.isLoggable(Level.FINEST)) { - logger.log(Level.FINEST, "Ignoring @JMSDestinationDefinition annotation processing " + - "as the class " + - "[ " + annotatedClass + " ] is " + - "not an Web class, an interceptor and the context is WebContext"); + logger.log(Level.FINEST, + "Ignoring @JMSDestinationDefinition annotation processing " + "as the class " + "[ " + + annotatedClass + " ] is " + + "not an Web class, an interceptor and the context is WebContext"); } return false; } @@ -171,8 +173,7 @@ private boolean canProcessAnnotation(Class annotatedClass, boolean ejbClass, return true; } - private boolean isDefinitionAlreadyPresent(Set jmsddDescs, - JMSDestinationDefinitionDescriptor desc) { + private boolean isDefinitionAlreadyPresent(Set jmsddDescs, JMSDestinationDefinitionDescriptor desc) { for (ResourceDescriptor descriptor : jmsddDescs) { if (descriptor.equals(desc)) { return true; @@ -185,7 +186,7 @@ private void merge(Set jmsddDescs, JMSDestinationDefinition for (ResourceDescriptor descriptor : jmsddDescs) { if (descriptor instanceof JMSDestinationDefinitionDescriptor) { - JMSDestinationDefinitionDescriptor desc = (JMSDestinationDefinitionDescriptor)descriptor; + JMSDestinationDefinitionDescriptor desc = (JMSDestinationDefinitionDescriptor) descriptor; if (desc.getName().equals(defn.name())) { if (desc.getInterfaceName() == null) { @@ -226,7 +227,7 @@ private void merge(Set jmsddDescs, JMSDestinationDefinition if (index > 0 && index < property.length() - 1) { String name = property.substring(0, index).trim(); String value = property.substring(index + 1).trim(); - //add to properties only when not already present + // add to properties only when not already present if (properties.get(name) == null) { properties.put(name, value); } @@ -241,7 +242,6 @@ private void merge(Set jmsddDescs, JMSDestinationDefinition } private JMSDestinationDefinitionDescriptor createDescriptor(JMSDestinationDefinition defn) { - JMSDestinationDefinitionDescriptor desc = new JMSDestinationDefinitionDescriptor(); desc.setMetadataSource(MetadataSource.ANNOTATION); diff --git a/appserver/pom.xml b/appserver/pom.xml index 6e412af911a..03016b6f5db 100644 --- a/appserver/pom.xml +++ b/appserver/pom.xml @@ -91,7 +91,7 @@ 3.0.0 3.0.0-RC1 - 3.0.0-RC1 + 3.0.0-RC2 2.1.0 diff --git a/appserver/resources/mail/mail-runtime/src/main/java/org/glassfish/resources/mail/annotation/handler/MailSessionDefinitionHandler.java b/appserver/resources/mail/mail-runtime/src/main/java/org/glassfish/resources/mail/annotation/handler/MailSessionDefinitionHandler.java index 46b6ea4aa9f..96cc66b6fc8 100644 --- a/appserver/resources/mail/mail-runtime/src/main/java/org/glassfish/resources/mail/annotation/handler/MailSessionDefinitionHandler.java +++ b/appserver/resources/mail/mail-runtime/src/main/java/org/glassfish/resources/mail/annotation/handler/MailSessionDefinitionHandler.java @@ -17,10 +17,13 @@ package org.glassfish.resources.mail.annotation.handler; -import com.sun.enterprise.deployment.*; -import com.sun.enterprise.deployment.annotation.context.*; -import com.sun.enterprise.deployment.annotation.handlers.AbstractResourceHandler; -import com.sun.enterprise.util.LocalStringManagerImpl; +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.Collection; +import java.util.Properties; +import java.util.Set; +import java.util.logging.Level; + import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; @@ -29,31 +32,37 @@ import org.glassfish.deployment.common.RootDeploymentDescriptor; import org.jvnet.hk2.annotations.Service; +import com.sun.enterprise.deployment.EjbBundleDescriptor; +import com.sun.enterprise.deployment.EjbDescriptor; +import com.sun.enterprise.deployment.MailSessionDescriptor; +import com.sun.enterprise.deployment.WebBundleDescriptor; +import com.sun.enterprise.deployment.annotation.context.EjbBundleContext; +import com.sun.enterprise.deployment.annotation.context.EjbContext; +import com.sun.enterprise.deployment.annotation.context.EjbInterceptorContext; +import com.sun.enterprise.deployment.annotation.context.ResourceContainerContext; +import com.sun.enterprise.deployment.annotation.context.WebBundleContext; +import com.sun.enterprise.deployment.annotation.context.WebComponentContext; +import com.sun.enterprise.deployment.annotation.context.WebComponentsContext; +import com.sun.enterprise.deployment.annotation.handlers.AbstractResourceHandler; +import com.sun.enterprise.deployment.core.MetadataSource; +import com.sun.enterprise.deployment.core.ResourceDescriptor; +import com.sun.enterprise.util.LocalStringManagerImpl; + import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.AroundTimeout; import jakarta.interceptor.Interceptors; import jakarta.mail.MailSessionDefinition; -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.util.Collection; -import java.util.Properties; -import java.util.Set; -import java.util.logging.Level; /** - * Created by IntelliJ IDEA. - * User: naman mehta - * Date: 18/4/12 - * Time: 11:04 AM - * To change this template use File | Settings | File Templates. + * Created by IntelliJ IDEA. User: naman mehta Date: 18/4/12 Time: 11:04 AM To change this template use File | Settings + * | File Templates. */ @Service @AnnotationHandlerFor(MailSessionDefinition.class) public class MailSessionDefinitionHandler extends AbstractResourceHandler { - protected final static LocalStringManagerImpl localStrings = - new LocalStringManagerImpl(MailSessionDefinitionHandler.class); + protected final static LocalStringManagerImpl localStrings = new LocalStringManagerImpl(MailSessionDefinitionHandler.class); public MailSessionDefinitionHandler() { @@ -61,14 +70,11 @@ public MailSessionDefinitionHandler() { @Override protected HandlerProcessingResult processAnnotation(AnnotationInfo ainfo, ResourceContainerContext[] rcContexts) throws AnnotationProcessorException { - MailSessionDefinition mailSessionDefnAn = - (MailSessionDefinition) ainfo.getAnnotation(); + MailSessionDefinition mailSessionDefnAn = (MailSessionDefinition) ainfo.getAnnotation(); return processAnnotation(mailSessionDefnAn, ainfo, rcContexts); } - protected HandlerProcessingResult processAnnotation(MailSessionDefinition mailSessionDefnAn, AnnotationInfo aiInfo, - ResourceContainerContext[] rcContexts) - throws AnnotationProcessorException { + protected HandlerProcessingResult processAnnotation(MailSessionDefinition mailSessionDefnAn, AnnotationInfo aiInfo, ResourceContainerContext[] rcContexts) throws AnnotationProcessorException { Class annotatedClass = (Class) aiInfo.getAnnotatedElement(); Annotation[] annotations = annotatedClass.getAnnotations(); boolean warClass = isAWebComponentClass(annotations); @@ -90,16 +96,12 @@ protected HandlerProcessingResult processAnnotation(MailSessionDefinition mailSe return getDefaultProcessedResult(); } - private boolean canProcessAnnotation(Class annotatedClass, boolean ejbClass, boolean warClass, - ResourceContainerContext context) { + private boolean canProcessAnnotation(Class annotatedClass, boolean ejbClass, boolean warClass, ResourceContainerContext context) { if (ejbClass) { - if (!(context instanceof EjbBundleContext || - context instanceof EjbContext || - context instanceof EjbInterceptorContext - )) { + if (!(context instanceof EjbBundleContext || context instanceof EjbContext || context instanceof EjbInterceptorContext)) { if (logger.isLoggable(Level.FINEST)) { - logger.log(Level.FINEST, "Ignoring @MailSessionDefinition annotation processing as the class is " + - "an EJB class and context is not one of EJBContext"); + logger.log(Level.FINEST, "Ignoring @MailSessionDefinition annotation processing as the class is " + + "an EJB class and context is not one of EJBContext"); } return false; } @@ -109,9 +111,8 @@ private boolean canProcessAnnotation(Class annotatedClass, boolean ejbClass, boo EjbDescriptor[] ejbDescriptor = ejbBundleDescriptor.getEjbByClassName(annotatedClass.getName()); if (ejbDescriptor == null || ejbDescriptor.length == 0) { if (logger.isLoggable(Level.FINEST)) { - logger.log(Level.FINEST, "Ignoring @MailSessionDefinition annotation processing as the class " + - "[ " + annotatedClass + " ] is " + - "not an EJB class and the context is EJBContext"); + logger.log(Level.FINEST, "Ignoring @MailSessionDefinition annotation processing as the class " + "[ " + annotatedClass + + " ] is " + "not an EJB class and the context is EJBContext"); } return false; } @@ -119,8 +120,8 @@ private boolean canProcessAnnotation(Class annotatedClass, boolean ejbClass, boo if (!(context instanceof WebBundleContext || context instanceof WebComponentsContext || context instanceof WebComponentContext)) { if (logger.isLoggable(Level.FINEST)) { - logger.log(Level.FINEST, "Ignoring @MailSessionDefinition annotation processing as the class is " + - "an Web class and context is not one of WebContext"); + logger.log(Level.FINEST, "Ignoring @MailSessionDefinition annotation processing as the class is " + + "an Web class and context is not one of WebContext"); } return false; } @@ -134,17 +135,14 @@ private boolean canProcessAnnotation(Class annotatedClass, boolean ejbClass, boo EjbDescriptor[] ejbDescs = ejbBundleDesc.getEjbByClassName(annotatedClass.getName()); if (ejbDescs != null && ejbDescs.length > 0) { if (logger.isLoggable(Level.FINEST)) { - logger.log(Level.FINEST, "Ignoring @MailSessionDefinition annotation processing as the class " + - "[ " + annotatedClass + " ] is " + - "not an Web class and the context is WebContext"); + logger.log(Level.FINEST, "Ignoring @MailSessionDefinition annotation processing as the class " + "[ " + + annotatedClass + " ] is " + "not an Web class and the context is WebContext"); } return false; } else if (ejbBundleDesc.getInterceptorByClassName(annotatedClass.getName()) != null) { if (logger.isLoggable(Level.FINEST)) { - logger.log(Level.FINEST, "Ignoring @MailSessionDefinition annotation processing " + - "as the class " + - "[ " + annotatedClass + " ] is " + - "not an Web class and the context is WebContext"); + logger.log(Level.FINEST, "Ignoring @MailSessionDefinition annotation processing " + "as the class " + "[ " + + annotatedClass + " ] is " + "not an Web class and the context is WebContext"); } return false; } else { @@ -152,14 +150,14 @@ private boolean canProcessAnnotation(Class annotatedClass, boolean ejbClass, boo for (Method method : methods) { Annotation annotations[] = method.getAnnotations(); for (Annotation annotation : annotations) { - if (annotation.annotationType().equals(AroundInvoke.class) || - annotation.annotationType().equals(AroundTimeout.class) || - annotation.annotationType().equals(Interceptors.class)) { + if (annotation.annotationType().equals(AroundInvoke.class) + || annotation.annotationType().equals(AroundTimeout.class) + || annotation.annotationType().equals(Interceptors.class)) { if (logger.isLoggable(Level.FINEST)) { - logger.log(Level.FINEST, "Ignoring @MailSessionDefinition annotation processing " + - "as the class " + - "[ " + annotatedClass + " ] is " + - "not an Web class, an interceptor and the context is WebContext"); + logger.log(Level.FINEST, + "Ignoring @MailSessionDefinition annotation processing " + "as the class " + "[ " + + annotatedClass + " ] is " + + "not an Web class, an interceptor and the context is WebContext"); } return false; } @@ -199,7 +197,7 @@ private MailSessionDescriptor createDescriptor(MailSessionDefinition defn) { desc.setUser(defn.user()); } - if (defn.password() != null /*ALLOW EMPTY PASSWORDS && !defn.password().equals("")*/) { + if (defn.password() != null /* ALLOW EMPTY PASSWORDS && !defn.password().equals("") */) { desc.setPassword(defn.password()); } @@ -227,8 +225,7 @@ private MailSessionDescriptor createDescriptor(MailSessionDefinition defn) { return desc; } - private boolean isDefinitionAlreadyPresent(Set mailSessionDescs, - MailSessionDescriptor mailSessionDesc) { + private boolean isDefinitionAlreadyPresent(Set mailSessionDescs, MailSessionDescriptor mailSessionDesc) { boolean result = false; for (ResourceDescriptor msDesc : mailSessionDescs) { if (msDesc.equals(mailSessionDesc)) { @@ -242,7 +239,7 @@ private boolean isDefinitionAlreadyPresent(Set mailSessionDe private void merge(Set mailSessionDescs, MailSessionDefinition mailSessionDefn) { for (ResourceDescriptor orgDesc : mailSessionDescs) { - MailSessionDescriptor desc = (MailSessionDescriptor)orgDesc; + MailSessionDescriptor desc = (MailSessionDescriptor) orgDesc; if (desc.getName().equals(mailSessionDefn.name())) { if (desc.getDescription() == null) { @@ -270,7 +267,7 @@ private void merge(Set mailSessionDescs, MailSessionDefiniti } if (desc.getPassword() == null) { - if (mailSessionDefn.password() != null /*ALLOW EMPTY PASSWORDS && !defn.password().equals("")*/) { + if (mailSessionDefn.password() != null /* ALLOW EMPTY PASSWORDS && !defn.password().equals("") */) { desc.setPassword(mailSessionDefn.password()); } } @@ -289,7 +286,7 @@ private void merge(Set mailSessionDescs, MailSessionDefiniti if (index > -1 && index != 0 && index < property.length() - 1) { String name = property.substring(0, index); String value = property.substring(index + 1); - //add to properties only when not already present + // add to properties only when not already present if (properties.get(name) == null) { properties.put(name, value); } diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/TomcatDeploymentConfig.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/TomcatDeploymentConfig.java index 4c9856e88f7..84d343a59c4 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/TomcatDeploymentConfig.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/TomcatDeploymentConfig.java @@ -16,7 +16,17 @@ package com.sun.enterprise.web; -import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.EjbReferenceDescriptor; +import com.sun.enterprise.deployment.EnvironmentProperty; +import com.sun.enterprise.deployment.LocaleEncodingMappingDescriptor; +import com.sun.enterprise.deployment.LocaleEncodingMappingListDescriptor; +import com.sun.enterprise.deployment.MessageDestinationDescriptor; +import com.sun.enterprise.deployment.MessageDestinationReferenceDescriptor; +import com.sun.enterprise.deployment.ResourceReferenceDescriptor; +import com.sun.enterprise.deployment.SecurityRoleDescriptor; +import com.sun.enterprise.deployment.WebBundleDescriptor; +import com.sun.enterprise.deployment.WebComponentDescriptor; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.types.EjbReference; import com.sun.enterprise.deployment.web.*; import com.sun.enterprise.web.deploy.*; diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleContextConfig.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleContextConfig.java index 2a8cce2da99..c021c35fa34 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleContextConfig.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleContextConfig.java @@ -19,7 +19,11 @@ import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.SecurityService; import com.sun.enterprise.container.common.spi.util.ComponentEnvManager; -import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.EjbBundleDescriptor; +import com.sun.enterprise.deployment.EnvironmentProperty; +import com.sun.enterprise.deployment.ResourcePrincipal; +import com.sun.enterprise.deployment.ResourceReferenceDescriptor; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.web.ContextParameter; import org.apache.catalina.*; import org.apache.catalina.authenticator.DigestAuthenticator; diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/WebBundleDescriptorImpl.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/WebBundleDescriptorImpl.java index 0d3185f00a7..244c323134f 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/WebBundleDescriptorImpl.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/WebBundleDescriptorImpl.java @@ -16,7 +16,32 @@ package org.glassfish.web.deployment.descriptor; -import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.EjbBundleDescriptor; +import com.sun.enterprise.deployment.EjbReferenceDescriptor; +import com.sun.enterprise.deployment.EntityManagerFactoryReferenceDescriptor; +import com.sun.enterprise.deployment.EntityManagerReferenceDescriptor; +import com.sun.enterprise.deployment.EnvironmentProperty; +import com.sun.enterprise.deployment.InjectionCapable; +import com.sun.enterprise.deployment.InjectionInfo; +import com.sun.enterprise.deployment.InjectionTarget; +import com.sun.enterprise.deployment.JndiNameEnvironment; +import com.sun.enterprise.deployment.LifecycleCallbackDescriptor; +import com.sun.enterprise.deployment.LocaleEncodingMappingDescriptor; +import com.sun.enterprise.deployment.LocaleEncodingMappingListDescriptor; +import com.sun.enterprise.deployment.MessageDestinationReferenceDescriptor; +import com.sun.enterprise.deployment.NamedReferencePair; +import com.sun.enterprise.deployment.OrderedSet; +import com.sun.enterprise.deployment.PersistenceUnitDescriptor; +import com.sun.enterprise.deployment.ResourceEnvReferenceDescriptor; +import com.sun.enterprise.deployment.ResourceReferenceDescriptor; +import com.sun.enterprise.deployment.SecurityRoleDescriptor; +import com.sun.enterprise.deployment.ServiceReferenceDescriptor; +import com.sun.enterprise.deployment.WebBundleDescriptor; +import com.sun.enterprise.deployment.WebComponentDescriptor; +import com.sun.enterprise.deployment.WebService; +import com.sun.enterprise.deployment.WebServiceEndpoint; +import com.sun.enterprise.deployment.WebServicesDescriptor; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.runtime.web.SunWebApp; import com.sun.enterprise.deployment.types.EjbReference; import com.sun.enterprise.deployment.util.ComponentPostVisitor; diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/WebComponentDescriptorImpl.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/WebComponentDescriptorImpl.java index 76af8d0c8b2..9fdba474448 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/WebComponentDescriptorImpl.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/WebComponentDescriptorImpl.java @@ -17,7 +17,12 @@ package org.glassfish.web.deployment.descriptor; import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.Application; +import com.sun.enterprise.deployment.OrderedSet; +import com.sun.enterprise.deployment.RunAsIdentityDescriptor; +import com.sun.enterprise.deployment.WebBundleDescriptor; +import com.sun.enterprise.deployment.WebComponentDescriptor; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.web.InitializationParameter; import com.sun.enterprise.deployment.web.MultipartConfig; import com.sun.enterprise.deployment.web.SecurityRoleReference; diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/WebFragmentDescriptor.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/WebFragmentDescriptor.java index e4b406b65ec..50d0dde2b80 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/WebFragmentDescriptor.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/WebFragmentDescriptor.java @@ -16,7 +16,24 @@ package org.glassfish.web.deployment.descriptor; -import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.AdministeredObjectDefinitionDescriptor; +import com.sun.enterprise.deployment.ConnectionFactoryDefinitionDescriptor; +import com.sun.enterprise.deployment.DataSourceDefinitionDescriptor; +import com.sun.enterprise.deployment.EjbReferenceDescriptor; +import com.sun.enterprise.deployment.EntityManagerFactoryReferenceDescriptor; +import com.sun.enterprise.deployment.EntityManagerReferenceDescriptor; +import com.sun.enterprise.deployment.EnvironmentProperty; +import com.sun.enterprise.deployment.JMSConnectionFactoryDefinitionDescriptor; +import com.sun.enterprise.deployment.JMSDestinationDefinitionDescriptor; +import com.sun.enterprise.deployment.JndiNameEnvironment; +import com.sun.enterprise.deployment.MailSessionDescriptor; +import com.sun.enterprise.deployment.MessageDestinationReferenceDescriptor; +import com.sun.enterprise.deployment.ResourceEnvReferenceDescriptor; +import com.sun.enterprise.deployment.ResourceReferenceDescriptor; +import com.sun.enterprise.deployment.ServiceReferenceDescriptor; +import com.sun.enterprise.deployment.WebBundleDescriptor; +import com.sun.enterprise.deployment.WebComponentDescriptor; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.types.EjbReference; import com.sun.enterprise.deployment.web.EnvironmentEntry; import com.sun.enterprise.deployment.web.LoginConfiguration; diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/WebBundleNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/WebBundleNode.java index 97f92cc3d34..7a00680ac7e 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/WebBundleNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/WebBundleNode.java @@ -16,7 +16,8 @@ package org.glassfish.web.deployment.node; -import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.WebBundleDescriptor; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.io.ConfigurationDeploymentDescriptorFile; import com.sun.enterprise.deployment.node.*; import com.sun.enterprise.deployment.util.DOLUtils; @@ -87,7 +88,7 @@ public Map registerRuntimeBundle(final Map publicID final Map result = new HashMap(); for (ConfigurationDeploymentDescriptorFile wddFile : DOLUtils.getConfigurationDeploymentDescriptorFiles( - habitat, WarType.ARCHIVE_TYPE)) { + serviceLocator, WarType.ARCHIVE_TYPE)) { wddFile.registerBundle(result, publicIDToDTD, versionUpgrades); } diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/WebCommonNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/WebCommonNode.java index 06bb8c5f346..35cccf30695 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/WebCommonNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/WebCommonNode.java @@ -17,6 +17,18 @@ package org.glassfish.web.deployment.node; +import static com.sun.enterprise.deployment.xml.TagNames.ADMINISTERED_OBJECT; +import static com.sun.enterprise.deployment.xml.TagNames.CONNECTION_FACTORY; +import static com.sun.enterprise.deployment.xml.TagNames.DATA_SOURCE; +import static com.sun.enterprise.deployment.xml.TagNames.JMS_CONNECTION_FACTORY; +import static com.sun.enterprise.deployment.xml.TagNames.JMS_DESTINATION; +import static com.sun.enterprise.deployment.xml.TagNames.MAIL_SESSION; +import static com.sun.enterprise.deployment.xml.TagNames.MESSAGE_DESTINATION; +import static com.sun.enterprise.deployment.xml.TagNames.POST_CONSTRUCT; +import static com.sun.enterprise.deployment.xml.TagNames.PRE_DESTROY; +import static org.glassfish.web.deployment.xml.WebTagNames.JSPCONFIG; +import static org.glassfish.web.deployment.xml.WebTagNames.LOCALE_ENCODING_MAPPING; +import static org.glassfish.web.deployment.xml.WebTagNames.TAGLIB; import static org.omnifaces.concurrent.deployment.ConcurrencyConstants.CONTEXT_SERVICE; import static org.omnifaces.concurrent.deployment.ConcurrencyConstants.MANAGED_EXECUTOR; import static org.omnifaces.concurrent.deployment.ConcurrencyConstants.MANAGED_SCHEDULED_EXECUTOR; @@ -43,10 +55,6 @@ import org.glassfish.web.deployment.descriptor.TagLibConfigurationDescriptor; import org.glassfish.web.deployment.descriptor.WebBundleDescriptorImpl; import org.glassfish.web.deployment.xml.WebTagNames; -import org.omnifaces.concurrent.node.ContextServiceDefinitionNode; -import org.omnifaces.concurrent.node.ManagedExecutorDefinitionNode; -import org.omnifaces.concurrent.node.ManagedScheduledExecutorDefinitionNode; -import org.omnifaces.concurrent.node.ManagedThreadFactoryDefinitionNode; import org.w3c.dom.Node; import com.sun.enterprise.deployment.EnvironmentProperty; @@ -57,6 +65,7 @@ import com.sun.enterprise.deployment.node.AbstractBundleNode; import com.sun.enterprise.deployment.node.AdministeredObjectDefinitionNode; import com.sun.enterprise.deployment.node.ConnectionFactoryDefinitionNode; +import com.sun.enterprise.deployment.node.ContextServiceDefinitionNode; import com.sun.enterprise.deployment.node.DataSourceDefinitionNode; import com.sun.enterprise.deployment.node.EjbLocalReferenceNode; import com.sun.enterprise.deployment.node.EjbReferenceNode; @@ -68,6 +77,9 @@ import com.sun.enterprise.deployment.node.JndiEnvRefNode; import com.sun.enterprise.deployment.node.LifecycleCallbackNode; import com.sun.enterprise.deployment.node.MailSessionNode; +import com.sun.enterprise.deployment.node.ManagedExecutorDefinitionNode; +import com.sun.enterprise.deployment.node.ManagedScheduledExecutorDefinitionNode; +import com.sun.enterprise.deployment.node.ManagedThreadFactoryDefinitionNode; import com.sun.enterprise.deployment.node.MessageDestinationNode; import com.sun.enterprise.deployment.node.MessageDestinationRefNode; import com.sun.enterprise.deployment.node.ResourceEnvRefNode; @@ -84,67 +96,61 @@ /** * This node is responsible for handling the web-common xml tree * - * @author Shing Wai Chan + * @author Shing Wai Chan * @version */ public abstract class WebCommonNode extends AbstractBundleNode { - public final static String SPEC_VERSION = "5.0"; + public final static String SPEC_VERSION = "6.0"; protected T descriptor; private Map> servletMappings; /** Creates new WebBundleNode */ - protected WebCommonNode() { + protected WebCommonNode() { super(); registerElementHandler(new XMLElement(TagNames.ENVIRONMENT_PROPERTY), EnvEntryNode.class); registerElementHandler(new XMLElement(TagNames.EJB_REFERENCE), EjbReferenceNode.class); registerElementHandler(new XMLElement(TagNames.EJB_LOCAL_REFERENCE), EjbLocalReferenceNode.class); - JndiEnvRefNode serviceRefNode = habitat.getService(JndiEnvRefNode.class, WebServicesTagNames.SERVICE_REF); + JndiEnvRefNode serviceRefNode = serviceLocator.getService(JndiEnvRefNode.class, WebServicesTagNames.SERVICE_REF); if (serviceRefNode != null) { registerElementHandler(new XMLElement(WebServicesTagNames.SERVICE_REF), serviceRefNode.getClass(), - "addServiceReferenceDescriptor"); + "addServiceReferenceDescriptor"); } - registerElementHandler(new XMLElement(TagNames.RESOURCE_REFERENCE), ResourceRefNode.class, - "addResourceReferenceDescriptor"); + registerElementHandler(new XMLElement(TagNames.RESOURCE_REFERENCE), ResourceRefNode.class, "addResourceReferenceDescriptor"); registerElementHandler(new XMLElement(TagNames.RESOURCE_ENV_REFERENCE), ResourceEnvRefNode.class, - "addResourceEnvReferenceDescriptor"); + "addResourceEnvReferenceDescriptor"); registerElementHandler(new XMLElement(TagNames.MESSAGE_DESTINATION_REFERENCE), MessageDestinationRefNode.class, - "addMessageDestinationReferenceDescriptor"); + "addMessageDestinationReferenceDescriptor"); registerElementHandler(new XMLElement(TagNames.PERSISTENCE_CONTEXT_REF), EntityManagerReferenceNode.class, - "addEntityManagerReferenceDescriptor"); + "addEntityManagerReferenceDescriptor"); registerElementHandler(new XMLElement(TagNames.PERSISTENCE_UNIT_REF), EntityManagerFactoryReferenceNode.class, - "addEntityManagerFactoryReferenceDescriptor"); + "addEntityManagerFactoryReferenceDescriptor"); registerElementHandler(new XMLElement(TagNames.ROLE), SecurityRoleNode.class, "addRole"); registerElementHandler(new XMLElement(WebTagNames.SERVLET), ServletNode.class); registerElementHandler(new XMLElement(WebTagNames.SERVLET_MAPPING), ServletMappingNode.class); registerElementHandler(new XMLElement(WebTagNames.SESSION_CONFIG), SessionConfigNode.class); registerElementHandler(new XMLElement(WebTagNames.MIME_MAPPING), MimeMappingNode.class, "addMimeMapping"); registerElementHandler(new XMLElement(WebTagNames.CONTEXT_PARAM), InitParamNode.class, "addContextParameter"); - registerElementHandler(new XMLElement(WebTagNames.SECURITY_CONSTRAINT), SecurityConstraintNode.class, - "addSecurityConstraint"); + registerElementHandler(new XMLElement(WebTagNames.SECURITY_CONSTRAINT), SecurityConstraintNode.class, "addSecurityConstraint"); registerElementHandler(new XMLElement(WebTagNames.FILTER), FilterNode.class, "addServletFilter"); - registerElementHandler(new XMLElement(WebTagNames.FILTER_MAPPING), FilterMappingNode.class, - "addServletFilterMapping"); + registerElementHandler(new XMLElement(WebTagNames.FILTER_MAPPING), FilterMappingNode.class, "addServletFilterMapping"); registerElementHandler(new XMLElement(WebTagNames.LISTENER), ListenerNode.class, "addAppListenerDescriptor"); registerElementHandler(new XMLElement(WebTagNames.ERROR_PAGE), ErrorPageNode.class, "addErrorPageDescriptor"); registerElementHandler(new XMLElement(WebTagNames.LOGIN_CONFIG), LoginConfigNode.class); // for backward compatibility, from Servlet 2.4 the taglib element is in jsp-config - registerElementHandler(new XMLElement(WebTagNames.TAGLIB), TagLibNode.class); - registerElementHandler(new XMLElement(WebTagNames.JSPCONFIG), JspConfigNode.class); - registerElementHandler(new XMLElement(WebTagNames.LOCALE_ENCODING_MAPPING), LocaleEncodingMappingNode.class, - "addLocaleEncodingMappingDescriptor"); - registerElementHandler(new XMLElement(TagNames.MESSAGE_DESTINATION), MessageDestinationNode.class, - "addMessageDestination"); - registerElementHandler( - new XMLElement(TagNames.POST_CONSTRUCT), LifecycleCallbackNode.class, "addPostConstructDescriptor"); - registerElementHandler(new XMLElement(TagNames.PRE_DESTROY), LifecycleCallbackNode.class, "addPreDestroyDescriptor"); - registerElementHandler(new XMLElement(TagNames.DATA_SOURCE), DataSourceDefinitionNode.class, "addResourceDescriptor"); - registerElementHandler(new XMLElement(TagNames.CONNECTION_FACTORY), ConnectionFactoryDefinitionNode.class, "addResourceDescriptor"); - registerElementHandler(new XMLElement(TagNames.JMS_CONNECTION_FACTORY), JMSConnectionFactoryDefinitionNode.class, "addResourceDescriptor"); - registerElementHandler(new XMLElement(TagNames.JMS_DESTINATION), JMSDestinationDefinitionNode.class, "addResourceDescriptor"); - registerElementHandler(new XMLElement(TagNames.MAIL_SESSION), MailSessionNode.class, "addResourceDescriptor"); - registerElementHandler(new XMLElement(TagNames.ADMINISTERED_OBJECT), AdministeredObjectDefinitionNode.class, "addResourceDescriptor"); + registerElementHandler(new XMLElement(TAGLIB), TagLibNode.class); + registerElementHandler(new XMLElement(JSPCONFIG), JspConfigNode.class); + registerElementHandler(new XMLElement(LOCALE_ENCODING_MAPPING), LocaleEncodingMappingNode.class, "addLocaleEncodingMappingDescriptor"); + registerElementHandler(new XMLElement(MESSAGE_DESTINATION), MessageDestinationNode.class, "addMessageDestination"); + registerElementHandler(new XMLElement(POST_CONSTRUCT), LifecycleCallbackNode.class, "addPostConstructDescriptor"); + registerElementHandler(new XMLElement(PRE_DESTROY), LifecycleCallbackNode.class, "addPreDestroyDescriptor"); + registerElementHandler(new XMLElement(DATA_SOURCE), DataSourceDefinitionNode.class, "addResourceDescriptor"); + registerElementHandler(new XMLElement(CONNECTION_FACTORY), ConnectionFactoryDefinitionNode.class, "addResourceDescriptor"); + registerElementHandler(new XMLElement(JMS_CONNECTION_FACTORY), JMSConnectionFactoryDefinitionNode.class, "addResourceDescriptor"); + registerElementHandler(new XMLElement(JMS_DESTINATION), JMSDestinationDefinitionNode.class, "addResourceDescriptor"); + registerElementHandler(new XMLElement(MAIL_SESSION), MailSessionNode.class, "addResourceDescriptor"); + registerElementHandler(new XMLElement(ADMINISTERED_OBJECT), AdministeredObjectDefinitionNode.class, "addResourceDescriptor"); registerElementHandler(new XMLElement(MANAGED_EXECUTOR), ManagedExecutorDefinitionNode.class, "addResourceDescriptor"); registerElementHandler(new XMLElement(MANAGED_THREAD_FACTORY), ManagedThreadFactoryDefinitionNode.class, "addResourceDescriptor"); @@ -153,17 +159,16 @@ protected WebCommonNode() { } /** - * Adds a new DOL descriptor instance to the descriptor instance associated with - * this XMLNode + * Adds a new DOL descriptor instance to the descriptor instance associated with this XMLNode * * @param newDescriptor the new descriptor */ @Override - public void addDescriptor(Object newDescriptor) { + public void addDescriptor(Object newDescriptor) { Logger logger = DOLUtils.getDefaultLogger(); if (newDescriptor instanceof EjbReference) { descriptor.addEjbReferenceDescriptor((EjbReference) newDescriptor); - } else if (newDescriptor instanceof EnvironmentProperty) { + } else if (newDescriptor instanceof EnvironmentProperty) { if (logger.isLoggable(Level.FINE)) { logger.fine("Adding env entry" + newDescriptor); } @@ -179,7 +184,7 @@ public void addDescriptor(Object newDescriptor) { if (logger.isLoggable(Level.FINE)) { logger.fine("Adding taglib component " + newDescriptor); } - if (descriptor.getJspConfigDescriptor()==null) { + if (descriptor.getJspConfigDescriptor() == null) { descriptor.setJspConfigDescriptor(new JspConfigDescriptorImpl()); } descriptor.getJspConfigDescriptor().addTagLib((TagLibConfigurationDescriptor) newDescriptor); @@ -187,11 +192,10 @@ public void addDescriptor(Object newDescriptor) { if (logger.isLoggable(Level.FINE)) { logger.fine("Adding JSP Config Descriptor" + newDescriptor); } - if (descriptor.getJspConfigDescriptor()!=null) { + if (descriptor.getJspConfigDescriptor() != null) { throw new RuntimeException("Has more than one jsp-config element!"); } - descriptor.setJspConfigDescriptor( - (JspConfigDescriptorImpl)newDescriptor); + descriptor.setJspConfigDescriptor((JspConfigDescriptorImpl) newDescriptor); } else if (newDescriptor instanceof LoginConfiguration) { if (logger.isLoggable(Level.FINE)) { logger.fine("Adding Login Config Descriptor" + newDescriptor); @@ -210,7 +214,6 @@ public void addDescriptor(Object newDescriptor) { } } - /** * receives notiification of the value for a particular tag * @@ -233,7 +236,7 @@ public void setElementValue(XMLElement element, String value) { * @param urlPattern the url pattern mapping */ void addServletMapping(String servletName, String urlPattern) { - if (servletMappings==null) { + if (servletMappings == null) { servletMappings = new HashMap>(); } if (servletMappings.containsKey(servletName)) { @@ -258,13 +261,13 @@ public boolean endElement(XMLElement element) { return false; } else { boolean allDone = super.endElement(element); - if (allDone && servletMappings!=null) { + if (allDone && servletMappings != null) { for (Iterator keys = servletMappings.keySet().iterator(); keys.hasNext();) { String servletName = keys.next(); Vector mappings = servletMappings.get(servletName); - WebComponentDescriptor servlet= descriptor.getWebComponentByCanonicalName(servletName); - if (servlet!=null) { - for (Iterator mapping = mappings.iterator();mapping.hasNext();) { + WebComponentDescriptor servlet = descriptor.getWebComponentByCanonicalName(servletName); + if (servlet != null) { + for (Iterator mapping = mappings.iterator(); mapping.hasNext();) { servlet.addUrlPattern(mapping.next()); } } else { @@ -284,8 +287,7 @@ public boolean endElement(XMLElement element) { * @return the DOM tree top node */ @Override - public Node writeDescriptor(Node parent, - T webBundleDesc) { + public Node writeDescriptor(Node parent, T webBundleDesc) { Node jarNode = super.writeDescriptor(parent, webBundleDesc); if (webBundleDesc.isDistributable()) { appendChild(jarNode, WebTagNames.DISTRIBUTABLE); @@ -296,26 +298,22 @@ public Node writeDescriptor(Node parent, // filter* FilterNode filterNode = new FilterNode(); - for (Enumeration filters = webBundleDesc.getServletFilters().elements();filters.hasMoreElements();) { - filterNode.writeDescriptor(jarNode, WebTagNames.FILTER, - (ServletFilterDescriptor) filters.nextElement()); + for (Enumeration filters = webBundleDesc.getServletFilters().elements(); filters.hasMoreElements();) { + filterNode.writeDescriptor(jarNode, WebTagNames.FILTER, (ServletFilterDescriptor) filters.nextElement()); } // filter-mapping* FilterMappingNode filterMappingNode = new FilterMappingNode(); - for (Enumeration mappings = webBundleDesc.getServletFilterMappings().elements(); - mappings.hasMoreElements();) { - filterMappingNode.writeDescriptor(jarNode, WebTagNames.FILTER_MAPPING, - (ServletFilterMappingDescriptor) mappings.nextElement()); + for (Enumeration mappings = webBundleDesc.getServletFilterMappings().elements(); mappings.hasMoreElements();) { + filterMappingNode.writeDescriptor(jarNode, WebTagNames.FILTER_MAPPING, (ServletFilterMappingDescriptor) mappings.nextElement()); } // listener* Vector appListeners = webBundleDesc.getAppListenerDescriptors(); if (!appListeners.isEmpty()) { ListenerNode listenerNode = new ListenerNode(); - for (Enumeration e = appListeners.elements();e.hasMoreElements();) { - listenerNode.writeDescriptor(jarNode, WebTagNames.LISTENER, - (AppListenerDescriptorImpl) e.nextElement()); + for (Enumeration e = appListeners.elements(); e.hasMoreElements();) { + listenerNode.writeDescriptor(jarNode, WebTagNames.LISTENER, (AppListenerDescriptorImpl) e.nextElement()); } } @@ -323,7 +321,7 @@ public Node writeDescriptor(Node parent, if (!servlets.isEmpty()) { // servlet* ServletNode servletNode = new ServletNode(); - for (Iterator e= servlets.iterator();e.hasNext();) { + for (Iterator e = servlets.iterator(); e.hasNext();) { WebComponentDescriptor aServlet = (WebComponentDescriptor) e.next(); servletNode.writeDescriptor(jarNode, aServlet); } @@ -331,16 +329,15 @@ public Node writeDescriptor(Node parent, // servlet-mapping* for (Iterator servletsIterator = servlets.iterator(); servletsIterator.hasNext();) { WebComponentDescriptor aServlet = (WebComponentDescriptor) servletsIterator.next(); - for (Iterator patterns = aServlet.getUrlPatternsSet().iterator();patterns.hasNext();) { + for (Iterator patterns = aServlet.getUrlPatternsSet().iterator(); patterns.hasNext();) { String pattern = (String) patterns.next(); - Node mappingNode= appendChild(jarNode, WebTagNames.SERVLET_MAPPING); + Node mappingNode = appendChild(jarNode, WebTagNames.SERVLET_MAPPING); appendTextChild(mappingNode, WebTagNames.SERVLET_NAME, aServlet.getCanonicalName()); // If URL Pattern does not start with "/" then // prepend it (for 1.2 Web apps) if (webBundleDesc.getSpecVersion().equals("2.2")) { - if (!pattern.startsWith("/") - && !pattern.startsWith("*.")) { + if (!pattern.startsWith("/") && !pattern.startsWith("*.")) { pattern = "/" + pattern; } } @@ -351,7 +348,7 @@ public Node writeDescriptor(Node parent, // mime-mapping* MimeMappingNode mimeNode = new MimeMappingNode(); - for (Enumeration e = webBundleDesc.getMimeMappings();e.hasMoreElements();) { + for (Enumeration e = webBundleDesc.getMimeMappings(); e.hasMoreElements();) { MimeMappingDescriptor mimeMapping = (MimeMappingDescriptor) e.nextElement(); mimeNode.writeDescriptor(jarNode, WebTagNames.MIME_MAPPING, mimeMapping); } @@ -361,8 +358,7 @@ public Node writeDescriptor(Node parent, if (welcomeFiles.hasMoreElements()) { Node welcomeList = appendChild(jarNode, WebTagNames.WELCOME_FILE_LIST); while (welcomeFiles.hasMoreElements()) { - appendTextChild(welcomeList, WebTagNames.WELCOME_FILE, - (String) welcomeFiles.nextElement()); + appendTextChild(welcomeList, WebTagNames.WELCOME_FILE, (String) welcomeFiles.nextElement()); } } @@ -371,16 +367,15 @@ public Node writeDescriptor(Node parent, if (errorPages.hasMoreElements()) { ErrorPageNode errorPageNode = new ErrorPageNode(); while (errorPages.hasMoreElements()) { - errorPageNode.writeDescriptor(jarNode, WebTagNames.ERROR_PAGE, - (ErrorPageDescriptor) errorPages.nextElement()); + errorPageNode.writeDescriptor(jarNode, WebTagNames.ERROR_PAGE, (ErrorPageDescriptor) errorPages.nextElement()); } } // jsp-config * JspConfigDescriptorImpl jspConf = webBundleDesc.getJspConfigDescriptor(); - if(jspConf != null) { + if (jspConf != null) { JspConfigNode ln = new JspConfigNode(); - ln.writeDescriptor(jarNode, WebTagNames.JSPCONFIG, jspConf); + ln.writeDescriptor(jarNode, JSPCONFIG, jspConf); } // security-constraint* @@ -395,7 +390,7 @@ public Node writeDescriptor(Node parent, // login-config ? LoginConfigurationImpl lci = (LoginConfigurationImpl) webBundleDesc.getLoginConfiguration(); - if (lci!=null) { + if (lci != null) { LoginConfigNode lcn = new LoginConfigNode(); lcn.writeDescriptor(jarNode, WebTagNames.LOGIN_CONFIG, lci); } @@ -435,17 +430,16 @@ public Node writeDescriptor(Node parent, writeEntityManagerFactoryReferenceDescriptors(jarNode, webBundleDesc.getEntityManagerFactoryReferenceDescriptors().iterator()); // post-construct - writeLifeCycleCallbackDescriptors(jarNode, TagNames.POST_CONSTRUCT, webBundleDesc.getPostConstructDescriptors()); + writeLifeCycleCallbackDescriptors(jarNode, POST_CONSTRUCT, webBundleDesc.getPostConstructDescriptors()); // pre-destroy - writeLifeCycleCallbackDescriptors(jarNode, TagNames.PRE_DESTROY, webBundleDesc.getPreDestroyDescriptors()); + writeLifeCycleCallbackDescriptors(jarNode, PRE_DESTROY, webBundleDesc.getPreDestroyDescriptors()); // all descriptors (includes DSD, MSD, JMSCFD, JMSDD,AOD, CFD)* writeResourceDescriptors(jarNode, webBundleDesc.getAllResourcesDescriptors().iterator()); // message-destination* - writeMessageDestinations - (jarNode, webBundleDesc.getMessageDestinations().iterator()); + writeMessageDestinations(jarNode, webBundleDesc.getMessageDestinations().iterator()); // locale-encoding-mapping-list LocaleEncodingMappingListDescriptor lemListDesc = webBundleDesc.getLocaleEncodingMappingListDescriptor(); @@ -453,14 +447,13 @@ public Node writeDescriptor(Node parent, Node lemList = appendChild(jarNode, WebTagNames.LOCALE_ENCODING_MAPPING_LIST); LocaleEncodingMappingNode lemNode = new LocaleEncodingMappingNode(); for (LocaleEncodingMappingDescriptor lemDesc : lemListDesc.getLocaleEncodingMappingSet()) { - lemNode.writeDescriptor(lemList, WebTagNames.LOCALE_ENCODING_MAPPING, lemDesc); + lemNode.writeDescriptor(lemList, LOCALE_ENCODING_MAPPING, lemDesc); } } if (webBundleDesc.getSessionConfig() != null) { SessionConfigNode scNode = new SessionConfigNode(); - scNode.writeDescriptor(jarNode, WebTagNames.SESSION_CONFIG, - (SessionConfigDescriptor)webBundleDesc.getSessionConfig()); + scNode.writeDescriptor(jarNode, WebTagNames.SESSION_CONFIG, (SessionConfigDescriptor) webBundleDesc.getSessionConfig()); } return jarNode; @@ -469,7 +462,7 @@ public Node writeDescriptor(Node parent, static void addInitParam(Node parentNode, String nodeName, Set initParams) { if (!initParams.isEmpty()) { InitParamNode initParamNode = new InitParamNode(); - for (Iterator e=initParams.iterator();e.hasNext();) { + for (Iterator e = initParams.iterator(); e.hasNext();) { EnvironmentProperty ep = (EnvironmentProperty) e.next(); initParamNode.writeDescriptor(parentNode, nodeName, ep); } diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/WebBundleRuntimeNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/WebBundleRuntimeNode.java index 12494811554..41cb3c6a331 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/WebBundleRuntimeNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/WebBundleRuntimeNode.java @@ -78,7 +78,7 @@ public class WebBundleRuntimeNode extends RuntimeBundleNode Date: Sun, 19 Jun 2022 00:18:10 +0200 Subject: [PATCH 3/8] Remove snapshot version Signed-off-by: Arjan Tijms --- appserver/extras/embedded/all/pom.xml | 1 - .../embedded/shell/glassfish-embedded-static-shell/pom.xml | 1 - 2 files changed, 2 deletions(-) diff --git a/appserver/extras/embedded/all/pom.xml b/appserver/extras/embedded/all/pom.xml index b5deb317e3b..442dce63468 100644 --- a/appserver/extras/embedded/all/pom.xml +++ b/appserver/extras/embedded/all/pom.xml @@ -338,7 +338,6 @@ org.omnifaces concurrent-extras - 0.1-SNAPSHOT true diff --git a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml index 04637b89387..79bfb5711ef 100755 --- a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml +++ b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml @@ -214,7 +214,6 @@ org.omnifaces concurrent-extras - 0.1-SNAPSHOT true From 70d9da9b4408c09568e2e3cb2676226c12d21639 Mon Sep 17 00:00:00 2001 From: Arjan Tijms Date: Sun, 19 Jun 2022 14:19:38 +0200 Subject: [PATCH 4/8] Moved concurrency libs to web profile feature set Signed-off-by: Arjan Tijms --- appserver/featuresets/glassfish/pom.xml | 55 +---------------- appserver/featuresets/web/pom.xml | 59 ++++++++++++++++++- .../ut/ArchiveTest.java | 2 +- .../ut/TestUtil.java | 2 +- .../ut/ArchiveTest.java | 2 +- .../ut/TestUtil.java | 2 +- .../ut/TestUtil.java | 2 +- 7 files changed, 63 insertions(+), 61 deletions(-) diff --git a/appserver/featuresets/glassfish/pom.xml b/appserver/featuresets/glassfish/pom.xml index 1a43ea2cfbd..a39d06b5492 100644 --- a/appserver/featuresets/glassfish/pom.xml +++ b/appserver/featuresets/glassfish/pom.xml @@ -33,66 +33,13 @@ This pom defines the set of packages for the full GlassFish distribution - + org.glassfish.main.featuresets web ${project.version} pom - - - - - jakarta.enterprise.concurrent - jakarta.enterprise.concurrent-api - - - * - * - - - - - org.glassfish - jakarta.enterprise.concurrent - - - * - * - - - - - org.omnifaces - concurrent-connector - - - * - * - - - - - org.omnifaces - concurrent-impl - - - * - * - - - - - org.omnifaces - concurrent-extras - - - * - * - - - diff --git a/appserver/featuresets/web/pom.xml b/appserver/featuresets/web/pom.xml index 04c769b5636..99c1f31cc4b 100644 --- a/appserver/featuresets/web/pom.xml +++ b/appserver/featuresets/web/pom.xml @@ -31,7 +31,7 @@ pom Glassfish Web Featureset - This pom defines the set of packages for GlassFish Web distribution + This pom defines the set of packages for the Web Profile @@ -661,7 +661,7 @@ - + jakarta.authentication jakarta.authentication-api @@ -672,6 +672,8 @@ + + jakarta.authorization jakarta.authorization-api @@ -692,6 +694,59 @@ + + + + jakarta.enterprise.concurrent + jakarta.enterprise.concurrent-api + + + * + * + + + + + org.glassfish + jakarta.enterprise.concurrent + + + * + * + + + + + org.omnifaces + concurrent-connector + + + * + * + + + + + org.omnifaces + concurrent-impl + + + * + * + + + + + org.omnifaces + concurrent-extras + + + * + * + + + + org.glassfish.main.transaction diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ut/ArchiveTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ut/ArchiveTest.java index a2138a8a7b2..ddea53f388b 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ut/ArchiveTest.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ut/ArchiveTest.java @@ -19,7 +19,7 @@ import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; import com.sun.enterprise.deployment.AdministeredObjectDefinitionDescriptor; import com.sun.enterprise.deployment.Application; -import com.sun.enterprise.deployment.ResourceDescriptor; +import com.sun.enterprise.deployment.core.ResourceDescriptor; import com.sun.enterprise.deployment.WebBundleDescriptor; import com.sun.enterprise.deployment.archivist.ApplicationArchivist; import com.sun.enterprise.loader.ASURLClassLoader; diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ut/TestUtil.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ut/TestUtil.java index 1f5ace4bb6f..feda355d3c3 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ut/TestUtil.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ut/TestUtil.java @@ -17,7 +17,7 @@ package com.sun.s1asdev.aod; import com.sun.enterprise.deployment.AdministeredObjectDefinitionDescriptor; -import com.sun.enterprise.deployment.ResourceDescriptor; +import com.sun.enterprise.deployment.core.ResourceDescriptor; import org.glassfish.internal.api.Globals; import java.util.Map; diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ut/ArchiveTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ut/ArchiveTest.java index 55171d11b2f..a4a626536aa 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ut/ArchiveTest.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ut/ArchiveTest.java @@ -19,7 +19,7 @@ import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; import com.sun.enterprise.deployment.Application; import com.sun.enterprise.deployment.ConnectionFactoryDefinitionDescriptor; -import com.sun.enterprise.deployment.ResourceDescriptor; +import com.sun.enterprise.deployment.core.ResourceDescriptor; import com.sun.enterprise.deployment.WebBundleDescriptor; import com.sun.enterprise.deployment.archivist.ApplicationArchivist; import com.sun.enterprise.loader.ASURLClassLoader; diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ut/TestUtil.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ut/TestUtil.java index 7dadd7f30f5..1c2da59c82b 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ut/TestUtil.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ut/TestUtil.java @@ -17,7 +17,7 @@ package com.sun.s1asdev.cfd; import com.sun.enterprise.deployment.ConnectionFactoryDefinitionDescriptor; -import com.sun.enterprise.deployment.ResourceDescriptor; +import com.sun.enterprise.deployment.core.ResourceDescriptor; import org.glassfish.deployment.common.Descriptor; import org.glassfish.internal.api.Globals; diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ut/TestUtil.java b/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ut/TestUtil.java index e9ed5282f6e..3eba8ad59f6 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ut/TestUtil.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ut/TestUtil.java @@ -17,7 +17,7 @@ package com.sun.s1asdev.jmsdd; import com.sun.enterprise.deployment.JMSDestinationDefinitionDescriptor; -import com.sun.enterprise.deployment.ResourceDescriptor; +import com.sun.enterprise.deployment.core.ResourceDescriptor; import org.glassfish.internal.api.Globals; import java.util.Map; From bb9bdf53380235484be83f32a0694d79d3ed011b Mon Sep 17 00:00:00 2001 From: Arjan Tijms Date: Sun, 19 Jun 2022 16:40:24 +0200 Subject: [PATCH 5/8] Correcting imports in some tests Signed-off-by: Arjan Tijms --- .../connector/v3/administered-object-definition/ut/DDTest.java | 1 + .../connector/v3/connection-factory-definition/ut/DDTest.java | 1 + .../connector/v3/jms-destination-definition/ut/ArchiveTest.java | 1 + .../connector/v3/jms-destination-definition/ut/DDTest.java | 1 + 4 files changed, 4 insertions(+) diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ut/DDTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ut/DDTest.java index 8290391d44b..187dcbf7f00 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ut/DDTest.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ut/DDTest.java @@ -18,6 +18,7 @@ import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.io.ApplicationDeploymentDescriptorFile; import junit.framework.Assert; import junit.framework.TestCase; diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ut/DDTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ut/DDTest.java index 690aee48953..6662c162b8b 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ut/DDTest.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ut/DDTest.java @@ -18,6 +18,7 @@ import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.io.ApplicationDeploymentDescriptorFile; import junit.framework.Assert; import junit.framework.TestCase; diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ut/ArchiveTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ut/ArchiveTest.java index a34da4f5521..16bc8f41c77 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ut/ArchiveTest.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ut/ArchiveTest.java @@ -18,6 +18,7 @@ import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.archivist.AppClientArchivist; import com.sun.enterprise.deployment.archivist.ApplicationArchivist; import com.sun.enterprise.loader.ASURLClassLoader; diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ut/DDTest.java b/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ut/DDTest.java index 7d66304a60a..01ed2e93ea5 100644 --- a/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ut/DDTest.java +++ b/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ut/DDTest.java @@ -18,6 +18,7 @@ import com.sun.ejte.ccl.reporter.SimpleReporterAdapter; import com.sun.enterprise.deployment.*; +import com.sun.enterprise.deployment.core.*; import com.sun.enterprise.deployment.io.AppClientDeploymentDescriptorFile; import com.sun.enterprise.deployment.io.ApplicationDeploymentDescriptorFile; import junit.framework.Assert; From 5f028212eaba845cea2e2ae88d8da96dc84e65ce Mon Sep 17 00:00:00 2001 From: Arjan Tijms Date: Sun, 19 Jun 2022 20:07:52 +0200 Subject: [PATCH 6/8] Update Tyrus to 2.1.0-M3 and Jersey to 3.1.0-M7 Signed-off-by: Arjan Tijms --- appserver/pom.xml | 2 +- nucleus/parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/appserver/pom.xml b/appserver/pom.xml index 03016b6f5db..360be921b07 100644 --- a/appserver/pom.xml +++ b/appserver/pom.xml @@ -86,7 +86,7 @@ 2.1.0 - 2.1.0-M3 + 2.1.0-M4 3.0.0 diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml index 59c1229b42c..bb9ad14366b 100644 --- a/nucleus/parent/pom.xml +++ b/nucleus/parent/pom.xml @@ -105,7 +105,7 @@ 3.1.0 - 3.1.0-M5 + 3.1.0-M7 2.1.0 From 85749d2f9fe044f3ce723994a7414950317347c6 Mon Sep 17 00:00:00 2001 From: Arjan Tijms Date: Sun, 19 Jun 2022 21:29:40 +0200 Subject: [PATCH 7/8] Update MVC/Krazo, Jbatch and Yasson Signed-off-by: Arjan Tijms --- appserver/pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/appserver/pom.xml b/appserver/pom.xml index 360be921b07..403737695dd 100644 --- a/appserver/pom.xml +++ b/appserver/pom.xml @@ -81,7 +81,7 @@ - 4.0.0 + 4.0.1 4.0.0 @@ -121,7 +121,7 @@ 2.1.0 - 2.1.0 + 2.1.1 2.1.1 @@ -132,7 +132,7 @@ 1.1.0 1.1.0 3.0.0 - 3.0.0-RC2 + 3.0.0 3.1.0 @@ -153,8 +153,8 @@ 1.2.5.Final - 2.0.0 - 2.0.1 + 2.1.0.M1 + 2.0.2 3.0.1 From 484345d5b3e6945c756244f7efadb7c193f04715 Mon Sep 17 00:00:00 2001 From: Arjan Tijms Date: Mon, 20 Jun 2022 00:43:34 +0200 Subject: [PATCH 8/8] Add JDK17 profile for MP modules Signed-off-by: Arjan Tijms --- appserver/featuresets/glassfish/pom.xml | 84 ++++++++++++++----------- appserver/pom.xml | 13 +++- 2 files changed, 59 insertions(+), 38 deletions(-) diff --git a/appserver/featuresets/glassfish/pom.xml b/appserver/featuresets/glassfish/pom.xml index a39d06b5492..0acbb5e4e8e 100644 --- a/appserver/featuresets/glassfish/pom.xml +++ b/appserver/featuresets/glassfish/pom.xml @@ -799,42 +799,52 @@ - - - - org.glassfish.main.microprofile - microprofile-connectors - ${project.version} - - - * - * - - - - - - - org.eclipse.microprofile.config - microprofile-config-api - ${microprofile.config-api.version} - - - * - * - - - - - org.glassfish.main.microprofile - microprofile-config - ${project.version} - - - * - * - - - + + + + jdk17 + + [17,) + + + + + org.glassfish.main.microprofile + microprofile-connectors + ${project.version} + + + * + * + + + + + + + org.eclipse.microprofile.config + microprofile-config-api + ${microprofile.config-api.version} + + + * + * + + + + + org.glassfish.main.microprofile + microprofile-config + ${project.version} + + + * + * + + + + + + diff --git a/appserver/pom.xml b/appserver/pom.xml index 403737695dd..b75c746c385 100644 --- a/appserver/pom.xml +++ b/appserver/pom.xml @@ -68,7 +68,6 @@ orb appclient ant-tasks - microprofile @@ -1002,4 +1001,16 @@ + + + + jdk17 + + [17,) + + + microprofile + + +