From 7058a379e7aff82632cd2e67a15a3c2e069cabb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sat, 10 Aug 2024 19:28:33 +0200 Subject: [PATCH 01/40] Added rules for organizing imports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../glassfish/qa/config/checkstyle/checkstyle.xml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/qa/src/main/resources/org/glassfish/qa/config/checkstyle/checkstyle.xml b/qa/src/main/resources/org/glassfish/qa/config/checkstyle/checkstyle.xml index 66e742850d0..2634d8d0214 100644 --- a/qa/src/main/resources/org/glassfish/qa/config/checkstyle/checkstyle.xml +++ b/qa/src/main/resources/org/glassfish/qa/config/checkstyle/checkstyle.xml @@ -80,8 +80,18 @@ - - + + + + + + + + + + + + From 0352efb3e956b7df44cd5552f3be2848684fcd3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sat, 10 Aug 2024 19:29:25 +0200 Subject: [PATCH 02/40] Imports: hk2 modules cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../java/org/jvnet/hk2/config/Attribute.java | 5 +++-- .../java/org/jvnet/hk2/config/ConfigBean.java | 19 +++++++++++++------ .../hk2/config/ConfigBeanInterceptor.java | 2 +- .../org/jvnet/hk2/config/ConfigInjector.java | 4 ++-- .../java/org/jvnet/hk2/config/Configured.java | 8 ++++---- .../org/jvnet/hk2/config/ConfiguredBy.java | 5 +++-- .../hk2/config/DelegatingXMLStreamWriter.java | 4 ++-- .../java/org/jvnet/hk2/config/Element.java | 1 + .../hk2/config/IndentingXMLStreamWriter.java | 5 +++-- .../jvnet/hk2/config/InjectionManager.java | 6 +++++- .../org/jvnet/hk2/config/InjectionTarget.java | 10 +++++----- .../jvnet/hk2/config/TransactionListener.java | 4 ++-- .../main/java/org/jvnet/hk2/config/Units.java | 5 +++-- .../hk2/config/UnprocessedChangeEvents.java | 2 +- .../jvnet/hk2/config/XMLStreamException2.java | 2 +- .../config/generator/apt/ContractFinder.java | 14 +++++++------- .../config/tiger/ParameterizedTypeImpl.java | 2 +- .../jvnet/hk2/config/tiger/TypeVisitor.java | 6 +++--- .../hk2/config/tiger/WildcardTypeImpl.java | 2 +- .../test/example/ConfigErrorService.java | 4 ++-- .../hk2/config/test/example/ConfigModule.java | 4 ++-- .../config/test/example/GenericContainer.java | 4 ++-- .../types/HK2DomConfigTypesUtilities.java | 4 ++-- .../org/jvnet/hk2/config/types/Property.java | 2 +- 24 files changed, 70 insertions(+), 54 deletions(-) diff --git a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/Attribute.java b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/Attribute.java index daa96c6af7d..3cdd81f8df1 100644 --- a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/Attribute.java +++ b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/Attribute.java @@ -17,11 +17,12 @@ package org.jvnet.hk2.config; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import java.lang.annotation.Target; /** * Indicates that this property or the field value must be injected from diff --git a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/ConfigBean.java b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/ConfigBean.java index 190dca8beaf..2c3be242f56 100644 --- a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/ConfigBean.java +++ b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/ConfigBean.java @@ -17,19 +17,26 @@ package org.jvnet.hk2.config; -import javax.xml.stream.XMLStreamReader; -import java.beans.*; -import java.lang.reflect.Type; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyVetoException; +import java.beans.VetoableChangeListener; import java.lang.reflect.Proxy; +import java.lang.reflect.Type; import java.security.AccessController; import java.security.PrivilegedAction; -import java.util.*; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.Condition; +import java.util.AbstractList; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.Condition; +import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.LockSupport; import javax.management.ObjectName; +import javax.xml.stream.XMLStreamReader; import org.glassfish.hk2.api.ServiceLocator; diff --git a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/ConfigBeanInterceptor.java b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/ConfigBeanInterceptor.java index a7a21c83f05..98fbca1ecdd 100644 --- a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/ConfigBeanInterceptor.java +++ b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/ConfigBeanInterceptor.java @@ -17,8 +17,8 @@ package org.jvnet.hk2.config; -import java.beans.PropertyVetoException; import java.beans.PropertyChangeEvent; +import java.beans.PropertyVetoException; /** * Interceptor interface to be notified of read/write operations on a ConfigBean. diff --git a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/ConfigInjector.java b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/ConfigInjector.java index 915e7aecdc1..c696a71efba 100644 --- a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/ConfigInjector.java +++ b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/ConfigInjector.java @@ -17,11 +17,11 @@ package org.jvnet.hk2.config; -import org.jvnet.hk2.annotations.Contract; - import java.util.HashMap; import java.util.Map; +import org.jvnet.hk2.annotations.Contract; + /** * Inject configuration values to the object. * diff --git a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/Configured.java b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/Configured.java index 54475f45e95..5e4f31fd537 100644 --- a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/Configured.java +++ b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/Configured.java @@ -17,14 +17,14 @@ package org.jvnet.hk2.config; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + import org.jvnet.hk2.annotations.Contract; import static java.lang.annotation.ElementType.TYPE; - -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import java.lang.annotation.Target; /** * Marks inhabitants that require configuration for instantiation. diff --git a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/ConfiguredBy.java b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/ConfiguredBy.java index a0f3378f8f4..e33d23e1bb7 100644 --- a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/ConfiguredBy.java +++ b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/ConfiguredBy.java @@ -17,10 +17,11 @@ package org.jvnet.hk2.config; -import org.jvnet.hk2.annotations.Contract; - import java.lang.annotation.Retention; import java.lang.annotation.Target; + +import org.jvnet.hk2.annotations.Contract; + import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/DelegatingXMLStreamWriter.java b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/DelegatingXMLStreamWriter.java index fe3004b2604..e7417364a2d 100644 --- a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/DelegatingXMLStreamWriter.java +++ b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/DelegatingXMLStreamWriter.java @@ -17,9 +17,9 @@ package org.jvnet.hk2.config; -import javax.xml.stream.XMLStreamWriter; -import javax.xml.stream.XMLStreamException; import javax.xml.namespace.NamespaceContext; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; /** * Delegating {@link XMLStreamWriter}. diff --git a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/Element.java b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/Element.java index 540a41cbe02..f1c1282d76d 100644 --- a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/Element.java +++ b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/Element.java @@ -19,6 +19,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; + import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/IndentingXMLStreamWriter.java b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/IndentingXMLStreamWriter.java index 2dd96efddb0..dc2d8abf2e4 100644 --- a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/IndentingXMLStreamWriter.java +++ b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/IndentingXMLStreamWriter.java @@ -17,10 +17,11 @@ package org.jvnet.hk2.config; -import javax.xml.stream.XMLStreamWriter; -import javax.xml.stream.XMLStreamException; import java.util.Stack; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; + /** * @author Kohsuke Kawaguchi */ diff --git a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/InjectionManager.java b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/InjectionManager.java index 5d7ad3102f1..5922b3f5428 100644 --- a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/InjectionManager.java +++ b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/InjectionManager.java @@ -17,8 +17,12 @@ package org.jvnet.hk2.config; -import java.lang.reflect.*; import java.lang.annotation.Annotation; +import java.lang.reflect.AnnotatedElement; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Type; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.ArrayList; diff --git a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/InjectionTarget.java b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/InjectionTarget.java index c131dc7751f..d1984104426 100644 --- a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/InjectionTarget.java +++ b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/InjectionTarget.java @@ -17,16 +17,16 @@ package org.jvnet.hk2.config; -import org.jvnet.hk2.annotations.Contract; - import jakarta.inject.Qualifier; -import static java.lang.annotation.ElementType.TYPE; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - import java.lang.annotation.Target; +import org.jvnet.hk2.annotations.Contract; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + /** * Used on {@link ConfigInjector} to indicate * the target class of the injection. diff --git a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/TransactionListener.java b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/TransactionListener.java index f0be78e7ea0..a94007f8a08 100644 --- a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/TransactionListener.java +++ b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/TransactionListener.java @@ -17,11 +17,11 @@ package org.jvnet.hk2.config; -import org.jvnet.hk2.annotations.Contract; - import java.beans.PropertyChangeEvent; import java.util.List; +import org.jvnet.hk2.annotations.Contract; + /** * Listener interface for objects interested in transaction events on the config beans. * diff --git a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/Units.java b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/Units.java index cc4a3ac1571..afcb03afb30 100644 --- a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/Units.java +++ b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/Units.java @@ -17,13 +17,14 @@ package org.jvnet.hk2.config; -import static java.lang.annotation.ElementType.METHOD; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.management.DescriptorKey; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + /** Units annotation to be used on @Configured interfaces. Units are strings because they are an unbounded set, but do try to use the provided values for consistency. diff --git a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/UnprocessedChangeEvents.java b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/UnprocessedChangeEvents.java index 98e65334d79..5fed277cf9f 100644 --- a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/UnprocessedChangeEvents.java +++ b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/UnprocessedChangeEvents.java @@ -17,9 +17,9 @@ package org.jvnet.hk2.config; -import java.util.List; import java.util.ArrayList; import java.util.Collection; +import java.util.List; /** * Collects change events that could not be processed. diff --git a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/XMLStreamException2.java b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/XMLStreamException2.java index 887b08d9b49..5c43338c57e 100644 --- a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/XMLStreamException2.java +++ b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/XMLStreamException2.java @@ -17,8 +17,8 @@ package org.jvnet.hk2.config; -import javax.xml.stream.XMLStreamException; import javax.xml.stream.Location; +import javax.xml.stream.XMLStreamException; /** * To fix the problem in StAX API where exceptions are not properly chained. diff --git a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/generator/apt/ContractFinder.java b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/generator/apt/ContractFinder.java index f616608cf85..bcb94b8636c 100644 --- a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/generator/apt/ContractFinder.java +++ b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/generator/apt/ContractFinder.java @@ -17,8 +17,11 @@ package org.jvnet.hk2.config.generator.apt; -import org.jvnet.hk2.annotations.Contract; -import org.jvnet.hk2.annotations.ContractsProvided; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; import javax.lang.model.element.ElementKind; import javax.lang.model.element.Name; @@ -27,11 +30,8 @@ import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; +import org.jvnet.hk2.annotations.Contract; +import org.jvnet.hk2.annotations.ContractsProvided; /** * Given a {@link TypeElement}, diff --git a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/tiger/ParameterizedTypeImpl.java b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/tiger/ParameterizedTypeImpl.java index 1b3d56d7e88..e84c3425b54 100644 --- a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/tiger/ParameterizedTypeImpl.java +++ b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/tiger/ParameterizedTypeImpl.java @@ -17,10 +17,10 @@ package org.jvnet.hk2.config.tiger; +import java.lang.reflect.MalformedParameterizedTypeException; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; -import java.lang.reflect.MalformedParameterizedTypeException; import java.util.Arrays; /** diff --git a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/tiger/TypeVisitor.java b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/tiger/TypeVisitor.java index 635e9a1c8e1..98759db1fd6 100644 --- a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/tiger/TypeVisitor.java +++ b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/tiger/TypeVisitor.java @@ -17,11 +17,11 @@ package org.jvnet.hk2.config.tiger; -import java.lang.reflect.Type; -import java.lang.reflect.ParameterizedType; import java.lang.reflect.GenericArrayType; -import java.lang.reflect.WildcardType; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; +import java.lang.reflect.WildcardType; /** * @author Kohsuke Kawaguchi diff --git a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/tiger/WildcardTypeImpl.java b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/tiger/WildcardTypeImpl.java index 16cc100d898..c6d6c70694f 100644 --- a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/tiger/WildcardTypeImpl.java +++ b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/tiger/WildcardTypeImpl.java @@ -17,8 +17,8 @@ package org.jvnet.hk2.config.tiger; -import java.lang.reflect.WildcardType; import java.lang.reflect.Type; +import java.lang.reflect.WildcardType; import java.util.Arrays; /** diff --git a/nucleus/hk2-config-generator/src/test/java/org/jvnet/hk2/config/test/example/ConfigErrorService.java b/nucleus/hk2-config-generator/src/test/java/org/jvnet/hk2/config/test/example/ConfigErrorService.java index 1bd5bd89364..b8ddb7994a2 100644 --- a/nucleus/hk2-config-generator/src/test/java/org/jvnet/hk2/config/test/example/ConfigErrorService.java +++ b/nucleus/hk2-config-generator/src/test/java/org/jvnet/hk2/config/test/example/ConfigErrorService.java @@ -17,12 +17,12 @@ package org.jvnet.hk2.config.test.example; +import jakarta.inject.Singleton; + import org.glassfish.hk2.api.ErrorInformation; import org.glassfish.hk2.api.ErrorService; import org.glassfish.hk2.api.MultiException; -import jakarta.inject.Singleton; - /** * @author jwells */ diff --git a/nucleus/hk2-config-generator/src/test/java/org/jvnet/hk2/config/test/example/ConfigModule.java b/nucleus/hk2-config-generator/src/test/java/org/jvnet/hk2/config/test/example/ConfigModule.java index 032cbca738c..c52013995ae 100644 --- a/nucleus/hk2-config-generator/src/test/java/org/jvnet/hk2/config/test/example/ConfigModule.java +++ b/nucleus/hk2-config-generator/src/test/java/org/jvnet/hk2/config/test/example/ConfigModule.java @@ -17,6 +17,8 @@ package org.jvnet.hk2.config.test.example; +import jakarta.inject.Singleton; + import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -40,8 +42,6 @@ import org.jvnet.hk2.config.Populator; import org.jvnet.hk2.config.Transactions; -import jakarta.inject.Singleton; - /** * TODO: This should be done via auto-depends (via Service and contract * and all that). However, since those don't work yet with the new diff --git a/nucleus/hk2-config-generator/src/test/java/org/jvnet/hk2/config/test/example/GenericContainer.java b/nucleus/hk2-config-generator/src/test/java/org/jvnet/hk2/config/test/example/GenericContainer.java index 6c337cdda52..89283ae6bb2 100644 --- a/nucleus/hk2-config-generator/src/test/java/org/jvnet/hk2/config/test/example/GenericContainer.java +++ b/nucleus/hk2-config-generator/src/test/java/org/jvnet/hk2/config/test/example/GenericContainer.java @@ -17,6 +17,8 @@ package org.jvnet.hk2.config.test.example; +import jakarta.validation.constraints.NotNull; + import java.util.List; import org.jvnet.hk2.config.Attribute; @@ -24,8 +26,6 @@ import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.Element; -import jakarta.validation.constraints.NotNull; - @Configured public interface GenericContainer extends ConfigBeanProxy { int DEFAULT_THREAD_CORE_POOL_SIZE = 16; diff --git a/nucleus/hk2-config-types/src/main/java/org/jvnet/hk2/config/types/HK2DomConfigTypesUtilities.java b/nucleus/hk2-config-types/src/main/java/org/jvnet/hk2/config/types/HK2DomConfigTypesUtilities.java index 8e1ee5ce35a..886b900088f 100644 --- a/nucleus/hk2-config-types/src/main/java/org/jvnet/hk2/config/types/HK2DomConfigTypesUtilities.java +++ b/nucleus/hk2-config-types/src/main/java/org/jvnet/hk2/config/types/HK2DomConfigTypesUtilities.java @@ -16,11 +16,11 @@ package org.jvnet.hk2.config.types; -import java.util.LinkedList; - import jakarta.inject.Named; import jakarta.inject.Singleton; +import java.util.LinkedList; + import org.glassfish.hk2.api.HK2Loader; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.hk2.utilities.BuilderHelper; diff --git a/nucleus/hk2-config-types/src/main/java/org/jvnet/hk2/config/types/Property.java b/nucleus/hk2-config-types/src/main/java/org/jvnet/hk2/config/types/Property.java index 89d2d1a97e4..630e9787a85 100644 --- a/nucleus/hk2-config-types/src/main/java/org/jvnet/hk2/config/types/Property.java +++ b/nucleus/hk2-config-types/src/main/java/org/jvnet/hk2/config/types/Property.java @@ -23,8 +23,8 @@ import java.beans.PropertyVetoException; import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Configured; /** * Property type definition. From a8c78aa9aec3cd7364f200cee12b57f132bbbf25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sat, 10 Aug 2024 21:28:52 +0200 Subject: [PATCH 03/40] Imports: common packages (both appserver and nucleus) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../amx/impl/j2ee/AppClientModuleImpl.java | 4 +- .../amx/impl/j2ee/DASJ2EEServerImpl.java | 9 +++- .../admin/amx/impl/j2ee/EJBImplBase.java | 4 +- .../admin/amx/impl/j2ee/EJBModuleImpl.java | 9 +++- .../admin/amx/impl/j2ee/EntityBeanImpl.java | 4 +- .../amx/impl/j2ee/J2EEApplicationImpl.java | 9 +++- .../impl/j2ee/J2EEDeployedObjectImplBase.java | 4 +- .../admin/amx/impl/j2ee/J2EEDomainImpl.java | 11 ++-- .../impl/j2ee/J2EELogicalServerImplBase.java | 7 +-- .../impl/j2ee/J2EEManagedObjectImplBase.java | 19 +++++-- .../amx/impl/j2ee/J2EEModuleImplBase.java | 4 +- .../amx/impl/j2ee/J2EEResourceImplBase.java | 4 +- .../admin/amx/impl/j2ee/J2EEServerImpl.java | 17 +++++-- .../impl/j2ee/JCAConnectionFactoryImpl.java | 4 +- .../j2ee/JCAManagedConnectionFactoryImpl.java | 4 +- .../admin/amx/impl/j2ee/JCAResourceImpl.java | 4 +- .../amx/impl/j2ee/JDBCDataSourceImpl.java | 6 +-- .../admin/amx/impl/j2ee/JDBCDriverImpl.java | 4 +- .../admin/amx/impl/j2ee/JDBCResourceImpl.java | 4 +- .../admin/amx/impl/j2ee/JMSResourceImpl.java | 4 +- .../admin/amx/impl/j2ee/JNDIResourceImpl.java | 4 +- .../admin/amx/impl/j2ee/JTAResourceImpl.java | 4 +- .../admin/amx/impl/j2ee/JVMImpl.java | 4 +- .../amx/impl/j2ee/JavaMailResourceImpl.java | 4 +- .../amx/impl/j2ee/MessageDrivenBeanImpl.java | 4 +- .../admin/amx/impl/j2ee/Metadata.java | 1 + .../admin/amx/impl/j2ee/MetadataImpl.java | 1 + .../amx/impl/j2ee/RMI_IIOPResourceImpl.java | 4 +- .../amx/impl/j2ee/ResourceAdapterImpl.java | 4 +- .../impl/j2ee/ResourceAdapterModuleImpl.java | 4 +- .../admin/amx/impl/j2ee/ServletImpl.java | 4 +- .../amx/impl/j2ee/SessionBeanImplBase.java | 4 +- .../impl/j2ee/SingletonSessionBeanImpl.java | 4 +- .../impl/j2ee/StatefulSessionBeanImpl.java | 4 +- .../impl/j2ee/StatelessSessionBeanImpl.java | 4 +- .../admin/amx/impl/j2ee/URLResourceImpl.java | 4 +- .../admin/amx/impl/j2ee/WebModuleImpl.java | 4 +- .../j2ee/loader/AMXJ2EEStartupService.java | 33 +++++++----- .../impl/j2ee/loader/J2EEInjectedValues.java | 7 +-- .../admin/amx/impl/j2ee/package-info.java | 2 +- .../admin/amx/j2ee/AMXEELoggerInfo.java | 1 + .../admin/amx/j2ee/J2EEDeployedObject.java | 1 + .../glassfish/admin/amx/j2ee/J2EEDomain.java | 4 +- .../admin/amx/j2ee/J2EELogicalServer.java | 1 + .../admin/amx/j2ee/J2EEResource.java | 1 + .../glassfish/admin/amx/j2ee/J2EEServer.java | 4 +- .../glassfish/admin/amx/j2ee/J2EETypes.java | 6 +-- .../admin/amx/j2ee/JCAConnectionFactory.java | 2 +- .../glassfish/admin/amx/j2ee/JCAResource.java | 2 +- .../admin/amx/j2ee/JDBCDataSource.java | 2 +- .../admin/amx/j2ee/ResourceAdapterModule.java | 1 - .../admin/amx/j2ee/package-info.java | 2 +- .../apf/impl/ProcessingResultImpl.java | 6 +-- .../common/impl/ContainerUtilImpl.java | 8 +-- .../container/common/impl/QueryWrapper.java | 17 +++++-- .../impl/StoreProcedureQueryWrapper.java | 8 ++- .../common/impl/TypedQueryWrapper.java | 12 +++-- .../managedbean/ManagedBeanNamingProxy.java | 6 +-- .../impl/util/DummyCallFlowAgentImpl.java | 7 +-- .../container/common/spi/CDIService.java | 16 +++--- .../common/spi/EjbNamingReferenceManager.java | 4 +- .../container/common/spi/JavaEEContainer.java | 4 +- .../spi/JavaEEInterceptorBuilderFactory.java | 4 +- .../common/spi/ManagedBeanManager.java | 4 +- .../spi/WebServiceReferenceManager.java | 4 +- .../common/spi/util/ContainerUtil.java | 4 +- .../util/GlassFishOutputStreamHandler.java | 1 + .../java/com/sun/appserv/ProxyHandler.java | 5 +- .../com/sun/appserv/security/AuditModule.java | 1 + .../naming/GlassFishNamingBuilder.java | 14 ++--- .../naming/SerialInitContextFactory.java | 3 +- .../impl/ClientNamingConfiguratorImpl.java | 6 +-- .../impl/LocalSerialContextProviderImpl.java | 12 +++-- .../naming/impl/ProviderManager.java | 4 +- .../impl/RemoteSerialContextProviderImpl.java | 8 ++- .../impl/SerialContextProviderImpl.java | 5 +- .../naming/impl/SerialNameParser.java | 7 +-- .../naming/impl/WrappedSerialContext.java | 3 +- .../naming/util/IIOPObjectFactory.java | 9 +++- .../sun/enterprise/naming/util/LogFacade.java | 6 +-- .../impl/GlassfishNamingManagerImplTest.java | 2 + .../monitor/registry/MonitoringRegistry.java | 19 ++++++- .../admin/monitor/registry/StatsHolder.java | 6 ++- .../stats/BoundedRangeStatisticImpl.java | 3 +- .../monitor/stats/ConnectionPoolStats.java | 4 +- .../monitor/stats/ConnectorWorkMgmtStats.java | 2 +- .../monitor/stats/CountStatisticImpl.java | 3 +- .../admin/monitor/stats/EJBCacheStats.java | 4 +- .../admin/monitor/stats/EJBMethodStats.java | 2 +- .../admin/monitor/stats/EJBPoolStats.java | 4 +- .../admin/monitor/stats/GFJTAStats.java | 1 + .../admin/monitor/stats/GenericStatsImpl.java | 7 +-- .../monitor/stats/HTTPListenerStats.java | 2 +- .../monitor/stats/JVMClassLoadingStats.java | 2 +- .../monitor/stats/JVMCompilationStats.java | 2 +- .../stats/JVMGarbageCollectorStats.java | 2 +- .../admin/monitor/stats/JVMMemoryStats.java | 2 +- .../stats/JVMOperatingSystemStats.java | 2 +- .../admin/monitor/stats/JVMRuntimeStats.java | 2 +- .../monitor/stats/JVMThreadInfoStats.java | 2 +- .../admin/monitor/stats/JVMThreadStats.java | 2 +- .../MutableAverageRangeStatisticImpl.java | 2 +- .../admin/monitor/stats/MutableStatistic.java | 3 +- .../stats/MutableTimeStatisticImpl.java | 2 +- .../stats/OrbConnectionManagerStats.java | 4 +- .../admin/monitor/stats/PWCDnsStats.java | 2 +- .../monitor/stats/PWCFileCacheStats.java | 2 +- .../monitor/stats/PWCKeepAliveStats.java | 3 +- .../admin/monitor/stats/PWCRequestStats.java | 2 +- .../monitor/stats/PWCThreadPoolStats.java | 2 +- .../admin/monitor/stats/ServletStats.java | 2 +- .../stats/StatefulSessionStoreStats.java | 4 +- .../admin/monitor/stats/StatisticImpl.java | 6 ++- .../admin/monitor/stats/ThreadPoolStats.java | 4 +- .../monitor/stats/TimeStatisticImpl.java | 3 +- .../monitor/stats/TimerServiceStats.java | 2 +- .../admin/monitor/stats/WebModuleStats.java | 2 +- .../admin/amx/annotation/ChildGetter.java | 8 +-- .../admin/amx/annotation/Description.java | 3 +- .../amx/annotation/ManagedAttribute.java | 7 +-- .../amx/annotation/ManagedOperation.java | 8 +-- .../glassfish/admin/amx/annotation/Param.java | 7 ++- .../admin/amx/annotation/package-info.java | 2 +- .../glassfish/admin/amx/base/BulkAccess.java | 7 ++- .../glassfish/admin/amx/base/DomainRoot.java | 18 +++---- .../org/glassfish/admin/amx/base/Ext.java | 5 +- .../admin/amx/base/MBeanTracker.java | 9 +++- .../admin/amx/base/MBeanTrackerMBean.java | 8 +-- .../glassfish/admin/amx/base/Pathnames.java | 7 +-- .../org/glassfish/admin/amx/base/Query.java | 13 +++-- .../org/glassfish/admin/amx/base/Realms.java | 6 ++- .../glassfish/admin/amx/base/RuntimeRoot.java | 12 +++-- .../org/glassfish/admin/amx/base/Sample.java | 6 +-- .../glassfish/admin/amx/base/Singleton.java | 2 +- .../glassfish/admin/amx/base/SystemInfo.java | 4 +- .../org/glassfish/admin/amx/base/Tools.java | 7 +-- .../amx/base/UnprocessedConfigChange.java | 1 + .../admin/amx/base/package-info.java | 2 +- .../admin/amx/config/AMXConfigProxy.java | 11 ++-- .../admin/amx/config/AttributeResolver.java | 6 +-- .../admin/amx/config/package-info.java | 2 +- .../admin/amx/core/AMXMBeanMetadata.java | 7 +-- .../org/glassfish/admin/amx/core/AMX_SPI.java | 4 +- .../org/glassfish/admin/amx/core/Extra.java | 4 +- .../glassfish/admin/amx/core/MetaGetters.java | 6 +-- .../admin/amx/core/PathnameConstants.java | 2 +- .../admin/amx/core/PathnameParser.java | 12 ++++- .../admin/amx/core/StdAttributesAccess.java | 13 +++-- .../admin/amx/core/package-info.java | 2 +- .../admin/amx/core/proxy/AMXProxyHandler.java | 16 +++++- .../admin/amx/core/proxy/package-info.java | 2 +- .../amx/impl/config/AMXConfigLoader.java | 16 +++++- .../impl/config/AMXConfigStartupService.java | 19 +++---- .../amx/impl/config/ConfigBeanJMXSupport.java | 18 +++---- .../config/ConfigBeanJMXSupportRegistry.java | 4 +- .../amx/impl/config/ConfigBeanRegistry.java | 2 + .../admin/amx/impl/config/package-info.java | 2 +- .../admin/amx/impl/mbean/AMXImplBase.java | 24 ++++++++- .../admin/amx/impl/mbean/BulkAccessImpl.java | 6 +-- .../amx/impl/mbean/ComplianceMonitor.java | 8 ++- .../admin/amx/impl/mbean/ExtImpl.java | 1 + .../admin/amx/impl/mbean/MBeanImplBase.java | 26 ++++++---- .../amx/impl/mbean/MonitoringRootImpl.java | 2 + .../admin/amx/impl/mbean/ParentChildren.java | 1 + .../admin/amx/impl/mbean/PathnamesImpl.java | 3 ++ .../admin/amx/impl/mbean/QueryMgrImpl.java | 22 ++++---- .../admin/amx/impl/mbean/RealmsImpl.java | 42 +++++++-------- .../admin/amx/impl/mbean/RuntimeRootImpl.java | 39 +++++++------- .../admin/amx/impl/mbean/SampleImpl.java | 30 ++++++----- .../amx/impl/mbean/ServerMonitoringImpl.java | 1 + .../amx/impl/mbean/ServerRuntimeImpl.java | 1 + .../admin/amx/impl/mbean/SystemInfoImpl.java | 2 + .../amx/impl/mbean/SystemInfoIniter.java | 6 ++- .../admin/amx/impl/mbean/ToolsImpl.java | 7 +-- .../admin/amx/impl/mbean/package-info.java | 2 +- .../admin/amx/impl/package-info.java | 2 +- .../admin/amx/impl/util/ImplUtil.java | 2 + .../admin/amx/impl/util/InjectedValues.java | 17 +++---- .../glassfish/admin/amx/impl/util/Issues.java | 1 + .../admin/amx/impl/util/MBeanInfoSupport.java | 19 +++++-- .../amx/impl/util/ObjectNameBuilder.java | 5 +- .../amx/impl/util/UnregistrationListener.java | 8 ++- .../admin/amx/impl/util/package-info.java | 2 +- .../admin/amx/logging/LogAnalyzer.java | 2 + .../admin/amx/logging/LogFileAccess.java | 1 + .../admin/amx/logging/LogModuleNames.java | 4 +- .../glassfish/admin/amx/logging/LogQuery.java | 9 ++-- .../admin/amx/logging/LogQueryEntry.java | 1 + .../admin/amx/logging/LogQueryEntryImpl.java | 18 +++++-- .../admin/amx/logging/LogQueryResultImpl.java | 6 +-- .../admin/amx/logging/LogRecordEmitter.java | 13 ++--- .../glassfish/admin/amx/logging/LogUtil.java | 1 + .../admin/amx/logging/package-info.java | 2 +- .../admin/amx/monitoring/MonitoringRoot.java | 3 +- .../admin/amx/monitoring/package-info.java | 2 +- .../admin/amx/util/CollectionUtil.java | 2 +- .../admin/amx/util/ExceptionUtil.java | 2 +- .../glassfish/admin/amx/util/ListUtil.java | 4 +- .../glassfish/admin/amx/util/StringUtil.java | 2 + .../amx/util/jmx/AttributeComparator.java | 1 + .../glassfish/admin/amx/util/jmx/JMXUtil.java | 40 ++++++++++++++- .../jmx/MBeanAttributeInfoComparator.java | 2 + .../amx/util/jmx/MBeanInterfaceGenerator.java | 2 + .../admin/amx/util/jmx/MBeanProxyHandler.java | 22 ++++++-- .../util/jmx/MBeanRegistrationListener.java | 3 +- .../amx/util/jmx/NotificationBuilder.java | 3 +- .../util/jmx/NotificationEmitterSupport.java | 2 + .../util/jmx/NotificationListenerBase.java | 3 +- .../jmx/NotificationListenerTracking.java | 5 +- .../admin/amx/util/jmx/ObjectNameQuery.java | 3 +- .../amx/util/jmx/ObjectNameQueryImpl.java | 7 +-- .../admin/amx/util/jmx/OpenMBeanUtil.java | 21 ++++---- .../admin/amx/util/jmx/package-info.java | 2 +- ...ttributeChangeNotificationStringifier.java | 1 + .../stringifier/AttributeListStringifier.java | 7 +-- .../jmx/stringifier/AttributeStringifier.java | 4 +- .../stringifier/CompositeDataStringifier.java | 9 ++-- .../MBeanAttributeInfoStringifier.java | 4 +- .../MBeanConstructorInfoStringifier.java | 4 +- .../MBeanFeatureInfoStringifier.java | 2 + .../jmx/stringifier/MBeanInfoStringifier.java | 6 +-- .../MBeanNotificationInfoStringifier.java | 4 +- .../MBeanOperationInfoStringifier.java | 4 +- .../MBeanParameterInfoStringifier.java | 4 +- .../stringifier/NotificationStringifier.java | 9 ++-- .../stringifier/ObjectNameStringifier.java | 13 ++--- .../StringifierRegistryIniter.java | 17 +++++-- .../stringifier/TabularDataStringifier.java | 1 + .../admin/amx/util/package-info.java | 2 +- .../util/stringifier/SmartStringifier.java | 1 + .../X509CertificateStringifier.java | 4 +- .../amx/util/stringifier/package-info.java | 2 +- .../glassfish/admin/amx/core/UtilTest.java | 4 +- .../appserv/server/util/PreprocessorUtil.java | 4 +- .../com/sun/appserv/util/cache/BaseCache.java | 1 + .../util/cache/BoundedMultiLruCache.java | 6 +-- .../com/sun/appserv/util/cache/Cache.java | 2 +- .../sun/appserv/util/cache/MultiLruCache.java | 2 +- .../util/cache/mbeans/JmxLruCache.java | 2 +- .../util/cache/mbeans/JmxMultiLruCache.java | 2 +- .../common/util/logging/LoggingConfig.java | 4 +- .../security/store/PasswordAdapter.java | 4 +- .../enterprise/universal/GFBase64Decoder.java | 7 ++- .../enterprise/universal/GFBase64Encoder.java | 7 ++- .../universal/PropertiesDecoder.java | 4 +- .../sun/enterprise/universal/SystemProps.java | 10 +++- .../glassfish/ASenvPropertyReader.java | 24 +++++++-- .../glassfish/AdminCommandResponse.java | 12 +++-- .../universal/glassfish/GFLauncherUtils.java | 16 ++++-- .../universal/glassfish/GFSystem.java | 2 +- .../universal/glassfish/GFSystemImpl.java | 4 +- .../universal/glassfish/TokenResolver.java | 8 ++- .../process/ProcessStreamDrainerWorker.java | 5 +- .../universal/xml/ParsedCluster.java | 6 ++- .../sun/enterprise/util/AnnotationUtil.java | 1 + .../com/sun/enterprise/util/EarlyLogger.java | 8 +-- .../util/LocalStringManagerImpl.java | 3 +- .../com/sun/enterprise/util/MapBuilder.java | 2 +- .../main/java/com/sun/enterprise/util/OS.java | 2 +- .../sun/enterprise/util/ObjectAnalyzer.java | 7 ++- .../com/sun/enterprise/util/ProfilerImpl.java | 4 +- .../util/SystemPropertyConstants.java | 4 +- .../enterprise/util/i18n/StringManager.java | 2 +- .../util/i18n/StringManagerBase.java | 1 + .../sun/enterprise/util/io/DomainDirs.java | 3 +- .../sun/enterprise/util/io/FileLister.java | 5 +- .../util/io/FileListerRelative.java | 2 +- .../sun/enterprise/util/io/InstanceDirs.java | 5 +- .../enterprise/util/net/JarURIPattern.java | 1 + .../com/sun/enterprise/util/net/NetUtils.java | 22 ++++++-- .../sun/enterprise/util/uuid/UuidUtil.java | 2 - .../sun/enterprise/util/zip/ZipWriter.java | 8 ++- .../admin/payload/TextPayloadImpl.java | 3 +- .../admin/payload/ZipPayloadImpl.java | 1 + ...SGiObjectInputOutputStreamFactoryImpl.java | 7 ++- ...SGiObjectInputOutputStreamFactoryImpl.java | 10 ++-- .../util/ObjectInputOutputStreamFactory.java | 7 ++- .../util/ObjectInputStreamWithLoader.java | 10 ++-- .../common/util/admin/AdminAuthCallback.java | 1 + .../common/util/admin/AdminAuthenticator.java | 2 + .../common/util/admin/AsadminInput.java | 1 + .../common/util/admin/AuthTokenManager.java | 6 ++- .../common/util/admin/CommandModelImpl.java | 2 + .../util/admin/GenericCommandModel.java | 17 ++++--- .../util/admin/GlassFishErrorServiceImpl.java | 4 +- .../util/admin/HK2BindTracingService.java | 4 +- .../common/util/admin/ManPageFinder.java | 14 ++--- .../common/util/admin/ManagedFile.java | 1 + .../util/admin/MapInjectionResolver.java | 2 + .../common/util/admin/ParamTokenizer.java | 3 +- .../util/admin/ParameterMapExtractor.java | 1 + .../common/util/admin/RestSessionManager.java | 5 +- .../common/util/timer/TimerSchedule.java | 8 +-- .../main/java/org/glassfish/quality/ToDo.java | 11 +++- .../security/common/CNonceCache.java | 1 + .../glassfish/security/common/CipherInfo.java | 1 + .../security/common/MasterPassword.java | 2 + .../org/glassfish/security/common/SSHA.java | 10 ++-- .../util/admin/locking/ReadLockTest.java | 10 ++-- .../java/org/glassfish/api/Absolutized.java | 10 ++-- .../src/main/java/org/glassfish/api/I18n.java | 6 +-- .../main/java/org/glassfish/api/Param.java | 6 +-- .../org/glassfish/api/StartupRunLevel.java | 6 +-- .../api/UnknownOptionsAreOperands.java | 6 +-- .../glassfish/api/admin/AdminCommandLock.java | 6 +-- .../glassfish/api/admin/RestEndpoints.java | 4 +- .../org/glassfish/api/admin/Supplemental.java | 4 +- .../api/admin/TargetBasedExecutor.java | 6 +-- .../api/admin/config/PropertiesDesc.java | 6 +-- .../api/admin/config/PropertyDesc.java | 6 +-- .../glassfish/api/admin/progress/JobInfo.java | 4 +- .../api/admin/progress/JobInfos.java | 6 +-- .../org/glassfish/api/container/Sniffer.java | 4 +- .../deployment/archive/ArchiveDetector.java | 4 +- .../api/naming/NamespacePrefixes.java | 4 +- .../glassfish/api/naming/SimpleJndiName.java | 1 + .../internal/api/AdminAccessController.java | 1 + .../internal/api/ClassLoaderHierarchy.java | 8 +-- .../internal/api/DelegatingClassLoader.java | 6 +-- .../glassfish/internal/api/DomainUpgrade.java | 2 +- .../api/EmbeddedSystemAdministrator.java | 1 + .../org/glassfish/internal/api/Globals.java | 8 +-- .../glassfish/internal/api/InitRunLevel.java | 6 +-- .../api/InternalSystemAdministrator.java | 1 + .../glassfish/internal/api/LocalPassword.java | 2 +- .../internal/api/PostStartupRunLevel.java | 6 +-- .../internal/api/RelativePathResolver.java | 2 + .../glassfish/internal/api/ServerContext.java | 9 ++-- .../org/glassfish/internal/api/Target.java | 16 ++++-- .../internal/api/UndoableCommand.java | 9 +++- .../api/events/CommandInvokedEvent.java | 3 ++ .../api/events/InvokeEventService.java | 1 + .../config/UnprocessedConfigListener.java | 18 +++---- .../internal/data/ApplicationRegistry.java | 4 +- .../internal/data/ContainerRegistry.java | 6 +-- .../glassfish/internal/data/EngineInfo.java | 4 +- .../glassfish/internal/data/EngineRef.java | 6 +-- .../internal/data/ProgressTracker.java | 4 +- .../deployment/ApplicationInfoProvider.java | 4 +- .../internal/deployment/Deployment.java | 6 +-- .../internal/deployment/DeploymentOrder.java | 10 ++-- .../deployment/DeploymentTargetResolver.java | 2 +- .../internal/deployment/DeploymentType.java | 4 +- .../deployment/ExtendedDeploymentContext.java | 10 ++-- .../internal/deployment/GenericDeployer.java | 4 +- .../internal/embedded/EmbeddedContainer.java | 4 +- .../internal/embedded/EmbeddedDeployer.java | 7 +-- .../internal/embedded/EmbeddedFileSystem.java | 6 +-- .../glassfish/internal/embedded/Ports.java | 4 +- .../internal/embedded/ScatteredArchive.java | 26 +++++++--- .../internal/embedded/admin/AdminInfo.java | 4 +- .../embedded/admin/CommandParameters.java | 4 +- .../embedded/grizzly/GrizzlyContainer.java | 2 +- .../embedded/grizzly/GrizzlyInfo.java | 4 +- .../glassfish/internal/grizzly/V3Mapper.java | 2 +- .../mbeanserver/AMXStartupServiceMBean.java | 1 - .../AdminAuthorizedMBeanServer.java | 13 ++++- .../admin/mbeanserver/BootAMXListener.java | 2 + .../admin/mbeanserver/ConnectorStarter.java | 7 +-- .../admin/mbeanserver/JMXSslConfigHolder.java | 3 +- .../admin/mbeanserver/JMXStartupService.java | 51 ++++++++----------- .../admin/mbeanserver/MBeanServerFactory.java | 7 ++- .../mbeanserver/PendingConfigBeanJob.java | 3 +- .../admin/mbeanserver/PendingConfigBeans.java | 11 +++- .../mbeanserver/RMIConnectorStarter.java | 8 ++- .../org/glassfish/admin/mbeanserver/Util.java | 1 + .../ssl/JMXMasterPasswordImpl.java | 7 ++- .../ssl/SSLClientConfigurator.java | 36 +++++++++++-- .../ssl/SecureRMIClientSocketFactory.java | 2 + .../embeddable/archive/ScatteredArchive.java | 2 +- .../archive/ScatteredArchiveTest.java | 9 ++-- .../embeddable/GlassFishRuntime.java | 4 +- 372 files changed, 1437 insertions(+), 836 deletions(-) diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/AppClientModuleImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/AppClientModuleImpl.java index b213065ad57..8f146122dbc 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/AppClientModuleImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/AppClientModuleImpl.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.AppClientModule; - import javax.management.ObjectName; +import org.glassfish.admin.amx.j2ee.AppClientModule; + public final class AppClientModuleImpl extends J2EEModuleImplBase { public static final Class INTF = AppClientModule.class; diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/DASJ2EEServerImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/DASJ2EEServerImpl.java index 3fe27ccf501..488a76d14d2 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/DASJ2EEServerImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/DASJ2EEServerImpl.java @@ -19,11 +19,16 @@ import javax.management.Notification; import javax.management.NotificationListener; import javax.management.ObjectName; + import org.glassfish.admin.amx.core.Util; import org.glassfish.admin.amx.impl.util.Issues; import org.glassfish.admin.amx.impl.util.ObjectNameBuilder; -import org.glassfish.admin.amx.j2ee.*; -import static org.glassfish.admin.amx.j2ee.StateManageable.*; +import org.glassfish.admin.amx.j2ee.J2EETypes; + +import static org.glassfish.admin.amx.j2ee.StateManageable.STATE_FAILED; +import static org.glassfish.admin.amx.j2ee.StateManageable.STATE_RUNNING; +import static org.glassfish.admin.amx.j2ee.StateManageable.STATE_STARTING; +import static org.glassfish.admin.amx.j2ee.StateManageable.STATE_STOPPED; /** JSR 77 extension representing an Appserver standalone server (non-clustered) diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/EJBImplBase.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/EJBImplBase.java index 800a6ec7e87..c6da8a55bef 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/EJBImplBase.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/EJBImplBase.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.EJB; - import javax.management.ObjectName; +import org.glassfish.admin.amx.j2ee.EJB; + /** Parent type for the various EJB types. */ diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/EJBModuleImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/EJBModuleImpl.java index c409e1bd4af..5cac39df178 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/EJBModuleImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/EJBModuleImpl.java @@ -17,12 +17,17 @@ package org.glassfish.admin.amx.impl.j2ee; import java.util.Set; -import org.glassfish.admin.amx.j2ee.EJBModule; -import static org.glassfish.admin.amx.j2ee.J2EETypes.*; import javax.management.ObjectName; + +import org.glassfish.admin.amx.j2ee.EJBModule; import org.glassfish.admin.amx.util.SetUtil; +import static org.glassfish.admin.amx.j2ee.J2EETypes.ENTITY_BEAN; +import static org.glassfish.admin.amx.j2ee.J2EETypes.MESSAGE_DRIVEN_BEAN; +import static org.glassfish.admin.amx.j2ee.J2EETypes.STATEFUL_SESSION_BEAN; +import static org.glassfish.admin.amx.j2ee.J2EETypes.STATELESS_SESSION_BEAN; + public final class EJBModuleImpl extends J2EEModuleImplBase { public static final Class INTF = EJBModule.class; diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/EntityBeanImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/EntityBeanImpl.java index 30cc5376c9a..ecc03576576 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/EntityBeanImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/EntityBeanImpl.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.EntityBean; - import javax.management.ObjectName; +import org.glassfish.admin.amx.j2ee.EntityBean; + /** */ public final class EntityBeanImpl diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEApplicationImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEApplicationImpl.java index 693b4ef7bc6..d8967acc7be 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEApplicationImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEApplicationImpl.java @@ -17,12 +17,17 @@ package org.glassfish.admin.amx.impl.j2ee; import java.util.Set; -import org.glassfish.admin.amx.j2ee.J2EEApplication; -import static org.glassfish.admin.amx.j2ee.J2EETypes.*; import javax.management.ObjectName; + +import org.glassfish.admin.amx.j2ee.J2EEApplication; import org.glassfish.admin.amx.util.SetUtil; +import static org.glassfish.admin.amx.j2ee.J2EETypes.APP_CLIENT_MODULE; +import static org.glassfish.admin.amx.j2ee.J2EETypes.EJB_MODULE; +import static org.glassfish.admin.amx.j2ee.J2EETypes.RESOURCE_ADAPTER_MODULE; +import static org.glassfish.admin.amx.j2ee.J2EETypes.WEB_MODULE; + public final class J2EEApplicationImpl extends J2EEDeployedObjectImplBase { public static final Class INTF = J2EEApplication.class; diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEDeployedObjectImplBase.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEDeployedObjectImplBase.java index dfcbedbe3cb..d9689b1dfe7 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEDeployedObjectImplBase.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEDeployedObjectImplBase.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.J2EEDeployedObject; - import javax.management.ObjectName; +import org.glassfish.admin.amx.j2ee.J2EEDeployedObject; + /** */ public class J2EEDeployedObjectImplBase extends J2EEManagedObjectImplBase // implements J2EEDeployedObject diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEDomainImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEDomainImpl.java index 0ac0e4150de..f22152da0ef 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEDomainImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEDomainImpl.java @@ -18,18 +18,19 @@ import com.sun.enterprise.config.serverbeans.Server; +import java.util.List; + +import javax.management.MBeanServer; +import javax.management.ObjectName; + import org.glassfish.admin.amx.core.Util; +import org.glassfish.admin.amx.impl.config.ConfigBeanRegistry; import org.glassfish.admin.amx.impl.util.Issues; import org.glassfish.admin.amx.impl.util.ObjectNameBuilder; -import org.glassfish.admin.amx.impl.config.ConfigBeanRegistry; import org.glassfish.admin.amx.j2ee.J2EEDomain; import org.glassfish.admin.amx.j2ee.J2EEManagedObject; import org.glassfish.admin.amx.j2ee.J2EETypes; -import javax.management.MBeanServer; -import javax.management.ObjectName; -import java.util.List; - /** * Base implementation for the J2EEDomain for DAS and non-DAS server instances. */ diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EELogicalServerImplBase.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EELogicalServerImplBase.java index 8d7bf2103fa..88e087b6ff9 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EELogicalServerImplBase.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EELogicalServerImplBase.java @@ -16,12 +16,13 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.J2EELogicalServer; +import java.io.Serializable; +import java.util.Map; import javax.management.AttributeNotFoundException; import javax.management.ObjectName; -import java.io.Serializable; -import java.util.Map; + +import org.glassfish.admin.amx.j2ee.J2EELogicalServer; /** Base interface only (for cluster and standalone server) diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEManagedObjectImplBase.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEManagedObjectImplBase.java index 19db248c9cd..2a0fd52f8be 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEManagedObjectImplBase.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEManagedObjectImplBase.java @@ -16,26 +16,39 @@ package org.glassfish.admin.amx.impl.j2ee; +import com.sun.enterprise.config.serverbeans.Domain; + import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; + import javax.management.MBeanServer; import javax.management.ObjectName; -import com.sun.enterprise.config.serverbeans.Domain; + import org.glassfish.admin.amx.core.Util; import org.glassfish.admin.amx.impl.mbean.AMXImplBase; import org.glassfish.admin.amx.impl.util.InjectedValues; import org.glassfish.admin.amx.impl.util.ObjectNameBuilder; import org.glassfish.admin.amx.j2ee.J2EEManagedObject; import org.glassfish.admin.amx.j2ee.J2EEServer; +import org.glassfish.admin.amx.j2ee.J2EETypes; import org.glassfish.admin.amx.j2ee.StateManageable; import org.glassfish.admin.amx.util.SetUtil; import org.glassfish.admin.amx.util.StringUtil; import org.glassfish.admin.amx.util.jmx.JMXUtil; -import org.glassfish.admin.amx.j2ee.J2EETypes; -import static org.glassfish.admin.amx.j2ee.J2EETypes.*; +import static org.glassfish.admin.amx.j2ee.J2EETypes.APP_CLIENT_MODULE; +import static org.glassfish.admin.amx.j2ee.J2EETypes.EJB_MODULE; +import static org.glassfish.admin.amx.j2ee.J2EETypes.ENTITY_BEAN; +import static org.glassfish.admin.amx.j2ee.J2EETypes.J2EE_APPLICATION; +import static org.glassfish.admin.amx.j2ee.J2EETypes.MESSAGE_DRIVEN_BEAN; +import static org.glassfish.admin.amx.j2ee.J2EETypes.RESOURCE_ADAPTER; +import static org.glassfish.admin.amx.j2ee.J2EETypes.RESOURCE_ADAPTER_MODULE; +import static org.glassfish.admin.amx.j2ee.J2EETypes.SERVLET; +import static org.glassfish.admin.amx.j2ee.J2EETypes.STATEFUL_SESSION_BEAN; +import static org.glassfish.admin.amx.j2ee.J2EETypes.STATELESS_SESSION_BEAN; +import static org.glassfish.admin.amx.j2ee.J2EETypes.WEB_MODULE; diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEModuleImplBase.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEModuleImplBase.java index 3c1c1a2e0cf..91c694a9c9c 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEModuleImplBase.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEModuleImplBase.java @@ -16,9 +16,9 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.J2EEModule; - import javax.management.ObjectName; + +import org.glassfish.admin.amx.j2ee.J2EEModule; import org.glassfish.admin.amx.j2ee.J2EETypes; /** diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEResourceImplBase.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEResourceImplBase.java index 575d97174fb..41d29d7b19b 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEResourceImplBase.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEResourceImplBase.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.J2EEResource; - import javax.management.ObjectName; +import org.glassfish.admin.amx.j2ee.J2EEResource; + public class J2EEResourceImplBase extends J2EEManagedObjectImplBase { diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEServerImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEServerImpl.java index ebc2439b64b..f991b088f10 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEServerImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEServerImpl.java @@ -18,14 +18,21 @@ import java.util.Set; -import org.glassfish.admin.amx.j2ee.J2EEServer; -import org.glassfish.admin.amx.util.SetUtil; -import org.glassfish.admin.amx.impl.util.Issues; - import javax.management.ObjectName; +import org.glassfish.admin.amx.impl.util.Issues; +import org.glassfish.admin.amx.j2ee.J2EEServer; +import org.glassfish.admin.amx.util.SetUtil; -import static org.glassfish.admin.amx.j2ee.J2EETypes.*; +import static org.glassfish.admin.amx.j2ee.J2EETypes.JAVA_MAIL_RESOURCE; +import static org.glassfish.admin.amx.j2ee.J2EETypes.JCA_RESOURCE; +import static org.glassfish.admin.amx.j2ee.J2EETypes.JDBC_RESOURCE; +import static org.glassfish.admin.amx.j2ee.J2EETypes.JMS_RESOURCE; +import static org.glassfish.admin.amx.j2ee.J2EETypes.JNDI_RESOURCE; +import static org.glassfish.admin.amx.j2ee.J2EETypes.JTA_RESOURCE; +import static org.glassfish.admin.amx.j2ee.J2EETypes.JVM; +import static org.glassfish.admin.amx.j2ee.J2EETypes.RMI_IIOP_RESOURCE; +import static org.glassfish.admin.amx.j2ee.J2EETypes.URL_RESOURCE; /** JSR 77 extension representing an Appserver standalone server (non-clustered). diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JCAConnectionFactoryImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JCAConnectionFactoryImpl.java index 4f97a583ebe..b52f1ff993c 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JCAConnectionFactoryImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JCAConnectionFactoryImpl.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.JCAConnectionFactory; - import javax.management.ObjectName; + import org.glassfish.admin.amx.j2ee.J2EEManagedObject; +import org.glassfish.admin.amx.j2ee.JCAConnectionFactory; /** */ diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JCAManagedConnectionFactoryImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JCAManagedConnectionFactoryImpl.java index abc1fc5e899..cc26d96aea2 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JCAManagedConnectionFactoryImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JCAManagedConnectionFactoryImpl.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.JCAManagedConnectionFactory; - import javax.management.ObjectName; + import org.glassfish.admin.amx.j2ee.J2EEManagedObject; +import org.glassfish.admin.amx.j2ee.JCAManagedConnectionFactory; public final class JCAManagedConnectionFactoryImpl extends J2EEManagedObjectImplBase { diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JCAResourceImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JCAResourceImpl.java index c9d8d0c2ea2..9e90afd882d 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JCAResourceImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JCAResourceImpl.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.JCAResource; - import javax.management.ObjectName; +import org.glassfish.admin.amx.j2ee.JCAResource; + /** */ public final class JCAResourceImpl extends J2EEResourceImplBase { diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JDBCDataSourceImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JDBCDataSourceImpl.java index bc400719196..ccd19fea2a6 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JDBCDataSourceImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JDBCDataSourceImpl.java @@ -16,12 +16,12 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.JDBCDataSource; - import javax.management.ObjectName; + +import org.glassfish.admin.amx.impl.util.ObjectNameBuilder; import org.glassfish.admin.amx.j2ee.J2EEManagedObject; import org.glassfish.admin.amx.j2ee.J2EETypes; -import org.glassfish.admin.amx.impl.util.ObjectNameBuilder; +import org.glassfish.admin.amx.j2ee.JDBCDataSource; public final class JDBCDataSourceImpl extends J2EEManagedObjectImplBase { public static final Class INTF = JDBCDataSource.class; diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JDBCDriverImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JDBCDriverImpl.java index c756bae7e64..0249827b576 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JDBCDriverImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JDBCDriverImpl.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.JDBCDriver; - import javax.management.ObjectName; + import org.glassfish.admin.amx.j2ee.J2EEManagedObject; +import org.glassfish.admin.amx.j2ee.JDBCDriver; public final class JDBCDriverImpl extends J2EEManagedObjectImplBase { diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JDBCResourceImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JDBCResourceImpl.java index 45a2b004125..9e0bf834d93 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JDBCResourceImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JDBCResourceImpl.java @@ -16,11 +16,11 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.JDBCResource; - import javax.management.ObjectName; + import org.glassfish.admin.amx.impl.util.ObjectNameBuilder; import org.glassfish.admin.amx.j2ee.J2EETypes; +import org.glassfish.admin.amx.j2ee.JDBCResource; public final class JDBCResourceImpl extends J2EEResourceImplBase { public static final Class INTF = JDBCResource.class; diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JMSResourceImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JMSResourceImpl.java index 508dda6ac36..7a06e44d82b 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JMSResourceImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JMSResourceImpl.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.JMSResource; - import javax.management.ObjectName; +import org.glassfish.admin.amx.j2ee.JMSResource; + public final class JMSResourceImpl extends J2EEResourceImplBase { public static final Class INTF = JMSResource.class; diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JNDIResourceImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JNDIResourceImpl.java index c84724342fd..02b2c8b5fb5 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JNDIResourceImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JNDIResourceImpl.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.JNDIResource; - import javax.management.ObjectName; +import org.glassfish.admin.amx.j2ee.JNDIResource; + /** */ public final class JNDIResourceImpl diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JTAResourceImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JTAResourceImpl.java index e20cf2fb4d1..a2ae07b0722 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JTAResourceImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JTAResourceImpl.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.JTAResource; - import javax.management.ObjectName; +import org.glassfish.admin.amx.j2ee.JTAResource; + /** */ public final class JTAResourceImpl diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JVMImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JVMImpl.java index fff1b8883f2..031273eff4b 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JVMImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JVMImpl.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.JVM; - import javax.management.ObjectName; + import org.glassfish.admin.amx.j2ee.J2EEManagedObject; +import org.glassfish.admin.amx.j2ee.JVM; /** Identifies a Java VM being utilized by a server. diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JavaMailResourceImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JavaMailResourceImpl.java index 884b2eff32d..1114e489566 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JavaMailResourceImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JavaMailResourceImpl.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.JavaMailResource; - import javax.management.ObjectName; +import org.glassfish.admin.amx.j2ee.JavaMailResource; + public final class JavaMailResourceImpl extends J2EEResourceImplBase { public static final Class INTF = JavaMailResource.class; diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/MessageDrivenBeanImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/MessageDrivenBeanImpl.java index bc2bc5db760..e433c6f7090 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/MessageDrivenBeanImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/MessageDrivenBeanImpl.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.MessageDrivenBean; - import javax.management.ObjectName; +import org.glassfish.admin.amx.j2ee.MessageDrivenBean; + public final class MessageDrivenBeanImpl extends EJBImplBase { public static final Class INTF = MessageDrivenBean.class; diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/Metadata.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/Metadata.java index ca18e0fe80b..5cb3f41fc04 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/Metadata.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/Metadata.java @@ -17,6 +17,7 @@ package org.glassfish.admin.amx.impl.j2ee; import java.util.Map; + import javax.management.ObjectName; /** diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/MetadataImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/MetadataImpl.java index 7a264f545a8..54d67352ac4 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/MetadataImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/MetadataImpl.java @@ -20,6 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; + import javax.management.ObjectName; public final class MetadataImpl implements Metadata { diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/RMI_IIOPResourceImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/RMI_IIOPResourceImpl.java index 56241df6145..31552750d05 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/RMI_IIOPResourceImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/RMI_IIOPResourceImpl.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.RMI_IIOPResource; - import javax.management.ObjectName; +import org.glassfish.admin.amx.j2ee.RMI_IIOPResource; + public final class RMI_IIOPResourceImpl extends J2EEResourceImplBase { public static final Class INTF = RMI_IIOPResource.class; diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/ResourceAdapterImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/ResourceAdapterImpl.java index 98fd246392d..343ba870b52 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/ResourceAdapterImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/ResourceAdapterImpl.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.ResourceAdapter; - import javax.management.ObjectName; + import org.glassfish.admin.amx.j2ee.J2EEManagedObject; +import org.glassfish.admin.amx.j2ee.ResourceAdapter; public final class ResourceAdapterImpl extends J2EEManagedObjectImplBase { public static final Class INTF = ResourceAdapter.class; diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/ResourceAdapterModuleImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/ResourceAdapterModuleImpl.java index 0806cd2763f..11443180d47 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/ResourceAdapterModuleImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/ResourceAdapterModuleImpl.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.ResourceAdapterModule; - import javax.management.ObjectName; + import org.glassfish.admin.amx.j2ee.J2EETypes; +import org.glassfish.admin.amx.j2ee.ResourceAdapterModule; public final class ResourceAdapterModuleImpl extends J2EEModuleImplBase { public static final Class INTF = ResourceAdapterModule.class; diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/ServletImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/ServletImpl.java index f58f5ced0bc..3087103a067 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/ServletImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/ServletImpl.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.Servlet; - import javax.management.ObjectName; +import org.glassfish.admin.amx.j2ee.Servlet; + public final class ServletImpl extends J2EEManagedObjectImplBase // implements Servlet { diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/SessionBeanImplBase.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/SessionBeanImplBase.java index 20568dd2ab5..6ed3562a453 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/SessionBeanImplBase.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/SessionBeanImplBase.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.SessionBean; - import javax.management.ObjectName; +import org.glassfish.admin.amx.j2ee.SessionBean; + public final class SessionBeanImplBase extends EJBImplBase { diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/SingletonSessionBeanImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/SingletonSessionBeanImpl.java index c60c05f47e0..048de58d792 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/SingletonSessionBeanImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/SingletonSessionBeanImpl.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.SingletonSessionBean; - import javax.management.ObjectName; +import org.glassfish.admin.amx.j2ee.SingletonSessionBean; + public final class SingletonSessionBeanImpl extends EJBImplBase { public static final Class INTF = SingletonSessionBean.class; diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/StatefulSessionBeanImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/StatefulSessionBeanImpl.java index 70ecd74898a..41f57794d7e 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/StatefulSessionBeanImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/StatefulSessionBeanImpl.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.StatefulSessionBean; - import javax.management.ObjectName; +import org.glassfish.admin.amx.j2ee.StatefulSessionBean; + public final class StatefulSessionBeanImpl extends EJBImplBase { public static final Class INTF = StatefulSessionBean.class; diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/StatelessSessionBeanImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/StatelessSessionBeanImpl.java index 1769bae5d32..fcd0d3848bb 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/StatelessSessionBeanImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/StatelessSessionBeanImpl.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.StatelessSessionBean; - import javax.management.ObjectName; +import org.glassfish.admin.amx.j2ee.StatelessSessionBean; + /** */ public final class StatelessSessionBeanImpl diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/URLResourceImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/URLResourceImpl.java index 7b1a431c42f..e1eaa025501 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/URLResourceImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/URLResourceImpl.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.URLResource; - import javax.management.ObjectName; +import org.glassfish.admin.amx.j2ee.URLResource; + public final class URLResourceImpl extends J2EEManagedObjectImplBase { public static final Class INTF = URLResource.class; diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/WebModuleImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/WebModuleImpl.java index f4b8b5e2c7b..1a12453130f 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/WebModuleImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/WebModuleImpl.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.admin.amx.j2ee.WebModule; - import javax.management.ObjectName; + import org.glassfish.admin.amx.j2ee.J2EETypes; +import org.glassfish.admin.amx.j2ee.WebModule; /** */ diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/loader/AMXJ2EEStartupService.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/loader/AMXJ2EEStartupService.java index f9bcb64f6fc..6b05294b956 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/loader/AMXJ2EEStartupService.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/loader/AMXJ2EEStartupService.java @@ -20,6 +20,19 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.config.serverbeans.Servers; + +import jakarta.inject.Inject; + +import java.beans.PropertyChangeEvent; +import java.util.Iterator; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.management.JMException; +import javax.management.MBeanServer; +import javax.management.ObjectName; + import org.glassfish.admin.amx.base.DomainRoot; import org.glassfish.admin.amx.config.AMXConfigConstants; import org.glassfish.admin.amx.core.proxy.ProxyFactory; @@ -31,25 +44,21 @@ import org.glassfish.admin.amx.impl.util.ImplUtil; import org.glassfish.admin.amx.impl.util.InjectedValues; import org.glassfish.admin.amx.impl.util.ObjectNameBuilder; +import org.glassfish.admin.amx.j2ee.AMXEELoggerInfo; import org.glassfish.admin.amx.j2ee.J2EEDomain; import org.glassfish.admin.amx.j2ee.J2EETypes; import org.glassfish.admin.amx.util.FeatureAvailability; import org.glassfish.api.amx.AMXLoader; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.data.ApplicationRegistry; -import jakarta.inject.Inject; import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.config.*; - -import javax.management.JMException; -import javax.management.MBeanServer; -import javax.management.ObjectName; -import java.beans.PropertyChangeEvent; -import java.util.Iterator; -import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; -import org.glassfish.admin.amx.j2ee.AMXEELoggerInfo; +import org.jvnet.hk2.config.Changed; +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.ConfigListener; +import org.jvnet.hk2.config.ConfigSupport; +import org.jvnet.hk2.config.NotProcessed; +import org.jvnet.hk2.config.ObservableBean; +import org.jvnet.hk2.config.UnprocessedChangeEvents; /** diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/loader/J2EEInjectedValues.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/loader/J2EEInjectedValues.java index 0d4c1cb7046..acdf5048bea 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/loader/J2EEInjectedValues.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/loader/J2EEInjectedValues.java @@ -16,12 +16,13 @@ package org.glassfish.admin.amx.impl.j2ee.loader; -import org.glassfish.admin.amx.impl.util.InjectedValues; +import com.sun.enterprise.deployment.archivist.ArchivistFactory; + import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; +import org.glassfish.admin.amx.impl.util.InjectedValues; import org.glassfish.internal.data.ApplicationRegistry; -import com.sun.enterprise.deployment.archivist.ArchivistFactory; +import org.jvnet.hk2.annotations.Service; /** Supplies the needed values for other classes such as MBeans that do not have access to diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/package-info.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/package-info.java index 7d52d0b532f..d4cb7bd21eb 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/package-info.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/package-info.java @@ -19,8 +19,8 @@ @Taxonomy(stability = Stability.PRIVATE) package org.glassfish.admin.amx.impl.j2ee; -import org.glassfish.external.arc.Taxonomy; import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/AMXEELoggerInfo.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/AMXEELoggerInfo.java index 7bab454d7c1..9c391baa294 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/AMXEELoggerInfo.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/AMXEELoggerInfo.java @@ -17,6 +17,7 @@ package org.glassfish.admin.amx.j2ee; import java.util.logging.Logger; + import org.glassfish.logging.annotation.LogMessageInfo; import org.glassfish.logging.annotation.LogMessagesResourceBundle; import org.glassfish.logging.annotation.LoggerInfo; diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/J2EEDeployedObject.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/J2EEDeployedObject.java index f1d552125bf..3d812ae7225 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/J2EEDeployedObject.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/J2EEDeployedObject.java @@ -17,6 +17,7 @@ package org.glassfish.admin.amx.j2ee; import javax.management.ObjectName; + import org.glassfish.admin.amx.annotation.Description; import org.glassfish.admin.amx.annotation.ManagedAttribute; diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/J2EEDomain.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/J2EEDomain.java index ba878a97ffc..5df738ad337 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/J2EEDomain.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/J2EEDomain.java @@ -17,10 +17,10 @@ package org.glassfish.admin.amx.j2ee; import javax.management.ObjectName; -import org.glassfish.admin.amx.annotation.Description; -import org.glassfish.admin.amx.core.AMXMBeanMetadata; +import org.glassfish.admin.amx.annotation.Description; import org.glassfish.admin.amx.annotation.ManagedAttribute; +import org.glassfish.admin.amx.core.AMXMBeanMetadata; /** * The discovery and navigation of all managed objects in the J2EE diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/J2EELogicalServer.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/J2EELogicalServer.java index 38353929dec..582529c9489 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/J2EELogicalServer.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/J2EELogicalServer.java @@ -17,6 +17,7 @@ package org.glassfish.admin.amx.j2ee; import java.util.Map; + import org.glassfish.admin.amx.annotation.ManagedOperation; diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/J2EEResource.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/J2EEResource.java index e45ee33beac..f969a8e537c 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/J2EEResource.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/J2EEResource.java @@ -17,6 +17,7 @@ package org.glassfish.admin.amx.j2ee; import javax.management.ObjectName; + import org.glassfish.admin.amx.annotation.Description; import org.glassfish.admin.amx.annotation.ManagedAttribute; import org.glassfish.admin.amx.core.AMXMBeanMetadata; diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/J2EEServer.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/J2EEServer.java index e1bf0fb3295..81e73005f49 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/J2EEServer.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/J2EEServer.java @@ -17,11 +17,11 @@ package org.glassfish.admin.amx.j2ee; import javax.management.ObjectName; -import org.glassfish.admin.amx.annotation.Description; -import org.glassfish.admin.amx.core.AMXMBeanMetadata; +import org.glassfish.admin.amx.annotation.Description; import org.glassfish.admin.amx.annotation.ManagedAttribute; import org.glassfish.admin.amx.annotation.ManagedOperation; +import org.glassfish.admin.amx.core.AMXMBeanMetadata; /** diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/J2EETypes.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/J2EETypes.java index 98c479dfef9..c74dec61c7d 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/J2EETypes.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/J2EETypes.java @@ -16,11 +16,11 @@ package org.glassfish.admin.amx.j2ee; -import org.glassfish.external.amx.AMX; -import org.glassfish.admin.amx.util.SetUtil; - import java.util.Set; +import org.glassfish.admin.amx.util.SetUtil; +import org.glassfish.external.amx.AMX; + /** * See JSR 77.3-1.
*/ diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/JCAConnectionFactory.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/JCAConnectionFactory.java index bf56334147c..51b323a5445 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/JCAConnectionFactory.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/JCAConnectionFactory.java @@ -16,8 +16,8 @@ package org.glassfish.admin.amx.j2ee; -import org.glassfish.admin.amx.core.AMXMBeanMetadata; import org.glassfish.admin.amx.annotation.ManagedAttribute; +import org.glassfish.admin.amx.core.AMXMBeanMetadata; /** */ diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/JCAResource.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/JCAResource.java index 319b7b15542..bccce33e788 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/JCAResource.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/JCAResource.java @@ -16,8 +16,8 @@ package org.glassfish.admin.amx.j2ee; -import org.glassfish.admin.amx.core.AMXMBeanMetadata; import org.glassfish.admin.amx.annotation.ManagedAttribute; +import org.glassfish.admin.amx.core.AMXMBeanMetadata; /** */ diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/JDBCDataSource.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/JDBCDataSource.java index b0d1e12cf9c..c04c5c8c74c 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/JDBCDataSource.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/JDBCDataSource.java @@ -16,8 +16,8 @@ package org.glassfish.admin.amx.j2ee; -import org.glassfish.admin.amx.core.AMXMBeanMetadata; import org.glassfish.admin.amx.annotation.ManagedAttribute; +import org.glassfish.admin.amx.core.AMXMBeanMetadata; @AMXMBeanMetadata(type = J2EETypes.JDBC_DATA_SOURCE) public interface JDBCDataSource extends J2EEManagedObject { diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/ResourceAdapterModule.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/ResourceAdapterModule.java index bcb755ed389..686ee230b68 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/ResourceAdapterModule.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/ResourceAdapterModule.java @@ -17,7 +17,6 @@ package org.glassfish.admin.amx.j2ee; import org.glassfish.admin.amx.annotation.ManagedAttribute; - import org.glassfish.admin.amx.core.AMXMBeanMetadata; @AMXMBeanMetadata(type = J2EETypes.RESOURCE_ADAPTER_MODULE) diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/package-info.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/package-info.java index c551f070d25..70c8ffe842e 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/package-info.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/j2ee/package-info.java @@ -19,5 +19,5 @@ @Taxonomy(stability = Stability.COMMITTED, description = "Jakarta EE Management interfaces") package org.glassfish.admin.amx.j2ee; -import org.glassfish.external.arc.Taxonomy; import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; diff --git a/appserver/common/annotation-framework/src/main/java/org/glassfish/apf/impl/ProcessingResultImpl.java b/appserver/common/annotation-framework/src/main/java/org/glassfish/apf/impl/ProcessingResultImpl.java index e0338d44846..e31eeeeb7fe 100644 --- a/appserver/common/annotation-framework/src/main/java/org/glassfish/apf/impl/ProcessingResultImpl.java +++ b/appserver/common/annotation-framework/src/main/java/org/glassfish/apf/impl/ProcessingResultImpl.java @@ -16,13 +16,13 @@ package org.glassfish.apf.impl; -import java.util.Map; -import java.util.HashMap; import java.lang.reflect.AnnotatedElement; +import java.util.HashMap; +import java.util.Map; +import org.glassfish.apf.HandlerProcessingResult; import org.glassfish.apf.ProcessingResult; import org.glassfish.apf.ResultType; -import org.glassfish.apf.HandlerProcessingResult; /** * Implementation of the ProcessingResult interface diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/ContainerUtilImpl.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/ContainerUtilImpl.java index 845e1b07383..1664f546499 100644 --- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/ContainerUtilImpl.java +++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/ContainerUtilImpl.java @@ -19,13 +19,15 @@ import com.sun.enterprise.container.common.spi.util.CallFlowAgent; import com.sun.enterprise.container.common.spi.util.ComponentEnvManager; import com.sun.enterprise.container.common.spi.util.ContainerUtil; -import org.glassfish.api.invocation.InvocationManager; + import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PreDestroy; import java.util.Timer; +import org.glassfish.api.invocation.InvocationManager; +import org.glassfish.hk2.api.PreDestroy; +import org.jvnet.hk2.annotations.Service; + @Service public class ContainerUtilImpl implements ContainerUtil, PreDestroy { diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/QueryWrapper.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/QueryWrapper.java index 58e61dd6636..eefa2ad3bf4 100644 --- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/QueryWrapper.java +++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/QueryWrapper.java @@ -16,12 +16,23 @@ package com.sun.enterprise.container.common.impl; +import com.sun.enterprise.container.common.impl.util.DummyCallFlowAgentImpl; import com.sun.enterprise.container.common.spi.util.CallFlowAgent; import com.sun.enterprise.container.common.spi.util.EntityManagerQueryMethod; -import com.sun.enterprise.container.common.impl.util.DummyCallFlowAgentImpl; -import jakarta.persistence.*; -import java.util.*; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Parameter; +import jakarta.persistence.Query; +import jakarta.persistence.TemporalType; +import jakarta.persistence.TransactionRequiredException; + +import java.util.Calendar; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * Wrapper class for jakarta.persistence.Query objects returned from diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/StoreProcedureQueryWrapper.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/StoreProcedureQueryWrapper.java index 1d97f7feded..637b9b834a3 100644 --- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/StoreProcedureQueryWrapper.java +++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/StoreProcedureQueryWrapper.java @@ -17,7 +17,13 @@ package com.sun.enterprise.container.common.impl; -import jakarta.persistence.*; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.Parameter; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureQuery; +import jakarta.persistence.TemporalType; + import java.util.Calendar; import java.util.Date; diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/TypedQueryWrapper.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/TypedQueryWrapper.java index 4958838bf79..1c29ff70069 100644 --- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/TypedQueryWrapper.java +++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/TypedQueryWrapper.java @@ -17,10 +17,16 @@ package com.sun.enterprise.container.common.impl; -import jakarta.persistence.*; -import java.util.List; -import java.util.Date; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Parameter; +import jakarta.persistence.TemporalType; +import jakarta.persistence.TypedQuery; + import java.util.Calendar; +import java.util.Date; +import java.util.List; /** * Wrapper class for jakarta.persistence.TypedQuery objects returned from diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/managedbean/ManagedBeanNamingProxy.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/managedbean/ManagedBeanNamingProxy.java index db35e180062..7865c386477 100644 --- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/managedbean/ManagedBeanNamingProxy.java +++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/managedbean/ManagedBeanNamingProxy.java @@ -17,15 +17,15 @@ package com.sun.enterprise.container.common.impl.managedbean; +import com.sun.enterprise.container.common.spi.ManagedBeanManager; +import com.sun.enterprise.deployment.ManagedBeanDescriptor; + import javax.naming.Context; import javax.naming.NamingException; import org.glassfish.api.naming.NamingObjectProxy; import org.glassfish.hk2.api.ServiceLocator; -import com.sun.enterprise.container.common.spi.ManagedBeanManager; -import com.sun.enterprise.deployment.ManagedBeanDescriptor; - public class ManagedBeanNamingProxy implements NamingObjectProxy { private final ServiceLocator serviceLocator; diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/util/DummyCallFlowAgentImpl.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/util/DummyCallFlowAgentImpl.java index b55b2ed037a..36334468a2d 100644 --- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/util/DummyCallFlowAgentImpl.java +++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/util/DummyCallFlowAgentImpl.java @@ -16,13 +16,14 @@ package com.sun.enterprise.container.common.impl.util; -import org.jvnet.hk2.annotations.Service; - -import jakarta.inject.Singleton; import com.sun.enterprise.container.common.spi.util.CallFlowAgent; import com.sun.enterprise.container.common.spi.util.EntityManagerMethod; import com.sun.enterprise.container.common.spi.util.EntityManagerQueryMethod; +import jakarta.inject.Singleton; + +import org.jvnet.hk2.annotations.Service; + @Service @Singleton public class DummyCallFlowAgentImpl diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/CDIService.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/CDIService.java index 6d2e37df99c..325d675a977 100644 --- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/CDIService.java +++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/CDIService.java @@ -16,14 +16,6 @@ package com.sun.enterprise.container.common.spi; -import java.util.Collection; -import java.util.Map; -import java.util.Set; - -import javax.naming.NamingException; - -import org.jvnet.hk2.annotations.Contract; - import com.sun.enterprise.deployment.BundleDescriptor; import com.sun.enterprise.deployment.EjbDescriptor; import com.sun.enterprise.deployment.EjbInterceptor; @@ -32,6 +24,14 @@ import jakarta.enterprise.inject.spi.InjectionTarget; import jakarta.servlet.ServletContext; +import java.util.Collection; +import java.util.Map; +import java.util.Set; + +import javax.naming.NamingException; + +import org.jvnet.hk2.annotations.Contract; + /** */ @Contract diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/EjbNamingReferenceManager.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/EjbNamingReferenceManager.java index a31f9fd37fd..0ee8c877526 100644 --- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/EjbNamingReferenceManager.java +++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/EjbNamingReferenceManager.java @@ -17,13 +17,13 @@ package com.sun.enterprise.container.common.spi; +import com.sun.enterprise.deployment.EjbReferenceDescriptor; + import javax.naming.Context; import javax.naming.NamingException; import org.jvnet.hk2.annotations.Contract; -import com.sun.enterprise.deployment.EjbReferenceDescriptor; - @Contract public interface EjbNamingReferenceManager { diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/JavaEEContainer.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/JavaEEContainer.java index 24ebb3a12ec..efda0fb820c 100644 --- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/JavaEEContainer.java +++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/JavaEEContainer.java @@ -17,11 +17,11 @@ package com.sun.enterprise.container.common.spi; -import org.jvnet.hk2.annotations.Contract; - import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; +import org.jvnet.hk2.annotations.Contract; + @Contract public interface JavaEEContainer { diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/JavaEEInterceptorBuilderFactory.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/JavaEEInterceptorBuilderFactory.java index 70e21bb873f..4238bce8990 100644 --- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/JavaEEInterceptorBuilderFactory.java +++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/JavaEEInterceptorBuilderFactory.java @@ -17,10 +17,10 @@ package com.sun.enterprise.container.common.spi; -import org.jvnet.hk2.annotations.Contract; - import com.sun.enterprise.container.common.spi.util.InterceptorInfo; +import org.jvnet.hk2.annotations.Contract; + /** * A factory for creating an interceptor builder. * diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/ManagedBeanManager.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/ManagedBeanManager.java index a789bbef16f..4201d358b58 100644 --- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/ManagedBeanManager.java +++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/ManagedBeanManager.java @@ -17,12 +17,12 @@ package com.sun.enterprise.container.common.spi; -import org.jvnet.hk2.annotations.Contract; - import com.sun.enterprise.deployment.Application; import com.sun.enterprise.deployment.BundleDescriptor; import com.sun.enterprise.deployment.ManagedBeanDescriptor; +import org.jvnet.hk2.annotations.Contract; + /** * ManagedBeanManager provides an interface to various Jakarta EE Managed Bean component operations. */ diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/WebServiceReferenceManager.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/WebServiceReferenceManager.java index badbd4bf311..c8fe6418a37 100644 --- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/WebServiceReferenceManager.java +++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/WebServiceReferenceManager.java @@ -17,13 +17,13 @@ package com.sun.enterprise.container.common.spi; +import com.sun.enterprise.deployment.ServiceReferenceDescriptor; + import javax.naming.Context; import javax.naming.NamingException; import org.jvnet.hk2.annotations.Contract; -import com.sun.enterprise.deployment.ServiceReferenceDescriptor; - /** * This class acts as a contract to resolve the jakarta.xml.ws.WebServiceRef references and also * jakarta.xml.ws.WebServiceContext Whenever a lookup is done from GlassfishNamingManagerImpl these methods diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/ContainerUtil.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/ContainerUtil.java index abe2f1d8416..a68b1bd8042 100644 --- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/ContainerUtil.java +++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/ContainerUtil.java @@ -16,11 +16,11 @@ package com.sun.enterprise.container.common.spi.util; +import java.util.Timer; + import org.glassfish.api.invocation.InvocationManager; import org.jvnet.hk2.annotations.Contract; -import java.util.Timer; - @Contract public interface ContainerUtil { diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/GlassFishOutputStreamHandler.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/GlassFishOutputStreamHandler.java index 79d6300e765..ff749e6db78 100644 --- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/GlassFishOutputStreamHandler.java +++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/GlassFishOutputStreamHandler.java @@ -17,6 +17,7 @@ package com.sun.enterprise.container.common.spi.util; import java.io.IOException; + import org.jvnet.hk2.annotations.Contract; /** diff --git a/appserver/common/glassfish-ee-api/src/main/java/com/sun/appserv/ProxyHandler.java b/appserver/common/glassfish-ee-api/src/main/java/com/sun/appserv/ProxyHandler.java index 77a12d59eaa..7b73b14df4a 100644 --- a/appserver/common/glassfish-ee-api/src/main/java/com/sun/appserv/ProxyHandler.java +++ b/appserver/common/glassfish-ee-api/src/main/java/com/sun/appserv/ProxyHandler.java @@ -17,10 +17,11 @@ package com.sun.appserv; -import java.security.cert.X509Certificate; -import java.security.cert.CertificateException; import jakarta.servlet.http.HttpServletRequest; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; + /** * Abstract class allowing a backend appserver instance to retrieve information about the original client request that * was intercepted by an SSL terminating proxy server (e.g., load balancer). diff --git a/appserver/common/glassfish-ee-api/src/main/java/com/sun/appserv/security/AuditModule.java b/appserver/common/glassfish-ee-api/src/main/java/com/sun/appserv/security/AuditModule.java index dc142b0d243..7825d1a904e 100644 --- a/appserver/common/glassfish-ee-api/src/main/java/com/sun/appserv/security/AuditModule.java +++ b/appserver/common/glassfish-ee-api/src/main/java/com/sun/appserv/security/AuditModule.java @@ -24,6 +24,7 @@ package com.sun.appserv.security; import com.sun.enterprise.security.BaseAuditModule; + import jakarta.servlet.http.HttpServletRequest; /** diff --git a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/GlassFishNamingBuilder.java b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/GlassFishNamingBuilder.java index 517d518dc84..22665c775cc 100644 --- a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/GlassFishNamingBuilder.java +++ b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/GlassFishNamingBuilder.java @@ -16,10 +16,9 @@ package com.sun.enterprise.naming; -import static com.sun.enterprise.naming.util.LogFacade.logger; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.INFO; -import static java.util.logging.Level.WARNING; +import com.sun.enterprise.naming.impl.SerialInitContextFactory; + +import jakarta.inject.Inject; import java.lang.reflect.Field; import java.security.AccessController; @@ -43,9 +42,10 @@ import org.glassfish.logging.annotation.LogMessageInfo; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.naming.impl.SerialInitContextFactory; - -import jakarta.inject.Inject; +import static com.sun.enterprise.naming.util.LogFacade.logger; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.INFO; +import static java.util.logging.Level.WARNING; /** * This is both a init run level service as well as our implementation of {@link InitialContextFactoryBuilder}. When GlassFish diff --git a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/SerialInitContextFactory.java b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/SerialInitContextFactory.java index 3bbeaaa6e14..8c869580212 100644 --- a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/SerialInitContextFactory.java +++ b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/SerialInitContextFactory.java @@ -17,10 +17,11 @@ package com.sun.enterprise.naming; +import java.util.Hashtable; + import javax.naming.Context; import javax.naming.NamingException; import javax.naming.spi.InitialContextFactory; -import java.util.Hashtable; /** diff --git a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/ClientNamingConfiguratorImpl.java b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/ClientNamingConfiguratorImpl.java index 2b38a28c281..5a695c26b49 100644 --- a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/ClientNamingConfiguratorImpl.java +++ b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/ClientNamingConfiguratorImpl.java @@ -16,12 +16,12 @@ package com.sun.enterprise.naming.impl; -import org.jvnet.hk2.annotations.Service; import jakarta.inject.Inject; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.hk2.api.PostConstruct; import org.glassfish.api.naming.ClientNamingConfigurator; +import org.glassfish.hk2.api.PostConstruct; +import org.glassfish.hk2.api.ServiceLocator; +import org.jvnet.hk2.annotations.Service; diff --git a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/LocalSerialContextProviderImpl.java b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/LocalSerialContextProviderImpl.java index 94514cf7c57..f424365c57e 100644 --- a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/LocalSerialContextProviderImpl.java +++ b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/LocalSerialContextProviderImpl.java @@ -17,16 +17,18 @@ package com.sun.enterprise.naming.impl; import com.sun.enterprise.naming.util.NamingUtilsImpl; -import org.glassfish.logging.annotation.LogMessageInfo; -import org.omg.CORBA.ORB; -import javax.naming.CompositeName; -import javax.naming.NamingException; -import javax.naming.Reference; import java.rmi.RemoteException; import java.util.Hashtable; import java.util.logging.Level; +import javax.naming.CompositeName; +import javax.naming.NamingException; +import javax.naming.Reference; + +import org.glassfish.logging.annotation.LogMessageInfo; +import org.omg.CORBA.ORB; + import static com.sun.enterprise.naming.util.LogFacade.logger; /** diff --git a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/ProviderManager.java b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/ProviderManager.java index 678fcb574a0..b011d5049dc 100644 --- a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/ProviderManager.java +++ b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/ProviderManager.java @@ -17,11 +17,11 @@ package com.sun.enterprise.naming.impl; -import org.omg.CORBA.ORB; - import java.rmi.Remote; import java.rmi.RemoteException; +import org.omg.CORBA.ORB; + /** * This class is a facade for the remote and local SerialContextProvider The diff --git a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/RemoteSerialContextProviderImpl.java b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/RemoteSerialContextProviderImpl.java index 1b3903117bf..92aeca64d91 100644 --- a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/RemoteSerialContextProviderImpl.java +++ b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/RemoteSerialContextProviderImpl.java @@ -19,13 +19,19 @@ import com.sun.enterprise.util.Utility; + import java.rmi.Remote; import java.rmi.RemoteException; import java.util.Hashtable; import java.util.Iterator; import java.util.Map; import java.util.Set; -import javax.naming.*; + +import javax.naming.CompositeName; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.naming.Reference; + import org.glassfish.api.naming.NamingObjectProxy; import org.omg.CORBA.ORB; diff --git a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/SerialContextProviderImpl.java b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/SerialContextProviderImpl.java index 36b1763e8b5..216a6ed469f 100644 --- a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/SerialContextProviderImpl.java +++ b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/SerialContextProviderImpl.java @@ -17,11 +17,12 @@ package com.sun.enterprise.naming.impl; -import javax.naming.Context; -import javax.naming.NamingException; import java.rmi.RemoteException; import java.util.Hashtable; +import javax.naming.Context; +import javax.naming.NamingException; + public class SerialContextProviderImpl implements SerialContextProvider { private final TransientContext rootContext; diff --git a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/SerialNameParser.java b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/SerialNameParser.java index 6bc573274b7..a0338c25b96 100644 --- a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/SerialNameParser.java +++ b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/SerialNameParser.java @@ -16,11 +16,12 @@ package com.sun.enterprise.naming.impl; -import javax.naming.NameParser; -import javax.naming.Name; +import java.util.Properties; + import javax.naming.CompoundName; +import javax.naming.Name; +import javax.naming.NameParser; import javax.naming.NamingException; -import java.util.Properties; public class SerialNameParser implements NameParser { diff --git a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/WrappedSerialContext.java b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/WrappedSerialContext.java index 654087ef42d..fca1ee202b8 100644 --- a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/WrappedSerialContext.java +++ b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/WrappedSerialContext.java @@ -16,12 +16,13 @@ package com.sun.enterprise.naming.impl; +import java.util.Hashtable; + import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.Name; import javax.naming.NamingException; import javax.naming.spi.NamingManager; -import java.util.Hashtable; /** * This is a Wrapper for {@link SerialContext}. diff --git a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/util/IIOPObjectFactory.java b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/util/IIOPObjectFactory.java index a0735e05e9d..dd55d8dfecb 100644 --- a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/util/IIOPObjectFactory.java +++ b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/util/IIOPObjectFactory.java @@ -16,11 +16,16 @@ package com.sun.enterprise.naming.util; -import javax.naming.*; -import javax.naming.spi.ObjectFactory; import java.util.Hashtable; import java.util.logging.Level; +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.Name; +import javax.naming.RefAddr; +import javax.naming.Reference; +import javax.naming.spi.ObjectFactory; + import static com.sun.enterprise.naming.util.LogFacade.logger; /** diff --git a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/util/LogFacade.java b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/util/LogFacade.java index 2246c9045c3..77076c45221 100644 --- a/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/util/LogFacade.java +++ b/appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/util/LogFacade.java @@ -16,11 +16,11 @@ package com.sun.enterprise.naming.util; -import org.glassfish.logging.annotation.LoggerInfo; -import org.glassfish.logging.annotation.LogMessagesResourceBundle; - import java.util.logging.Logger; +import org.glassfish.logging.annotation.LogMessagesResourceBundle; +import org.glassfish.logging.annotation.LoggerInfo; + public class LogFacade { @LoggerInfo(subsystem = "glassfish-naming", description = "logger for GlassFish appserver naming", publish = true) public static final String NAMING_LOGGER_NAME = "org.glassfish.naming"; diff --git a/appserver/common/glassfish-naming/src/test/java/com/sun/enterprise/naming/impl/GlassfishNamingManagerImplTest.java b/appserver/common/glassfish-naming/src/test/java/com/sun/enterprise/naming/impl/GlassfishNamingManagerImplTest.java index fe26ef1fff3..ae8fb2f5c7a 100644 --- a/appserver/common/glassfish-naming/src/test/java/com/sun/enterprise/naming/impl/GlassfishNamingManagerImplTest.java +++ b/appserver/common/glassfish-naming/src/test/java/com/sun/enterprise/naming/impl/GlassfishNamingManagerImplTest.java @@ -23,9 +23,11 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; + import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; + import org.easymock.EasyMock; import org.glassfish.api.invocation.ComponentInvocation; import org.glassfish.api.invocation.InvocationManager; diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/registry/MonitoringRegistry.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/registry/MonitoringRegistry.java index 56412d8ec07..d242f3fee00 100644 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/registry/MonitoringRegistry.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/registry/MonitoringRegistry.java @@ -16,8 +16,23 @@ package com.sun.enterprise.admin.monitor.registry; -import org.glassfish.j2ee.statistics.*; -import com.sun.enterprise.admin.monitor.stats.*; +import com.sun.enterprise.admin.monitor.stats.EJBCacheStats; +import com.sun.enterprise.admin.monitor.stats.EJBMethodStats; +import com.sun.enterprise.admin.monitor.stats.EJBPoolStats; +import com.sun.enterprise.admin.monitor.stats.GFJTAStats; +import com.sun.enterprise.admin.monitor.stats.HTTPListenerStats; +import com.sun.enterprise.admin.monitor.stats.OrbConnectionManagerStats; +import com.sun.enterprise.admin.monitor.stats.StatefulSessionStoreStats; +import com.sun.enterprise.admin.monitor.stats.ThreadPoolStats; +import com.sun.enterprise.admin.monitor.stats.TimerServiceStats; +import com.sun.enterprise.admin.monitor.stats.WebModuleStats; + +import org.glassfish.j2ee.statistics.EntityBeanStats; +import org.glassfish.j2ee.statistics.JVMStats; +import org.glassfish.j2ee.statistics.MessageDrivenBeanStats; +import org.glassfish.j2ee.statistics.StatefulSessionBeanStats; +import org.glassfish.j2ee.statistics.StatelessSessionBeanStats; +import org.glassfish.j2ee.statistics.Stats; /** * Provides component specific methods to enable components to register their diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/registry/StatsHolder.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/registry/StatsHolder.java index 08140e23d0e..37a5e02ab38 100644 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/registry/StatsHolder.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/registry/StatsHolder.java @@ -16,10 +16,12 @@ package com.sun.enterprise.admin.monitor.registry; -import org.glassfish.j2ee.statistics.Stats; -import javax.management.ObjectName; import java.util.Collection; +import javax.management.ObjectName; + +import org.glassfish.j2ee.statistics.Stats; + /** * Provides the ability to associate various j2ee components diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/BoundedRangeStatisticImpl.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/BoundedRangeStatisticImpl.java index 4e3d2a37b81..4ec8584aa86 100755 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/BoundedRangeStatisticImpl.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/BoundedRangeStatisticImpl.java @@ -15,9 +15,10 @@ */ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.BoundedRangeStatistic; import com.sun.enterprise.util.i18n.StringManager; +import org.glassfish.j2ee.statistics.BoundedRangeStatistic; + /** * An implementation of a BoundedRangeStatistic. All instances of this class are * immutable. Provides all the necessary accessors for properties. diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/ConnectionPoolStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/ConnectionPoolStats.java index 7452bdecd07..cfc8e721919 100644 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/ConnectionPoolStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/ConnectionPoolStats.java @@ -15,9 +15,9 @@ */ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.Stats; -import org.glassfish.j2ee.statistics.RangeStatistic; import org.glassfish.j2ee.statistics.CountStatistic; +import org.glassfish.j2ee.statistics.RangeStatistic; +import org.glassfish.j2ee.statistics.Stats; /** * A Stats interface to represent the statistical data exposed by a Connection diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/ConnectorWorkMgmtStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/ConnectorWorkMgmtStats.java index 9ef58791326..75be296943b 100644 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/ConnectorWorkMgmtStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/ConnectorWorkMgmtStats.java @@ -16,8 +16,8 @@ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.RangeStatistic; import org.glassfish.j2ee.statistics.CountStatistic; +import org.glassfish.j2ee.statistics.RangeStatistic; import org.glassfish.j2ee.statistics.Stats; /** diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/CountStatisticImpl.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/CountStatisticImpl.java index f6dcac5877e..acd0082f9a3 100755 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/CountStatisticImpl.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/CountStatisticImpl.java @@ -15,9 +15,10 @@ */ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.CountStatistic; import com.sun.enterprise.util.i18n.StringManager; +import org.glassfish.j2ee.statistics.CountStatistic; + /** An implementation of a CountStatistic. All instances of this class are * immutable. Provides all the necessary accessors for properties. * @author Muralidhar Vempaty diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/EJBCacheStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/EJBCacheStats.java index 5178b57038a..59e306564c6 100755 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/EJBCacheStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/EJBCacheStats.java @@ -15,9 +15,9 @@ */ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.Stats; -import org.glassfish.j2ee.statistics.CountStatistic; import org.glassfish.j2ee.statistics.BoundedRangeStatistic; +import org.glassfish.j2ee.statistics.CountStatistic; +import org.glassfish.j2ee.statistics.Stats; /** * A Stats interface to represent the statistics exposed by the Enterprise Bean Cache. diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/EJBMethodStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/EJBMethodStats.java index 0bb48f2d771..7ace5c7964f 100755 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/EJBMethodStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/EJBMethodStats.java @@ -15,8 +15,8 @@ */ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.Stats; import org.glassfish.j2ee.statistics.CountStatistic; +import org.glassfish.j2ee.statistics.Stats; import org.glassfish.j2ee.statistics.TimeStatistic; /** diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/EJBPoolStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/EJBPoolStats.java index fbf241c8355..757cff6b64e 100755 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/EJBPoolStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/EJBPoolStats.java @@ -15,9 +15,9 @@ */ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.Stats; -import org.glassfish.j2ee.statistics.CountStatistic; import org.glassfish.j2ee.statistics.BoundedRangeStatistic; +import org.glassfish.j2ee.statistics.CountStatistic; +import org.glassfish.j2ee.statistics.Stats; /** * A Stats interface to represent the statistical data exposed by an EJB Bean Pool. diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/GFJTAStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/GFJTAStats.java index 8de6063a614..5a0b7c2638f 100644 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/GFJTAStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/GFJTAStats.java @@ -18,6 +18,7 @@ import java.util.List; import java.util.Map; + import org.glassfish.j2ee.statistics.JTAStats; /** Defines additional Sun ONE Application Server specific statistic to transaction service. diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/GenericStatsImpl.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/GenericStatsImpl.java index cc607c12d2b..4b682cd8157 100644 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/GenericStatsImpl.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/GenericStatsImpl.java @@ -17,12 +17,13 @@ package com.sun.enterprise.admin.monitor.stats; import java.lang.reflect.Method; -import java.util.Iterator; -import java.util.Map; import java.util.ArrayList; import java.util.HashMap; -import org.glassfish.j2ee.statistics.Stats; +import java.util.Iterator; +import java.util.Map; + import org.glassfish.j2ee.statistics.Statistic; +import org.glassfish.j2ee.statistics.Stats; /** * Provides for generic implementation of any Stats interface. This class facilitates diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/HTTPListenerStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/HTTPListenerStats.java index 883b78bda09..ad364e89d54 100755 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/HTTPListenerStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/HTTPListenerStats.java @@ -15,8 +15,8 @@ */ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.Stats; import org.glassfish.j2ee.statistics.CountStatistic; +import org.glassfish.j2ee.statistics.Stats; /** * A Stats interface to represent the statistical data exposed by an diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMClassLoadingStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMClassLoadingStats.java index 4e0029ff840..c350a7f97bb 100755 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMClassLoadingStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMClassLoadingStats.java @@ -15,8 +15,8 @@ */ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.Stats; import org.glassfish.j2ee.statistics.CountStatistic; +import org.glassfish.j2ee.statistics.Stats; /** * A Stats interface, to expose the monitoring information diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMCompilationStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMCompilationStats.java index 49d34abc9e3..b4589fc9e06 100755 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMCompilationStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMCompilationStats.java @@ -15,8 +15,8 @@ */ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.Stats; import org.glassfish.j2ee.statistics.CountStatistic; +import org.glassfish.j2ee.statistics.Stats; /** * A Stats interface, to expose the monitoring information diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMGarbageCollectorStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMGarbageCollectorStats.java index 59155e98e9a..ff962b91f81 100755 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMGarbageCollectorStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMGarbageCollectorStats.java @@ -15,8 +15,8 @@ */ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.Stats; import org.glassfish.j2ee.statistics.CountStatistic; +import org.glassfish.j2ee.statistics.Stats; /** * A Stats interface, to expose the monitoring information diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMMemoryStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMMemoryStats.java index c5fe7cfacdf..6a864d322c6 100644 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMMemoryStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMMemoryStats.java @@ -15,8 +15,8 @@ */ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.Stats; import org.glassfish.j2ee.statistics.CountStatistic; +import org.glassfish.j2ee.statistics.Stats; /** * A Stats interface, to expose the monitoring information diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMOperatingSystemStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMOperatingSystemStats.java index 008ac4a8b0c..346bd57fca2 100755 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMOperatingSystemStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMOperatingSystemStats.java @@ -15,8 +15,8 @@ */ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.Stats; import org.glassfish.j2ee.statistics.CountStatistic; +import org.glassfish.j2ee.statistics.Stats; /** * A Stats interface, to expose information diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMRuntimeStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMRuntimeStats.java index 4a2d7ccaf3b..22f61ad87d4 100755 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMRuntimeStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMRuntimeStats.java @@ -15,8 +15,8 @@ */ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.Stats; import org.glassfish.j2ee.statistics.CountStatistic; +import org.glassfish.j2ee.statistics.Stats; /** * A Stats interface to expose information about the JVM Runtime diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMThreadInfoStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMThreadInfoStats.java index e967badf1c0..e476960e54d 100644 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMThreadInfoStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMThreadInfoStats.java @@ -15,8 +15,8 @@ */ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.Stats; import org.glassfish.j2ee.statistics.CountStatistic; +import org.glassfish.j2ee.statistics.Stats; /** * A Stats interface, to expose the monitoring information diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMThreadStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMThreadStats.java index f5c2ec49266..3c77299f12d 100644 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMThreadStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/JVMThreadStats.java @@ -15,8 +15,8 @@ */ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.Stats; import org.glassfish.j2ee.statistics.CountStatistic; +import org.glassfish.j2ee.statistics.Stats; /** * A Stats interface, to expose the monitoring information diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/MutableAverageRangeStatisticImpl.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/MutableAverageRangeStatisticImpl.java index 516252964e0..3a3213d9209 100755 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/MutableAverageRangeStatisticImpl.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/MutableAverageRangeStatisticImpl.java @@ -16,8 +16,8 @@ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.Statistic; import org.glassfish.j2ee.statistics.BoundedRangeStatistic; +import org.glassfish.j2ee.statistics.Statistic; /** * An implementation of AverageRangeStatistic that provides ways to change the state externally diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/MutableStatistic.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/MutableStatistic.java index 61432ee5bbe..a35498aef92 100644 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/MutableStatistic.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/MutableStatistic.java @@ -15,9 +15,10 @@ */ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.Statistic; import java.io.Serializable; +import org.glassfish.j2ee.statistics.Statistic; + /** * An interface that gives a flexibility to set various values for a particular Statistic. * This provision is basically to have the same data structure to collect and diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/MutableTimeStatisticImpl.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/MutableTimeStatisticImpl.java index 7198daaaee3..2b0a8fcc157 100644 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/MutableTimeStatisticImpl.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/MutableTimeStatisticImpl.java @@ -15,8 +15,8 @@ */ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.TimeStatistic; import org.glassfish.j2ee.statistics.Statistic; +import org.glassfish.j2ee.statistics.TimeStatistic; /** diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/OrbConnectionManagerStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/OrbConnectionManagerStats.java index 53f5bb26bb7..64a9b5b1c0f 100755 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/OrbConnectionManagerStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/OrbConnectionManagerStats.java @@ -15,9 +15,9 @@ */ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.Stats; -import org.glassfish.j2ee.statistics.CountStatistic; import org.glassfish.j2ee.statistics.BoundedRangeStatistic; +import org.glassfish.j2ee.statistics.CountStatistic; +import org.glassfish.j2ee.statistics.Stats; /** * Stats interface for the monitorable attributes of the diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCDnsStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCDnsStats.java index a0e78356b53..ecf0d700119 100644 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCDnsStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCDnsStats.java @@ -16,12 +16,12 @@ package com.sun.enterprise.admin.monitor.stats; +import org.glassfish.j2ee.statistics.CountStatistic; /** * * @author nsegura */ import org.glassfish.j2ee.statistics.Stats; -import org.glassfish.j2ee.statistics.CountStatistic; /** * The DNS Cache caches IP addresses and DNS names. The server’s DNS cache is diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCFileCacheStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCFileCacheStats.java index ab2ecdb6dde..8fb70d79b96 100644 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCFileCacheStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCFileCacheStats.java @@ -16,8 +16,8 @@ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.Stats; import org.glassfish.j2ee.statistics.CountStatistic; +import org.glassfish.j2ee.statistics.Stats; /** * Provides statistical information on the httpservice file cache diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCKeepAliveStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCKeepAliveStats.java index f0452901731..05fecf90446 100644 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCKeepAliveStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCKeepAliveStats.java @@ -16,13 +16,14 @@ package com.sun.enterprise.admin.monitor.stats; +import org.glassfish.j2ee.statistics.CountStatistic; + /** * * @author nsegura */ import org.glassfish.j2ee.statistics.Stats; -import org.glassfish.j2ee.statistics.CountStatistic; /** * Provides statistical information about the HttpService HTTP-level keep-alive diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCRequestStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCRequestStats.java index ffa4672ca5c..f51b9161da4 100644 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCRequestStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCRequestStats.java @@ -16,8 +16,8 @@ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.Stats; import org.glassfish.j2ee.statistics.CountStatistic; +import org.glassfish.j2ee.statistics.Stats; /** * Interface representing statistical information about the request bucket diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCThreadPoolStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCThreadPoolStats.java index 4a9de7dce4e..e9265a07f6e 100644 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCThreadPoolStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCThreadPoolStats.java @@ -16,12 +16,12 @@ package com.sun.enterprise.admin.monitor.stats; +import org.glassfish.j2ee.statistics.CountStatistic; /** * * @author nsegura */ import org.glassfish.j2ee.statistics.Stats; -import org.glassfish.j2ee.statistics.CountStatistic; /** * Returns the statistical information associated with diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/ServletStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/ServletStats.java index 3c9f33b7388..67e98cc8b61 100755 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/ServletStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/ServletStats.java @@ -15,8 +15,8 @@ */ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.Stats; import org.glassfish.j2ee.statistics.CountStatistic; +import org.glassfish.j2ee.statistics.Stats; import org.glassfish.j2ee.statistics.TimeStatistic; /** diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/StatefulSessionStoreStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/StatefulSessionStoreStats.java index 3a2c94c98bd..6b3da2cc6e3 100644 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/StatefulSessionStoreStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/StatefulSessionStoreStats.java @@ -15,9 +15,9 @@ */ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.Stats; -import org.glassfish.j2ee.statistics.RangeStatistic; import org.glassfish.j2ee.statistics.CountStatistic; +import org.glassfish.j2ee.statistics.RangeStatistic; +import org.glassfish.j2ee.statistics.Stats; /** * diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/StatisticImpl.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/StatisticImpl.java index c2b0129f45a..a443daeb9be 100755 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/StatisticImpl.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/StatisticImpl.java @@ -15,10 +15,12 @@ */ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.Statistic; -import java.io.Serializable; import com.sun.enterprise.util.i18n.StringManager; +import java.io.Serializable; + +import org.glassfish.j2ee.statistics.Statistic; + /** * An abstract class providing implementation of the Statistic interface * The intent is for this to be subclassed by all the StatisticImpls. diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/ThreadPoolStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/ThreadPoolStats.java index f61f2bfd1dd..6bc1b00f396 100755 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/ThreadPoolStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/ThreadPoolStats.java @@ -15,10 +15,10 @@ */ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.Stats; -import org.glassfish.j2ee.statistics.CountStatistic; import org.glassfish.j2ee.statistics.BoundedRangeStatistic; +import org.glassfish.j2ee.statistics.CountStatistic; import org.glassfish.j2ee.statistics.RangeStatistic; +import org.glassfish.j2ee.statistics.Stats; /** * Stats interface for the monitorable attributes of the diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/TimeStatisticImpl.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/TimeStatisticImpl.java index 0a827019b35..eef33a1fcf2 100755 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/TimeStatisticImpl.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/TimeStatisticImpl.java @@ -15,9 +15,10 @@ */ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.TimeStatistic; import com.sun.enterprise.util.i18n.StringManager; +import org.glassfish.j2ee.statistics.TimeStatistic; + /** * An implementation of a TimeStatistic. All instances of this class are * immutable. Provides all the necessary accessors for properties. diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/TimerServiceStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/TimerServiceStats.java index dbf4373120e..9a940c7f748 100644 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/TimerServiceStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/TimerServiceStats.java @@ -15,8 +15,8 @@ */ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.Stats; import org.glassfish.j2ee.statistics.CountStatistic; +import org.glassfish.j2ee.statistics.Stats; /** * A Stats interface to represent the statistical data exposed by the diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/WebModuleStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/WebModuleStats.java index bc3db7e9d66..e49f8026456 100755 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/WebModuleStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/WebModuleStats.java @@ -16,8 +16,8 @@ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.Stats; import org.glassfish.j2ee.statistics.CountStatistic; +import org.glassfish.j2ee.statistics.Stats; /** * Interface for querying web module statistics. diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/annotation/ChildGetter.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/annotation/ChildGetter.java index 9b303d064d6..7118b711b40 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/annotation/ChildGetter.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/annotation/ChildGetter.java @@ -17,14 +17,14 @@ package org.glassfish.admin.amx.annotation; import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.METHOD; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; - -import org.glassfish.external.arc.Taxonomy; import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; /** diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/annotation/Description.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/annotation/Description.java index 1933107b005..2dd60290e76 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/annotation/Description.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/annotation/Description.java @@ -20,9 +20,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; - -import org.glassfish.external.arc.Taxonomy; import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; /** @author Lloyd Chambers diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/annotation/ManagedAttribute.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/annotation/ManagedAttribute.java index ed4fc59be4b..d7613d16b3e 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/annotation/ManagedAttribute.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/annotation/ManagedAttribute.java @@ -17,13 +17,14 @@ package org.glassfish.admin.amx.annotation; import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.METHOD; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; -import org.glassfish.external.arc.Taxonomy; import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; /** Annotation used to generate MBeanInfo using a Java interface. diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/annotation/ManagedOperation.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/annotation/ManagedOperation.java index eb998e07d1c..fc9447fd9c0 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/annotation/ManagedOperation.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/annotation/ManagedOperation.java @@ -18,13 +18,15 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; + import javax.management.MBeanOperationInfo; -import static java.lang.annotation.ElementType.METHOD; -import org.glassfish.external.arc.Taxonomy; import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; /** Annotation used to generate MBeanInfo using a Java interface. diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/annotation/Param.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/annotation/Param.java index 7bd031ecc7c..ea06aaea5d9 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/annotation/Param.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/annotation/Param.java @@ -20,10 +20,13 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.*; -import org.glassfish.external.arc.Taxonomy; import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.LOCAL_VARIABLE; +import static java.lang.annotation.ElementType.PARAMETER; /** * Annotates the paramete rof a method. diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/annotation/package-info.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/annotation/package-info.java index 967aa61c42e..4ae669d5149 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/annotation/package-info.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/annotation/package-info.java @@ -17,8 +17,8 @@ @Taxonomy(stability = Stability.UNCOMMITTED) package org.glassfish.admin.amx.annotation; -import org.glassfish.external.arc.Taxonomy; import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/BulkAccess.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/BulkAccess.java index 03f555770fb..5191a66c4c3 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/BulkAccess.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/BulkAccess.java @@ -20,12 +20,11 @@ import javax.management.ObjectName; import org.glassfish.admin.amx.annotation.ManagedOperation; -import org.glassfish.external.arc.Stability; -import org.glassfish.external.arc.Taxonomy; +import org.glassfish.admin.amx.core.AMXMBeanMetadata; import org.glassfish.admin.amx.core.AMXProxy; import org.glassfish.admin.amx.core.Util; - -import org.glassfish.admin.amx.core.AMXMBeanMetadata; +import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; /** Bulk access to various JMX constructs. The term "bulk" refers to the fact the multiple diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/DomainRoot.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/DomainRoot.java index 0dd0f91f672..4c7635650d5 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/DomainRoot.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/DomainRoot.java @@ -22,21 +22,19 @@ import javax.management.MBeanOperationInfo; import javax.management.ObjectName; -import org.glassfish.admin.amx.monitoring.MonitoringRoot; -import org.glassfish.admin.amx.annotation.*; - -import org.glassfish.admin.amx.core.AMXProxy; -import org.glassfish.admin.amx.core.Util; +import org.glassfish.admin.amx.annotation.Description; +import org.glassfish.admin.amx.annotation.ManagedAttribute; +import org.glassfish.admin.amx.annotation.ManagedOperation; import org.glassfish.admin.amx.config.AMXConfigProxy; - -import org.glassfish.admin.amx.core.PathnameConstants; import org.glassfish.admin.amx.core.AMXMBeanMetadata; +import org.glassfish.admin.amx.core.AMXProxy; +import org.glassfish.admin.amx.core.PathnameConstants; +import org.glassfish.admin.amx.core.Util; import org.glassfish.admin.amx.logging.Logging; - - +import org.glassfish.admin.amx.monitoring.MonitoringRoot; import org.glassfish.external.amx.AMX; -import org.glassfish.external.arc.Taxonomy; import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; /** diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Ext.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Ext.java index efff7437ddc..6f994c79b44 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Ext.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Ext.java @@ -16,10 +16,9 @@ package org.glassfish.admin.amx.base; -import org.glassfish.admin.amx.annotation.*; - -import org.glassfish.admin.amx.core.AMXProxy; +import org.glassfish.admin.amx.annotation.ManagedAttribute; import org.glassfish.admin.amx.core.AMXMBeanMetadata; +import org.glassfish.admin.amx.core.AMXProxy; import org.glassfish.external.arc.Stability; import org.glassfish.external.arc.Taxonomy; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/MBeanTracker.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/MBeanTracker.java index 2a886d117d7..e801b71a60f 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/MBeanTracker.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/MBeanTracker.java @@ -22,7 +22,14 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import javax.management.*; + +import javax.management.MBeanRegistration; +import javax.management.MBeanServer; +import javax.management.MBeanServerNotification; +import javax.management.Notification; +import javax.management.NotificationListener; +import javax.management.ObjectName; + import org.glassfish.admin.amx.core.AMXMBeanMetadata; import org.glassfish.admin.amx.core.Util; import org.glassfish.admin.amx.util.jmx.JMXUtil; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/MBeanTrackerMBean.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/MBeanTrackerMBean.java index 541e4044a53..dea9cfe6a76 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/MBeanTrackerMBean.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/MBeanTrackerMBean.java @@ -15,15 +15,15 @@ */ package org.glassfish.admin.amx.base; +import java.util.Set; + import javax.management.ObjectName; -import java.util.Set; -import org.glassfish.admin.amx.annotation.ManagedOperation; import org.glassfish.admin.amx.annotation.ManagedAttribute; +import org.glassfish.admin.amx.annotation.ManagedOperation; import org.glassfish.admin.amx.core.AMXMBeanMetadata; -import org.glassfish.external.amx.AMXGlassfish; - import org.glassfish.admin.amx.util.jmx.JMXUtil; +import org.glassfish.external.amx.AMXGlassfish; /** MBean providing server-side support for AMX eg for efficiency or other diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Pathnames.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Pathnames.java index c301fac7347..296c6dadadd 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Pathnames.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Pathnames.java @@ -19,14 +19,15 @@ import javax.management.MBeanOperationInfo; import javax.management.ObjectName; + import org.glassfish.admin.amx.annotation.ManagedAttribute; import org.glassfish.admin.amx.annotation.ManagedOperation; -import org.glassfish.external.arc.Stability; -import org.glassfish.external.arc.Taxonomy; +import org.glassfish.admin.amx.core.AMXMBeanMetadata; import org.glassfish.admin.amx.core.AMXProxy; import org.glassfish.admin.amx.core.PathnameConstants; import org.glassfish.admin.amx.core.PathnameParser; -import org.glassfish.admin.amx.core.AMXMBeanMetadata; +import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; /** The Pathnames MBean--utilities for working with pathnames and MBeans. diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Query.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Query.java index 6c962813738..dcbdce94da6 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Query.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Query.java @@ -16,21 +16,20 @@ package org.glassfish.admin.amx.base; -import javax.management.ObjectName; -import javax.management.MBeanOperationInfo; import java.util.Set; +import javax.management.MBeanOperationInfo; +import javax.management.ObjectName; +import org.glassfish.admin.amx.annotation.Description; import org.glassfish.admin.amx.annotation.ManagedAttribute; import org.glassfish.admin.amx.annotation.ManagedOperation; -import org.glassfish.admin.amx.annotation.Description; import org.glassfish.admin.amx.annotation.Param; -import org.glassfish.external.arc.Taxonomy; -import org.glassfish.external.arc.Stability; - +import org.glassfish.admin.amx.core.AMXMBeanMetadata; import org.glassfish.admin.amx.core.AMXProxy; import org.glassfish.admin.amx.core.Util; -import org.glassfish.admin.amx.core.AMXMBeanMetadata; +import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; /** Supports various types of queries to find MBeans in the AMX domain only; does not diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Realms.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Realms.java index 578ab244d96..959d4d8efa4 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Realms.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Realms.java @@ -19,9 +19,11 @@ import java.util.Map; import javax.management.MBeanOperationInfo; -import org.glassfish.admin.amx.core.AMXProxy; -import org.glassfish.admin.amx.annotation.*; + +import org.glassfish.admin.amx.annotation.ManagedAttribute; +import org.glassfish.admin.amx.annotation.ManagedOperation; import org.glassfish.admin.amx.core.AMXMBeanMetadata; +import org.glassfish.admin.amx.core.AMXProxy; import org.glassfish.external.arc.Stability; import org.glassfish.external.arc.Taxonomy; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/RuntimeRoot.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/RuntimeRoot.java index 659cdfd8ae0..c9b741073c9 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/RuntimeRoot.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/RuntimeRoot.java @@ -16,13 +16,17 @@ package org.glassfish.admin.amx.base; -import org.glassfish.admin.amx.core.AMXProxy; - -import java.util.Map; import java.util.List; +import java.util.Map; + import javax.management.MBeanOperationInfo; -import org.glassfish.admin.amx.annotation.*; + +import org.glassfish.admin.amx.annotation.Description; +import org.glassfish.admin.amx.annotation.ManagedAttribute; +import org.glassfish.admin.amx.annotation.ManagedOperation; +import org.glassfish.admin.amx.annotation.Param; import org.glassfish.admin.amx.core.AMXMBeanMetadata; +import org.glassfish.admin.amx.core.AMXProxy; import org.glassfish.external.arc.Stability; import org.glassfish.external.arc.Taxonomy; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Sample.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Sample.java index c30985062b5..1948b2287cd 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Sample.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Sample.java @@ -19,12 +19,12 @@ import javax.management.MBeanOperationInfo; import javax.management.ObjectName; -import org.glassfish.admin.amx.annotation.ManagedOperation; import org.glassfish.admin.amx.annotation.ManagedAttribute; +import org.glassfish.admin.amx.annotation.ManagedOperation; +import org.glassfish.admin.amx.core.AMXMBeanMetadata; +import org.glassfish.admin.amx.core.AMXProxy; import org.glassfish.external.arc.Stability; import org.glassfish.external.arc.Taxonomy; -import org.glassfish.admin.amx.core.AMXProxy; -import org.glassfish.admin.amx.core.AMXMBeanMetadata; /** Interface for a sample MBean , used as target for sample and test code. diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Singleton.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Singleton.java index 1b1a6847cf0..b69afd4129a 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Singleton.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Singleton.java @@ -16,9 +16,9 @@ package org.glassfish.admin.amx.base; +import org.glassfish.admin.amx.core.AMXProxy; import org.glassfish.external.arc.Stability; import org.glassfish.external.arc.Taxonomy; -import org.glassfish.admin.amx.core.AMXProxy; /** A marker interface which indicates that this MBean is one-of-a-kind *within its scope*. diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/SystemInfo.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/SystemInfo.java index 060467b5538..0e4cea49ca0 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/SystemInfo.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/SystemInfo.java @@ -19,10 +19,10 @@ import java.util.Map; import org.glassfish.admin.amx.annotation.ManagedAttribute; +import org.glassfish.admin.amx.core.AMXMBeanMetadata; +import org.glassfish.admin.amx.core.AMXProxy; import org.glassfish.external.arc.Stability; import org.glassfish.external.arc.Taxonomy; -import org.glassfish.admin.amx.core.AMXProxy; -import org.glassfish.admin.amx.core.AMXMBeanMetadata; /** Provides information about the capabilities of the running server. diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Tools.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Tools.java index 4eccb248daa..4d747873608 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Tools.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/Tools.java @@ -18,12 +18,13 @@ import javax.management.MBeanOperationInfo; import javax.management.ObjectName; + +import org.glassfish.admin.amx.annotation.Description; import org.glassfish.admin.amx.annotation.ManagedAttribute; import org.glassfish.admin.amx.annotation.ManagedOperation; -import org.glassfish.admin.amx.core.AMXProxy; -import org.glassfish.admin.amx.core.AMXMBeanMetadata; -import org.glassfish.admin.amx.annotation.Description; import org.glassfish.admin.amx.annotation.Param; +import org.glassfish.admin.amx.core.AMXMBeanMetadata; +import org.glassfish.admin.amx.core.AMXProxy; import org.glassfish.external.arc.Stability; import org.glassfish.external.arc.Taxonomy; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/UnprocessedConfigChange.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/UnprocessedConfigChange.java index 69a5cf15572..0018660b161 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/UnprocessedConfigChange.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/UnprocessedConfigChange.java @@ -17,6 +17,7 @@ package org.glassfish.admin.amx.base; import java.beans.PropertyChangeEvent; + import org.glassfish.admin.amx.util.ObjectUtil; import org.glassfish.admin.amx.util.StringUtil; import org.glassfish.external.arc.Stability; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/package-info.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/package-info.java index 364b275bfd8..09ba5a72d09 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/package-info.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/base/package-info.java @@ -17,8 +17,8 @@ @Taxonomy(stability = Stability.UNCOMMITTED) package org.glassfish.admin.amx.base; -import org.glassfish.external.arc.Taxonomy; import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/config/AMXConfigProxy.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/config/AMXConfigProxy.java index 03be00dc2d1..4e38dfe5cbd 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/config/AMXConfigProxy.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/config/AMXConfigProxy.java @@ -16,6 +16,12 @@ package org.glassfish.admin.amx.config; +import java.util.Map; + +import javax.management.AttributeList; +import javax.management.MBeanOperationInfo; +import javax.management.ObjectName; + import org.glassfish.admin.amx.annotation.Description; import org.glassfish.admin.amx.annotation.ManagedOperation; import org.glassfish.admin.amx.annotation.Param; @@ -25,11 +31,6 @@ import org.glassfish.external.arc.Stability; import org.glassfish.external.arc.Taxonomy; -import javax.management.AttributeList; -import javax.management.MBeanOperationInfo; -import javax.management.ObjectName; -import java.util.Map; - /** * @deprecated Extending this proxy interface implies that the class is part of the MBean API for * configuration, diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/config/AttributeResolver.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/config/AttributeResolver.java index 769f405d24c..fbe370b1e08 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/config/AttributeResolver.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/config/AttributeResolver.java @@ -16,15 +16,15 @@ package org.glassfish.admin.amx.config; +import javax.management.AttributeList; +import javax.management.MBeanOperationInfo; + import org.glassfish.admin.amx.annotation.Description; import org.glassfish.admin.amx.annotation.ManagedOperation; import org.glassfish.admin.amx.annotation.Param; import org.glassfish.external.arc.Stability; import org.glassfish.external.arc.Taxonomy; -import javax.management.AttributeList; -import javax.management.MBeanOperationInfo; - /** * @deprecated Interface implemented by MBeans which can resolve a variable to a value. * Variable attributes are strings of the form ${...} and diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/config/package-info.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/config/package-info.java index 81a8098ab53..aecb8a43cb8 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/config/package-info.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/config/package-info.java @@ -21,8 +21,8 @@ @Taxonomy(stability = Stability.UNCOMMITTED) package org.glassfish.admin.amx.config; -import org.glassfish.external.arc.Taxonomy; import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/AMXMBeanMetadata.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/AMXMBeanMetadata.java index 9d7e8510552..73798242a10 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/AMXMBeanMetadata.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/AMXMBeanMetadata.java @@ -17,12 +17,13 @@ package org.glassfish.admin.amx.core; import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + /** * Holds meta information useful in generating and/or supplementing the default * MBeanInfo as well as other runtime fields or optimizations. diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/AMX_SPI.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/AMX_SPI.java index 6d64e0bc304..510f76c2f42 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/AMX_SPI.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/AMX_SPI.java @@ -16,13 +16,13 @@ package org.glassfish.admin.amx.core; +import javax.management.ObjectName; + import org.glassfish.admin.amx.annotation.Description; import org.glassfish.admin.amx.annotation.ManagedAttribute; import org.glassfish.external.arc.Stability; import org.glassfish.external.arc.Taxonomy; -import javax.management.ObjectName; - /** * @deprecated MBean implementations can 'implements AMX_SPI', though it is only behavior * via MBeanInfo and attributes that is actually required. diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/Extra.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/Extra.java index 429e39f14b7..69cdaae2d79 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/Extra.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/Extra.java @@ -16,12 +16,12 @@ package org.glassfish.admin.amx.core; +import javax.management.MBeanServerConnection; + import org.glassfish.admin.amx.core.proxy.ProxyFactory; import org.glassfish.external.arc.Stability; import org.glassfish.external.arc.Taxonomy; -import javax.management.MBeanServerConnection; - /** * @deprecated Extra information available about each {@link AMXProxy}. Most diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/MetaGetters.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/MetaGetters.java index f0a3a997156..e3067bd2f84 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/MetaGetters.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/MetaGetters.java @@ -16,14 +16,14 @@ package org.glassfish.admin.amx.core; -import org.glassfish.external.arc.Stability; -import org.glassfish.external.arc.Taxonomy; - import javax.management.Descriptor; import javax.management.MBeanAttributeInfo; import javax.management.MBeanInfo; import javax.management.MBeanOperationInfo; +import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; + /** * @deprecated Convenience getters for Descriptor values and other metadata from the MBeanInfo. diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/PathnameConstants.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/PathnameConstants.java index af86f75d5e8..099e8f1b5d2 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/PathnameConstants.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/PathnameConstants.java @@ -20,9 +20,9 @@ */ package org.glassfish.admin.amx.core; +import org.glassfish.admin.amx.base.Pathnames; import org.glassfish.external.arc.Stability; import org.glassfish.external.arc.Taxonomy; -import org.glassfish.admin.amx.base.Pathnames; /** * Constants and regex related to pathnames. diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/PathnameParser.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/PathnameParser.java index 3f701845951..f1d18365439 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/PathnameParser.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/PathnameParser.java @@ -21,13 +21,21 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; + import javax.management.ObjectName; + import org.glassfish.admin.amx.base.DomainRoot; -import static org.glassfish.admin.amx.core.PathnameConstants.*; -import static org.glassfish.external.amx.AMX.*; import org.glassfish.external.arc.Stability; import org.glassfish.external.arc.Taxonomy; +import static org.glassfish.admin.amx.core.PathnameConstants.LEGAL_NAME_PATTERN; +import static org.glassfish.admin.amx.core.PathnameConstants.LEGAL_TYPE_PATTERN; +import static org.glassfish.admin.amx.core.PathnameConstants.MATCH_ZERO_OR_MORE; +import static org.glassfish.admin.amx.core.PathnameConstants.SEPARATOR; +import static org.glassfish.admin.amx.core.PathnameConstants.SUBSCRIPT_LEFT; +import static org.glassfish.admin.amx.core.PathnameConstants.SUBSCRIPT_RIGHT; +import static org.glassfish.external.amx.AMX.PARENT_PATH_KEY; + /** * Parses a pathname into parts. *

diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/StdAttributesAccess.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/StdAttributesAccess.java index 338a3307d82..5247a3aadf9 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/StdAttributesAccess.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/StdAttributesAccess.java @@ -16,12 +16,19 @@ package org.glassfish.admin.amx.core; +import java.io.IOException; + +import javax.management.Attribute; +import javax.management.AttributeList; +import javax.management.AttributeNotFoundException; +import javax.management.InstanceNotFoundException; +import javax.management.InvalidAttributeValueException; +import javax.management.MBeanException; +import javax.management.ReflectionException; + import org.glassfish.external.arc.Stability; import org.glassfish.external.arc.Taxonomy; -import javax.management.*; -import java.io.IOException; - /** * @deprecated Direct access to JMX attributes and methods, * These are "straight JMX" with no intervening processing whatsoever. diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/package-info.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/package-info.java index 9cd8c7b4b67..1d899522efd 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/package-info.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/package-info.java @@ -20,5 +20,5 @@ @Taxonomy(stability = Stability.UNCOMMITTED) package org.glassfish.admin.amx.core; -import org.glassfish.external.arc.Taxonomy; import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/proxy/AMXProxyHandler.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/proxy/AMXProxyHandler.java index f48a96b8161..4b2a020fb07 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/proxy/AMXProxyHandler.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/proxy/AMXProxyHandler.java @@ -32,7 +32,21 @@ import java.util.Map; import java.util.Set; -import javax.management.*; +import javax.management.AttributeList; +import javax.management.AttributeNotFoundException; +import javax.management.Descriptor; +import javax.management.InstanceNotFoundException; +import javax.management.JMException; +import javax.management.ListenerNotFoundException; +import javax.management.MBeanAttributeInfo; +import javax.management.MBeanException; +import javax.management.MBeanInfo; +import javax.management.MBeanOperationInfo; +import javax.management.MBeanServerConnection; +import javax.management.NotificationFilter; +import javax.management.NotificationListener; +import javax.management.ObjectName; +import javax.management.ReflectionException; import org.glassfish.admin.amx.annotation.ChildGetter; import org.glassfish.admin.amx.base.DomainRoot; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/proxy/package-info.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/proxy/package-info.java index 13e8d1df64a..cd7f4f60ab9 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/proxy/package-info.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/proxy/package-info.java @@ -17,8 +17,8 @@ @Taxonomy(stability = Stability.UNCOMMITTED) package org.glassfish.admin.amx.core.proxy; -import org.glassfish.external.arc.Taxonomy; import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigLoader.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigLoader.java index 7f968a08629..0055316be2a 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigLoader.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigLoader.java @@ -18,6 +18,7 @@ package org.glassfish.admin.amx.impl.config; import com.sun.enterprise.config.serverbeans.Domain; + import java.beans.PropertyChangeEvent; import java.util.ArrayList; import java.util.List; @@ -27,7 +28,13 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Pattern; -import javax.management.*; + +import javax.management.JMException; +import javax.management.MBeanServer; +import javax.management.Notification; +import javax.management.ObjectInstance; +import javax.management.ObjectName; + import org.glassfish.admin.amx.config.AMXConfigConstants; import org.glassfish.admin.amx.core.Util; import org.glassfish.admin.amx.impl.util.ImplUtil; @@ -43,7 +50,12 @@ import org.glassfish.external.amx.AMXGlassfish; import org.glassfish.external.arc.Stability; import org.glassfish.external.arc.Taxonomy; -import org.jvnet.hk2.config.*; +import org.jvnet.hk2.config.ConfigBean; +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Dom; +import org.jvnet.hk2.config.TransactionListener; +import org.jvnet.hk2.config.Transactions; +import org.jvnet.hk2.config.UnprocessedChangeEvents; /** * Responsible for loading ConfigBeanProxy MBeans (com.sun.enterprise.config.serverbeans.*) diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigStartupService.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigStartupService.java index 99fa1586cef..539784f576c 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigStartupService.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigStartupService.java @@ -18,25 +18,26 @@ package org.glassfish.admin.amx.impl.config; import com.sun.enterprise.config.serverbeans.Domain; + +import jakarta.inject.Inject; + import java.util.logging.Level; +import javax.management.MBeanServer; +import javax.management.ObjectName; + import org.glassfish.admin.amx.base.DomainRoot; import org.glassfish.admin.amx.core.AMXProxy; import org.glassfish.admin.amx.core.proxy.ProxyFactory; -import org.glassfish.admin.amx.util.TimingDelta; -import org.jvnet.hk2.annotations.Service; - -import jakarta.inject.Inject; -import javax.management.MBeanServer; -import javax.management.ObjectName; -import org.glassfish.external.arc.Stability; -import org.glassfish.external.arc.Taxonomy; import org.glassfish.admin.amx.impl.util.ImplUtil; import org.glassfish.admin.amx.impl.util.InjectedValues; import org.glassfish.admin.amx.util.AMXLoggerInfo; - +import org.glassfish.admin.amx.util.TimingDelta; import org.glassfish.admin.mbeanserver.PendingConfigBeans; import org.glassfish.api.amx.AMXLoader; +import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.Transactions; /** diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/ConfigBeanJMXSupport.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/ConfigBeanJMXSupport.java index 376b9a23def..4b6362003fc 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/ConfigBeanJMXSupport.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/ConfigBeanJMXSupport.java @@ -39,11 +39,11 @@ import java.util.Set; import java.util.logging.Level; +import javax.management.AttributeChangeNotification; import javax.management.Descriptor; import javax.management.MBeanAttributeInfo; import javax.management.MBeanInfo; import javax.management.MBeanNotificationInfo; -import javax.management.AttributeChangeNotification; import javax.management.MBeanOperationInfo; import javax.management.MBeanParameterInfo; import javax.management.ObjectName; @@ -53,32 +53,32 @@ import javax.management.openmbean.CompositeType; import javax.management.openmbean.OpenType; -import org.glassfish.external.arc.Stability; -import org.glassfish.external.arc.Taxonomy; -import org.glassfish.admin.amx.core.Util; import org.glassfish.admin.amx.config.AMXConfigProxy; +import org.glassfish.admin.amx.core.Util; import org.glassfish.admin.amx.impl.util.InjectedValues; import org.glassfish.admin.amx.util.AMXLoggerInfo; import org.glassfish.admin.amx.util.ClassUtil; import org.glassfish.admin.amx.util.CollectionUtil; +import org.glassfish.admin.amx.util.ListUtil; import org.glassfish.admin.amx.util.MapUtil; import org.glassfish.admin.amx.util.SetUtil; -import org.glassfish.admin.amx.util.ListUtil; import org.glassfish.admin.amx.util.StringUtil; import org.glassfish.admin.amx.util.jmx.JMXUtil; import org.glassfish.admin.amx.util.stringifier.SmartStringifier; import org.glassfish.api.admin.config.PropertiesDesc; import org.glassfish.api.admin.config.PropertyDesc; +import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; import org.glassfish.quality.ToDo; import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.Units; import org.jvnet.hk2.config.ConfigBean; import org.jvnet.hk2.config.ConfigBeanProxy; -import org.jvnet.hk2.config.Dom; -import org.jvnet.hk2.config.Element; -import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.ConfigModel; +import org.jvnet.hk2.config.Configured; +import org.jvnet.hk2.config.Dom; import org.jvnet.hk2.config.DomDocument; +import org.jvnet.hk2.config.Element; +import org.jvnet.hk2.config.Units; import static org.glassfish.admin.amx.config.AMXConfigConstants.DESC_ANNOTATION_PREFIX; import static org.glassfish.admin.amx.config.AMXConfigConstants.DESC_CONFIG_PREFIX; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/ConfigBeanJMXSupportRegistry.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/ConfigBeanJMXSupportRegistry.java index 5439d10b3fa..76c98b965f1 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/ConfigBeanJMXSupportRegistry.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/ConfigBeanJMXSupportRegistry.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.impl.config; +import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.Set; -import java.util.HashSet; -import java.util.ArrayList; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/ConfigBeanRegistry.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/ConfigBeanRegistry.java index ad1adc38118..8a326a6b2b8 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/ConfigBeanRegistry.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/ConfigBeanRegistry.java @@ -18,7 +18,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; + import javax.management.ObjectName; + import org.glassfish.external.arc.Stability; import org.glassfish.external.arc.Taxonomy; import org.jvnet.hk2.config.ConfigBean; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/package-info.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/package-info.java index 37860f04287..2fc8e18b49d 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/package-info.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/package-info.java @@ -19,8 +19,8 @@ @Taxonomy(stability = Stability.PRIVATE) package org.glassfish.admin.amx.impl.config; -import org.glassfish.external.arc.Taxonomy; import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/AMXImplBase.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/AMXImplBase.java index c0f3087a8aa..ea3e36eaf54 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/AMXImplBase.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/AMXImplBase.java @@ -24,7 +24,22 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import javax.management.*; + +import javax.management.Attribute; +import javax.management.AttributeChangeNotification; +import javax.management.AttributeList; +import javax.management.AttributeNotFoundException; +import javax.management.DynamicMBean; +import javax.management.InvalidAttributeValueException; +import javax.management.MBeanAttributeInfo; +import javax.management.MBeanException; +import javax.management.MBeanInfo; +import javax.management.MBeanNotificationInfo; +import javax.management.MBeanServer; +import javax.management.NotificationEmitter; +import javax.management.ObjectName; +import javax.management.ReflectionException; + import org.glassfish.admin.amx.base.DomainRoot; import org.glassfish.admin.amx.base.MBeanTrackerMBean; import org.glassfish.admin.amx.base.Utility; @@ -35,7 +50,12 @@ import org.glassfish.admin.amx.impl.AMXStartupService; import org.glassfish.admin.amx.impl.util.MBeanInfoSupport; import org.glassfish.admin.amx.impl.util.ObjectNameBuilder; -import org.glassfish.admin.amx.util.*; +import org.glassfish.admin.amx.util.AMXLoggerInfo; +import org.glassfish.admin.amx.util.ClassUtil; +import org.glassfish.admin.amx.util.CollectionUtil; +import org.glassfish.admin.amx.util.ExceptionUtil; +import org.glassfish.admin.amx.util.SetUtil; +import org.glassfish.admin.amx.util.ThrowableMapper; import org.glassfish.admin.amx.util.jmx.AttributeChangeNotificationBuilder; import org.glassfish.admin.amx.util.jmx.JMXUtil; import org.glassfish.admin.amx.util.jmx.stringifier.AttributeChangeNotificationStringifier; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/BulkAccessImpl.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/BulkAccessImpl.java index 36e29736d21..9677dbb11fb 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/BulkAccessImpl.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/BulkAccessImpl.java @@ -16,14 +16,14 @@ package org.glassfish.admin.amx.impl.mbean; -import org.glassfish.admin.amx.base.BulkAccess; -import org.glassfish.admin.amx.util.jmx.JMXUtil; - import javax.management.Attribute; import javax.management.AttributeList; import javax.management.MBeanInfo; import javax.management.ObjectName; +import org.glassfish.admin.amx.base.BulkAccess; +import org.glassfish.admin.amx.util.jmx.JMXUtil; + /** */ public class BulkAccessImpl extends AMXImplBase // implements BulkAccess diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ComplianceMonitor.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ComplianceMonitor.java index bbb12a2b6ae..1feecd540a3 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ComplianceMonitor.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ComplianceMonitor.java @@ -26,7 +26,13 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import javax.management.*; + +import javax.management.MBeanServer; +import javax.management.MBeanServerNotification; +import javax.management.Notification; +import javax.management.NotificationListener; +import javax.management.ObjectName; + import org.glassfish.admin.amx.base.DomainRoot; import org.glassfish.admin.amx.core.AMXValidator; import org.glassfish.admin.amx.util.AMXLoggerInfo; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ExtImpl.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ExtImpl.java index 4ede1e3b7c1..771d5a6bfcf 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ExtImpl.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ExtImpl.java @@ -17,6 +17,7 @@ package org.glassfish.admin.amx.impl.mbean; import javax.management.ObjectName; + import org.glassfish.admin.amx.base.Ext; /** diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/MBeanImplBase.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/MBeanImplBase.java index ea5e6987891..e20bc45b546 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/MBeanImplBase.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/MBeanImplBase.java @@ -16,22 +16,30 @@ package org.glassfish.admin.amx.impl.mbean; +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.management.AttributeChangeNotification; +import javax.management.ListenerNotFoundException; +import javax.management.MBeanRegistration; +import javax.management.MBeanServer; +import javax.management.Notification; +import javax.management.NotificationFilter; +import javax.management.NotificationListener; +import javax.management.ObjectName; + import org.glassfish.admin.amx.util.AMXDebug; +import org.glassfish.admin.amx.util.Output; +import org.glassfish.admin.amx.util.StringUtil; import org.glassfish.admin.amx.util.jmx.AttributeChangeNotificationBuilder; import org.glassfish.admin.amx.util.jmx.NotificationBuilder; import org.glassfish.admin.amx.util.jmx.NotificationEmitterSupport; import org.glassfish.admin.amx.util.jmx.NotificationSender; -import org.glassfish.admin.amx.util.Output; -import org.glassfish.admin.amx.util.StringUtil; import org.glassfish.admin.amx.util.stringifier.SmartStringifier; -import javax.management.*; -import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; - /** Absolute base impl class. Should contain only core functionality, nothing to do with appserver specifics. diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/MonitoringRootImpl.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/MonitoringRootImpl.java index 2d728bcfb38..5332dc2a44f 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/MonitoringRootImpl.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/MonitoringRootImpl.java @@ -18,8 +18,10 @@ import java.util.logging.Level; import java.util.logging.Logger; + import javax.management.MBeanServer; import javax.management.ObjectName; + import org.glassfish.admin.amx.impl.util.ObjectNameBuilder; import org.glassfish.admin.amx.monitoring.MonitoringRoot; import org.glassfish.admin.amx.monitoring.ServerMon; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ParentChildren.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ParentChildren.java index 5e234f4c320..19b9e94f87f 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ParentChildren.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ParentChildren.java @@ -20,6 +20,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; + import org.glassfish.admin.amx.core.AMXProxy; import org.glassfish.admin.amx.util.StringUtil; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/PathnamesImpl.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/PathnamesImpl.java index e3e1d1f5588..37d96a672b4 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/PathnamesImpl.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/PathnamesImpl.java @@ -23,10 +23,12 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.logging.Level; + import javax.management.InstanceNotFoundException; import javax.management.MBeanInfo; import javax.management.MBeanServer; import javax.management.ObjectName; + import org.glassfish.admin.amx.base.DomainRoot; import org.glassfish.admin.amx.base.Pathnames; import org.glassfish.admin.amx.core.AMXProxy; @@ -39,6 +41,7 @@ import org.glassfish.admin.amx.util.ListUtil; import org.glassfish.admin.amx.util.jmx.JMXUtil; import org.glassfish.admin.amx.util.stringifier.SmartStringifier; + import static org.glassfish.external.amx.AMX.ATTR_PARENT; import static org.glassfish.external.amx.AMX.PARENT_PATH_KEY; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/QueryMgrImpl.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/QueryMgrImpl.java index 5f00bf25e13..2d469c0f0cf 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/QueryMgrImpl.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/QueryMgrImpl.java @@ -16,25 +16,25 @@ package org.glassfish.admin.amx.impl.mbean; -import org.glassfish.admin.amx.core.Util; - -import org.glassfish.admin.amx.core.AMXProxy; -import org.glassfish.admin.amx.base.Query; -import org.glassfish.admin.amx.util.jmx.JMXUtil; -import org.glassfish.admin.amx.util.jmx.ObjectNameQueryImpl; -import org.glassfish.admin.amx.util.SetUtil; -import org.glassfish.admin.amx.util.RegexUtil; -import org.glassfish.admin.amx.util.CollectionUtil; - -import javax.management.ObjectName; import java.io.IOException; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; + import javax.management.MBeanInfo; +import javax.management.ObjectName; + +import org.glassfish.admin.amx.base.Query; +import org.glassfish.admin.amx.core.AMXProxy; +import org.glassfish.admin.amx.core.Util; import org.glassfish.admin.amx.core.proxy.AMXProxyHandler; import org.glassfish.admin.amx.core.proxy.ProxyFactory; +import org.glassfish.admin.amx.util.CollectionUtil; +import org.glassfish.admin.amx.util.RegexUtil; +import org.glassfish.admin.amx.util.SetUtil; +import org.glassfish.admin.amx.util.jmx.JMXUtil; +import org.glassfish.admin.amx.util.jmx.ObjectNameQueryImpl; /** */ diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/RealmsImpl.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/RealmsImpl.java index 7985064e16b..d37fd374288 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/RealmsImpl.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/RealmsImpl.java @@ -16,36 +16,36 @@ package org.glassfish.admin.amx.impl.mbean; -import java.util.List; -import java.util.Map; -import java.util.Set; +import com.sun.enterprise.config.serverbeans.AuthRealm; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.SecurityService; +import com.sun.enterprise.security.auth.login.LoginContextDriver; +import com.sun.enterprise.security.auth.realm.Realm; +import com.sun.enterprise.security.auth.realm.RealmsManager; +import com.sun.enterprise.security.auth.realm.User; + +import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.ArrayList; +import java.util.List; +import java.util.Map; import java.util.Properties; +import java.util.Set; import java.util.logging.Level; -import javax.management.ObjectName; -import org.glassfish.admin.amx.util.ListUtil; -import org.glassfish.admin.amx.util.StringUtil; -import org.glassfish.admin.amx.util.SetUtil; -import com.sun.enterprise.config.serverbeans.AuthRealm; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.SecurityService; -import com.sun.enterprise.config.serverbeans.Config; -import org.jvnet.hk2.config.types.Property; +import javax.management.ObjectName; -import org.glassfish.internal.api.Globals; -import com.sun.enterprise.security.auth.realm.RealmsManager; -import com.sun.enterprise.security.auth.realm.Realm; -import com.sun.enterprise.security.auth.realm.User; import org.glassfish.admin.amx.base.Realms; -import org.glassfish.admin.amx.util.CollectionUtil; import org.glassfish.admin.amx.impl.util.InjectedValues; -import org.glassfish.api.admin.ServerEnvironment; - -import com.sun.enterprise.security.auth.login.LoginContextDriver; import org.glassfish.admin.amx.util.AMXLoggerInfo; +import org.glassfish.admin.amx.util.CollectionUtil; +import org.glassfish.admin.amx.util.ListUtil; +import org.glassfish.admin.amx.util.SetUtil; +import org.glassfish.admin.amx.util.StringUtil; +import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.internal.api.Globals; +import org.jvnet.hk2.config.types.Property; /** diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/RuntimeRootImpl.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/RuntimeRootImpl.java index 1a1419afc0f..d63838fdc71 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/RuntimeRootImpl.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/RuntimeRootImpl.java @@ -16,45 +16,42 @@ package org.glassfish.admin.amx.impl.mbean; -import javax.management.ObjectName; +import com.sun.enterprise.module.HK2Module; +import com.sun.enterprise.module.ModulesRegistry; +import com.sun.enterprise.security.ssl.SSLUtils; +import com.sun.enterprise.v3.admin.RestartDomainCommand; +import com.sun.enterprise.v3.admin.commands.JVMInformation; +import com.sun.enterprise.v3.common.PlainTextActionReporter; import java.io.InputStream; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; import java.util.Collection; +import java.util.Locale; import java.util.logging.Level; -import com.sun.enterprise.module.ModulesRegistry; -import com.sun.enterprise.module.HK2Module; - -import com.sun.enterprise.security.ssl.SSLUtils; import javax.management.JMException; +import javax.management.MBeanServer; +import javax.management.ObjectName; import javax.management.remote.JMXServiceURL; + import org.glassfish.admin.amx.base.RuntimeRoot; import org.glassfish.admin.amx.base.ServerRuntime; +import org.glassfish.admin.amx.impl.util.InjectedValues; +import org.glassfish.admin.amx.impl.util.ObjectNameBuilder; +import org.glassfish.admin.amx.util.AMXLoggerInfo; +import org.glassfish.admin.amx.util.ExceptionUtil; +import org.glassfish.admin.amx.util.StringUtil; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.AdminCommandContextImpl; import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.external.amx.AMXGlassfish; import org.glassfish.grizzly.config.dom.NetworkConfig; import org.glassfish.grizzly.config.dom.NetworkListener; import org.glassfish.grizzly.config.dom.Protocol; import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.admin.amx.util.ExceptionUtil; -import org.glassfish.admin.amx.impl.util.InjectedValues; - -import org.glassfish.external.amx.AMXGlassfish; - - -import org.glassfish.api.admin.AdminCommandContext; -import com.sun.enterprise.v3.admin.RestartDomainCommand; -import com.sun.enterprise.v3.common.PlainTextActionReporter; -import org.glassfish.api.admin.AdminCommand; -import com.sun.enterprise.v3.admin.commands.JVMInformation; -import java.util.Locale; -import javax.management.MBeanServer; -import org.glassfish.admin.amx.impl.util.ObjectNameBuilder; -import org.glassfish.admin.amx.util.AMXLoggerInfo; -import org.glassfish.admin.amx.util.StringUtil; /** diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/SampleImpl.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/SampleImpl.java index 9806d12af39..275979afb1d 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/SampleImpl.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/SampleImpl.java @@ -16,25 +16,31 @@ package org.glassfish.admin.amx.impl.mbean; -import javax.management.Attribute; -import javax.management.MBeanAttributeInfo; -import javax.management.AttributeNotFoundException; -import javax.management.MBeanInfo; -import javax.management.ObjectName; -import javax.management.openmbean.*; import java.io.Serializable; import java.util.Collections; import java.util.HashMap; -import java.util.Map; import java.util.List; +import java.util.Map; + +import javax.management.Attribute; +import javax.management.AttributeNotFoundException; +import javax.management.MBeanAttributeInfo; +import javax.management.MBeanInfo; +import javax.management.ObjectName; +import javax.management.openmbean.CompositeData; +import javax.management.openmbean.CompositeType; +import javax.management.openmbean.OpenDataException; +import javax.management.openmbean.TabularDataSupport; +import javax.management.openmbean.TabularType; + import org.glassfish.admin.amx.base.Sample; -import org.glassfish.admin.amx.util.jmx.JMXUtil; -import org.glassfish.admin.amx.util.jmx.OpenMBeanUtil; -import org.glassfish.admin.amx.util.MapUtil; +import org.glassfish.admin.amx.core.Util; +import org.glassfish.admin.amx.util.CollectionUtil; import org.glassfish.admin.amx.util.ListUtil; +import org.glassfish.admin.amx.util.MapUtil; import org.glassfish.admin.amx.util.SetUtil; -import org.glassfish.admin.amx.util.CollectionUtil; -import org.glassfish.admin.amx.core.Util; +import org.glassfish.admin.amx.util.jmx.JMXUtil; +import org.glassfish.admin.amx.util.jmx.OpenMBeanUtil; /** @see Sample diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ServerMonitoringImpl.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ServerMonitoringImpl.java index a667c64118a..91470753020 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ServerMonitoringImpl.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ServerMonitoringImpl.java @@ -17,6 +17,7 @@ package org.glassfish.admin.amx.impl.mbean; import javax.management.ObjectName; + import org.glassfish.admin.amx.monitoring.ServerMon; public class ServerMonitoringImpl extends AMXImplBase // implements ServerMonitoringImpl diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ServerRuntimeImpl.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ServerRuntimeImpl.java index 7f6bcf0643c..8eae8b69317 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ServerRuntimeImpl.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ServerRuntimeImpl.java @@ -17,6 +17,7 @@ package org.glassfish.admin.amx.impl.mbean; import javax.management.ObjectName; + import org.glassfish.admin.amx.base.ServerRuntime; /** diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/SystemInfoImpl.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/SystemInfoImpl.java index b8886ba8cef..38dc9e75e29 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/SystemInfoImpl.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/SystemInfoImpl.java @@ -23,7 +23,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; + import javax.management.MBeanServer; + import org.glassfish.admin.amx.base.SystemInfo; import org.glassfish.external.amx.AMXGlassfish; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/SystemInfoIniter.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/SystemInfoIniter.java index 245d9f6f59d..99afe4f9b60 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/SystemInfoIniter.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/SystemInfoIniter.java @@ -16,12 +16,14 @@ package org.glassfish.admin.amx.impl.mbean; -import static org.glassfish.admin.amx.base.SystemInfo.*; - import javax.management.MBeanServer; import org.glassfish.admin.amx.impl.util.Issues; +import static org.glassfish.admin.amx.base.SystemInfo.CLUSTERS_FEATURE; +import static org.glassfish.admin.amx.base.SystemInfo.MULTIPLE_SERVERS_FEATURE; +import static org.glassfish.admin.amx.base.SystemInfo.RUNNING_IN_DAS_FEATURE; + /** Single-use utility class to contain the details of initializing various SystemInfo data. Appropriate code can be added here, but can be implemented just as diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ToolsImpl.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ToolsImpl.java index c87c9e29291..6144648f1cc 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ToolsImpl.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ToolsImpl.java @@ -19,20 +19,21 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.Set; -import java.util.List; import java.util.HashSet; +import java.util.List; +import java.util.Set; import javax.management.MBeanInfo; import javax.management.ObjectName; + import org.glassfish.admin.amx.base.Pathnames; import org.glassfish.admin.amx.base.Tools; import org.glassfish.admin.amx.core.AMXValidator; +import org.glassfish.admin.amx.core.Util; import org.glassfish.admin.amx.util.CollectionUtil; import org.glassfish.admin.amx.util.SetUtil; import org.glassfish.admin.amx.util.StringUtil; import org.glassfish.admin.amx.util.jmx.MBeanInterfaceGenerator; -import org.glassfish.admin.amx.core.Util; public class ToolsImpl extends AMXImplBase // implements Tools { diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/package-info.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/package-info.java index 90b59704805..3c0765c59e6 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/package-info.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/package-info.java @@ -19,8 +19,8 @@ @Taxonomy(stability = Stability.PRIVATE) package org.glassfish.admin.amx.impl.mbean; -import org.glassfish.external.arc.Taxonomy; import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/package-info.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/package-info.java index 8f571c43f2e..9d06822b387 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/package-info.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/package-info.java @@ -19,8 +19,8 @@ @Taxonomy(stability = Stability.PRIVATE) package org.glassfish.admin.amx.impl; -import org.glassfish.external.arc.Taxonomy; import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/ImplUtil.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/ImplUtil.java index e01fe1362c5..496a45c31c3 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/ImplUtil.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/ImplUtil.java @@ -18,8 +18,10 @@ package org.glassfish.admin.amx.impl.util; import java.util.Set; + import javax.management.MBeanServer; import javax.management.ObjectName; + import org.glassfish.admin.amx.core.AMXProxy; import org.glassfish.admin.amx.core.proxy.ProxyFactory; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/InjectedValues.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/InjectedValues.java index 730c88e6935..978d47a2aaa 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/InjectedValues.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/InjectedValues.java @@ -16,20 +16,19 @@ package org.glassfish.admin.amx.impl.util; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.internal.api.Globals; - -import org.glassfish.api.Async; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.module.ModulesRegistry; import jakarta.inject.Inject; + import javax.management.MBeanServer; -import org.glassfish.server.ServerEnvironmentImpl; +import org.glassfish.api.Async; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Globals; import org.glassfish.internal.config.UnprocessedConfigListener; -import com.sun.enterprise.module.ModulesRegistry; - -import com.sun.enterprise.config.serverbeans.Domain; +import org.glassfish.server.ServerEnvironmentImpl; +import org.jvnet.hk2.annotations.Service; /** Utility class that gets various useful values injected into it for use diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/Issues.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/Issues.java index 6df0bedfa4f..e4b919f8436 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/Issues.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/Issues.java @@ -20,6 +20,7 @@ import java.util.HashSet; import java.util.Set; import java.util.logging.Level; + import org.glassfish.admin.amx.util.AMXLoggerInfo; /** diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/MBeanInfoSupport.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/MBeanInfoSupport.java index b1b2e9ee513..dc8967c9296 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/MBeanInfoSupport.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/MBeanInfoSupport.java @@ -27,6 +27,7 @@ import java.util.Map; import java.util.Set; import java.util.logging.Level; + import javax.management.Descriptor; import javax.management.MBeanAttributeInfo; import javax.management.MBeanInfo; @@ -34,17 +35,27 @@ import javax.management.MBeanParameterInfo; import javax.management.ObjectName; import javax.management.modelmbean.DescriptorSupport; + +import org.glassfish.admin.amx.annotation.Description; import org.glassfish.admin.amx.annotation.ManagedAttribute; import org.glassfish.admin.amx.annotation.ManagedOperation; -import org.glassfish.admin.amx.annotation.Description; import org.glassfish.admin.amx.annotation.Param; import org.glassfish.admin.amx.base.Singleton; +import org.glassfish.admin.amx.core.AMXMBeanMetadata; import org.glassfish.admin.amx.core.AMXProxy; import org.glassfish.admin.amx.core.AMX_SPI; -import org.glassfish.admin.amx.util.jmx.JMXUtil; -import org.glassfish.admin.amx.core.AMXMBeanMetadata; import org.glassfish.admin.amx.util.AMXLoggerInfo; -import static org.glassfish.external.amx.AMX.*; +import org.glassfish.admin.amx.util.jmx.JMXUtil; + +import static org.glassfish.external.amx.AMX.ATTR_CHILDREN; +import static org.glassfish.external.amx.AMX.DESC_GROUP; +import static org.glassfish.external.amx.AMX.DESC_IS_GLOBAL_SINGLETON; +import static org.glassfish.external.amx.AMX.DESC_IS_SINGLETON; +import static org.glassfish.external.amx.AMX.DESC_STD_IMMUTABLE_INFO; +import static org.glassfish.external.amx.AMX.DESC_STD_INTERFACE_NAME; +import static org.glassfish.external.amx.AMX.DESC_SUB_TYPES; +import static org.glassfish.external.amx.AMX.DESC_SUPPORTS_ADOPTION; +import static org.glassfish.external.amx.AMX.GROUP_OTHER; /** * diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/ObjectNameBuilder.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/ObjectNameBuilder.java index 1c977aac1bb..18e40e115ba 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/ObjectNameBuilder.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/ObjectNameBuilder.java @@ -20,13 +20,16 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; + import javax.management.MBeanServer; import javax.management.ObjectName; + import org.glassfish.admin.amx.core.AMXProxy; import org.glassfish.admin.amx.core.Util; import org.glassfish.admin.amx.core.proxy.ProxyFactory; import org.glassfish.admin.amx.util.jmx.JMXUtil; -import static org.glassfish.external.amx.AMX.*; + +import static org.glassfish.external.amx.AMX.PARENT_PATH_KEY; /** Class used to build ObjectNameBuilder for AMX MBeans. diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/UnregistrationListener.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/UnregistrationListener.java index d6294a56799..49b407ea422 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/UnregistrationListener.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/UnregistrationListener.java @@ -17,10 +17,16 @@ package org.glassfish.admin.amx.impl.util; -import javax.management.*; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import javax.management.InstanceNotFoundException; +import javax.management.MBeanServerConnection; +import javax.management.MBeanServerNotification; +import javax.management.Notification; +import javax.management.NotificationListener; +import javax.management.ObjectName; + import org.glassfish.admin.amx.util.jmx.JMXUtil; /** diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/package-info.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/package-info.java index 0e563b3077c..0aa6e58e51b 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/package-info.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/package-info.java @@ -19,8 +19,8 @@ @Taxonomy(stability = Stability.PRIVATE) package org.glassfish.admin.amx.impl.util; -import org.glassfish.external.arc.Taxonomy; import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogAnalyzer.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogAnalyzer.java index 31dd8d2ae6c..e05feba6ee5 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogAnalyzer.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogAnalyzer.java @@ -18,7 +18,9 @@ import java.util.Map; import java.util.logging.Level; + import javax.management.MBeanOperationInfo; + import org.glassfish.admin.amx.annotation.ManagedAttribute; import org.glassfish.admin.amx.annotation.ManagedOperation; import org.glassfish.admin.amx.annotation.Param; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogFileAccess.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogFileAccess.java index f3b8996403b..3a48a9d80cc 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogFileAccess.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogFileAccess.java @@ -17,6 +17,7 @@ package org.glassfish.admin.amx.logging; import javax.management.MBeanOperationInfo; + import org.glassfish.admin.amx.annotation.ManagedAttribute; import org.glassfish.admin.amx.annotation.ManagedOperation; import org.glassfish.admin.amx.annotation.Param; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogModuleNames.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogModuleNames.java index ddd71aa5f2a..ba8ed91eb7e 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogModuleNames.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogModuleNames.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.logging; -import org.glassfish.admin.amx.util.SetUtil; - import java.util.Collections; import java.util.Set; + +import org.glassfish.admin.amx.util.SetUtil; import org.glassfish.external.arc.Stability; import org.glassfish.external.arc.Taxonomy; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogQuery.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogQuery.java index b214072dc77..b54eeab4189 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogQuery.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogQuery.java @@ -16,13 +16,16 @@ package org.glassfish.admin.amx.logging; -import javax.management.Attribute; +import java.io.Serializable; import java.util.List; import java.util.Set; import java.util.logging.Level; -import java.io.Serializable; + +import javax.management.Attribute; import javax.management.MBeanOperationInfo; -import org.glassfish.admin.amx.annotation.*; + +import org.glassfish.admin.amx.annotation.ManagedOperation; +import org.glassfish.admin.amx.annotation.Param; import org.glassfish.external.arc.Stability; import org.glassfish.external.arc.Taxonomy; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogQueryEntry.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogQueryEntry.java index 8e8be478a08..ffec6f16d2f 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogQueryEntry.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogQueryEntry.java @@ -18,6 +18,7 @@ import java.util.Date; import java.util.Map; + import org.glassfish.external.arc.Stability; import org.glassfish.external.arc.Taxonomy; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogQueryEntryImpl.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogQueryEntryImpl.java index 6b1aa4d27bb..6f1b57cde45 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogQueryEntryImpl.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogQueryEntryImpl.java @@ -16,17 +16,27 @@ package org.glassfish.admin.amx.logging; -import static org.glassfish.admin.amx.logging.LogRecordFields.*; -import org.glassfish.admin.amx.util.ArrayUtil; -import org.glassfish.admin.amx.util.ObjectUtil; - import java.util.Date; import java.util.HashMap; import java.util.Map; import java.util.logging.Level; + +import org.glassfish.admin.amx.util.ArrayUtil; +import org.glassfish.admin.amx.util.ObjectUtil; import org.glassfish.external.arc.Stability; import org.glassfish.external.arc.Taxonomy; +import static org.glassfish.admin.amx.logging.LogRecordFields.DATE_INDEX; +import static org.glassfish.admin.amx.logging.LogRecordFields.LEVEL_INDEX; +import static org.glassfish.admin.amx.logging.LogRecordFields.MESSAGE_ID_INDEX; +import static org.glassfish.admin.amx.logging.LogRecordFields.MESSAGE_INDEX; +import static org.glassfish.admin.amx.logging.LogRecordFields.MODULE_INDEX; +import static org.glassfish.admin.amx.logging.LogRecordFields.NAME_VALUE_PAIRS_INDEX; +import static org.glassfish.admin.amx.logging.LogRecordFields.NUM_FIELDS; +import static org.glassfish.admin.amx.logging.LogRecordFields.OBJECTNAME_KEY; +import static org.glassfish.admin.amx.logging.LogRecordFields.PRODUCT_NAME_INDEX; +import static org.glassfish.admin.amx.logging.LogRecordFields.RECORD_NUMBER_INDEX; + //import static org.glassfish.admin.amx.logging.LogRecordFields; /** diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogQueryResultImpl.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogQueryResultImpl.java index ba59dc9513c..8a007518e00 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogQueryResultImpl.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogQueryResultImpl.java @@ -16,11 +16,11 @@ package org.glassfish.admin.amx.logging; -import org.glassfish.admin.amx.util.ArrayUtil; -import org.glassfish.admin.amx.util.ObjectUtil; - import java.io.Serializable; import java.util.List; + +import org.glassfish.admin.amx.util.ArrayUtil; +import org.glassfish.admin.amx.util.ObjectUtil; import org.glassfish.external.arc.Stability; import org.glassfish.external.arc.Taxonomy; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogRecordEmitter.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogRecordEmitter.java index b49b48f51c1..d4af72f6627 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogRecordEmitter.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogRecordEmitter.java @@ -16,19 +16,20 @@ package org.glassfish.admin.amx.logging; -import org.glassfish.admin.amx.base.ListenerInfo; -import org.glassfish.admin.amx.core.Util; -import org.glassfish.admin.amx.util.SetUtil; - -import javax.management.Notification; -import javax.management.NotificationEmitter; import java.util.Collections; import java.util.Set; import java.util.logging.Level; import java.util.logging.LogRecord; + import javax.management.MBeanOperationInfo; +import javax.management.Notification; +import javax.management.NotificationEmitter; + import org.glassfish.admin.amx.annotation.ManagedOperation; import org.glassfish.admin.amx.annotation.Param; +import org.glassfish.admin.amx.base.ListenerInfo; +import org.glassfish.admin.amx.core.Util; +import org.glassfish.admin.amx.util.SetUtil; import org.glassfish.external.arc.Stability; import org.glassfish.external.arc.Taxonomy; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogUtil.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogUtil.java index f93e674628a..c00239debe5 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogUtil.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogUtil.java @@ -17,6 +17,7 @@ package org.glassfish.admin.amx.logging; import javax.management.openmbean.CompositeData; + import org.glassfish.external.arc.Stability; import org.glassfish.external.arc.Taxonomy; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/package-info.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/package-info.java index 272a719c5c4..898a61d0827 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/package-info.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/package-info.java @@ -17,8 +17,8 @@ @Taxonomy(stability = Stability.UNCOMMITTED) package org.glassfish.admin.amx.logging; -import org.glassfish.external.arc.Taxonomy; import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/monitoring/MonitoringRoot.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/monitoring/MonitoringRoot.java index c41f2332b33..ceef939ff2f 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/monitoring/MonitoringRoot.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/monitoring/MonitoringRoot.java @@ -17,10 +17,11 @@ package org.glassfish.admin.amx.monitoring; import java.util.Map; + import org.glassfish.admin.amx.annotation.ManagedAttribute; import org.glassfish.admin.amx.base.Singleton; -import org.glassfish.admin.amx.core.AMXProxy; import org.glassfish.admin.amx.core.AMXMBeanMetadata; +import org.glassfish.admin.amx.core.AMXProxy; /** diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/monitoring/package-info.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/monitoring/package-info.java index 1af3b5f8100..f286fdd85b9 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/monitoring/package-info.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/monitoring/package-info.java @@ -20,8 +20,8 @@ @Taxonomy(stability = Stability.UNCOMMITTED) package org.glassfish.admin.amx.monitoring; -import org.glassfish.external.arc.Taxonomy; import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/CollectionUtil.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/CollectionUtil.java index 5182f1ffeeb..5dff0531658 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/CollectionUtil.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/CollectionUtil.java @@ -16,9 +16,9 @@ package org.glassfish.admin.amx.util; -import java.util.List; import java.util.ArrayList; import java.util.Collection; +import java.util.List; import org.glassfish.admin.amx.util.stringifier.SmartStringifier; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/ExceptionUtil.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/ExceptionUtil.java index de01bf5d3e5..2972124065a 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/ExceptionUtil.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/ExceptionUtil.java @@ -17,8 +17,8 @@ package org.glassfish.admin.amx.util; import java.util.ArrayList; -import java.util.Map; import java.util.HashMap; +import java.util.Map; import java.util.Set; /** diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/ListUtil.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/ListUtil.java index 6d90ecccefe..f49ae8be745 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/ListUtil.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/ListUtil.java @@ -18,10 +18,10 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; +import java.util.Enumeration; import java.util.Iterator; import java.util.List; -import java.util.Enumeration; -import java.util.Collections; public final class ListUtil { diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/StringUtil.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/StringUtil.java index a358073e7d4..06a5a0ee7c7 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/StringUtil.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/StringUtil.java @@ -23,9 +23,11 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; + import javax.management.Attribute; import javax.management.AttributeList; import javax.management.ObjectName; + import org.glassfish.admin.amx.util.jmx.JMXUtil; /** diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/AttributeComparator.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/AttributeComparator.java index dab1161dbaa..2d45539637d 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/AttributeComparator.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/AttributeComparator.java @@ -17,6 +17,7 @@ package org.glassfish.admin.amx.util.jmx; import java.io.Serializable; + import javax.management.Attribute; public final class AttributeComparator implements java.util.Comparator, Serializable diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/JMXUtil.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/JMXUtil.java index ea8fd067624..265ba0d8072 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/JMXUtil.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/JMXUtil.java @@ -19,11 +19,47 @@ import java.io.IOException; import java.io.Serializable; import java.lang.reflect.Method; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.regex.Pattern; -import javax.management.*; + +import javax.management.Attribute; +import javax.management.AttributeChangeNotification; +import javax.management.AttributeList; +import javax.management.AttributeNotFoundException; +import javax.management.Descriptor; +import javax.management.InstanceNotFoundException; +import javax.management.IntrospectionException; +import javax.management.MBeanAttributeInfo; +import javax.management.MBeanConstructorInfo; +import javax.management.MBeanException; +import javax.management.MBeanFeatureInfo; +import javax.management.MBeanInfo; +import javax.management.MBeanNotificationInfo; +import javax.management.MBeanOperationInfo; +import javax.management.MBeanParameterInfo; +import javax.management.MBeanRegistrationException; +import javax.management.MBeanServer; +import javax.management.MBeanServerConnection; +import javax.management.MBeanServerDelegateMBean; +import javax.management.MBeanServerInvocationHandler; +import javax.management.MalformedObjectNameException; +import javax.management.Notification; +import javax.management.NotificationFilter; +import javax.management.NotificationListener; +import javax.management.ObjectName; +import javax.management.QueryExp; +import javax.management.ReflectionException; import javax.management.modelmbean.DescriptorSupport; import javax.management.openmbean.OpenMBeanAttributeInfo; + import org.glassfish.admin.amx.util.ArrayConversion; import org.glassfish.admin.amx.util.ArrayUtil; import org.glassfish.admin.amx.util.MapUtil; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanAttributeInfoComparator.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanAttributeInfoComparator.java index ade70fe44eb..de849b62771 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanAttributeInfoComparator.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanAttributeInfoComparator.java @@ -17,7 +17,9 @@ package org.glassfish.admin.amx.util.jmx; import java.io.Serializable; + import javax.management.MBeanAttributeInfo; + import org.glassfish.admin.amx.util.jmx.stringifier.MBeanAttributeInfoStringifier; import org.glassfish.admin.amx.util.jmx.stringifier.MBeanFeatureInfoStringifierOptions; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanInterfaceGenerator.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanInterfaceGenerator.java index 50ef2d5f51b..44473bf7428 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanInterfaceGenerator.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanInterfaceGenerator.java @@ -21,12 +21,14 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import javax.management.Descriptor; import javax.management.MBeanAttributeInfo; import javax.management.MBeanInfo; import javax.management.MBeanNotificationInfo; import javax.management.MBeanOperationInfo; import javax.management.MBeanParameterInfo; + import org.glassfish.admin.amx.util.ClassUtil; import org.glassfish.admin.amx.util.jmx.stringifier.MBeanNotificationInfoStringifier; import org.glassfish.admin.amx.util.stringifier.SmartStringifier; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanProxyHandler.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanProxyHandler.java index ae59667611a..5f598022b26 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanProxyHandler.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanProxyHandler.java @@ -16,14 +16,28 @@ package org.glassfish.admin.amx.util.jmx; +import java.io.IOException; +import java.lang.reflect.Method; +import java.util.logging.Logger; + +import javax.management.Attribute; +import javax.management.AttributeList; +import javax.management.AttributeNotFoundException; +import javax.management.InstanceNotFoundException; +import javax.management.IntrospectionException; +import javax.management.InvalidAttributeValueException; +import javax.management.MBeanException; +import javax.management.MBeanInfo; +import javax.management.MBeanServer; +import javax.management.MBeanServerConnection; +import javax.management.MBeanServerInvocationHandler; +import javax.management.ObjectName; +import javax.management.ReflectionException; + import org.glassfish.admin.amx.util.AMXDebug; import org.glassfish.admin.amx.util.ObjectUtil; import org.glassfish.admin.amx.util.Output; import org.glassfish.admin.amx.util.StringUtil; -import javax.management.*; -import java.io.IOException; -import java.lang.reflect.Method; -import java.util.logging.Logger; /** Implementation of a proxy handler that supports Attribute names which are not legal diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanRegistrationListener.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanRegistrationListener.java index cc4de993d6c..2d289dc42e9 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanRegistrationListener.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanRegistrationListener.java @@ -16,11 +16,12 @@ package org.glassfish.admin.amx.util.jmx; +import java.io.IOException; + import javax.management.MBeanServerConnection; import javax.management.MBeanServerNotification; import javax.management.Notification; import javax.management.ObjectName; -import java.io.IOException; /** Convenience base class for listening to diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/NotificationBuilder.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/NotificationBuilder.java index 49e36879b68..4ff01c283d0 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/NotificationBuilder.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/NotificationBuilder.java @@ -16,11 +16,12 @@ package org.glassfish.admin.amx.util.jmx; -import javax.management.Notification; import java.io.Serializable; import java.util.HashMap; import java.util.Map; +import javax.management.Notification; + /** Base class for building AMX Notifications. AMX Notifications all place a Map in the userData field. This class takes care diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/NotificationEmitterSupport.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/NotificationEmitterSupport.java index 434512e106d..767d6541542 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/NotificationEmitterSupport.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/NotificationEmitterSupport.java @@ -24,6 +24,7 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.logging.Level; import java.util.logging.Logger; + import javax.management.AttributeChangeNotification; import javax.management.AttributeChangeNotificationFilter; import javax.management.ListenerNotFoundException; @@ -34,6 +35,7 @@ import javax.management.NotificationFilterSupport; import javax.management.NotificationListener; import javax.management.relation.MBeanServerNotificationFilter; + import org.glassfish.admin.amx.util.ListUtil; /** diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/NotificationListenerBase.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/NotificationListenerBase.java index 644acbb13ef..4e776c7c40a 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/NotificationListenerBase.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/NotificationListenerBase.java @@ -18,9 +18,9 @@ import java.io.IOException; import java.util.Collections; - import java.util.HashSet; import java.util.Set; + import javax.management.InstanceNotFoundException; import javax.management.JMException; import javax.management.MBeanServer; @@ -30,6 +30,7 @@ import javax.management.NotificationFilter; import javax.management.NotificationListener; import javax.management.ObjectName; + import org.glassfish.admin.amx.util.SetUtil; /** diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/NotificationListenerTracking.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/NotificationListenerTracking.java index bc5ae05486a..c1be24e8a8f 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/NotificationListenerTracking.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/NotificationListenerTracking.java @@ -16,13 +16,14 @@ package org.glassfish.admin.amx.util.jmx; -import javax.management.NotificationFilter; -import javax.management.NotificationListener; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; +import javax.management.NotificationFilter; +import javax.management.NotificationListener; + /** */ public class NotificationListenerTracking diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/ObjectNameQuery.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/ObjectNameQuery.java index f4ab0436810..982d2237771 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/ObjectNameQuery.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/ObjectNameQuery.java @@ -16,9 +16,10 @@ package org.glassfish.admin.amx.util.jmx; -import javax.management.ObjectName; import java.util.Set; +import javax.management.ObjectName; + public interface ObjectNameQuery { /** diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/ObjectNameQueryImpl.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/ObjectNameQueryImpl.java index b27acf304ff..3abbbb291f6 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/ObjectNameQueryImpl.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/ObjectNameQueryImpl.java @@ -16,15 +16,16 @@ package org.glassfish.admin.amx.util.jmx; -import org.glassfish.admin.amx.util.EnumerationIterator; - -import javax.management.ObjectName; import java.util.HashSet; import java.util.Hashtable; import java.util.Iterator; import java.util.Set; import java.util.regex.Pattern; +import javax.management.ObjectName; + +import org.glassfish.admin.amx.util.EnumerationIterator; + public class ObjectNameQueryImpl implements ObjectNameQuery { public ObjectNameQueryImpl() diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/OpenMBeanUtil.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/OpenMBeanUtil.java index 88084868a21..e30f2bdf163 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/OpenMBeanUtil.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/OpenMBeanUtil.java @@ -16,6 +16,16 @@ package org.glassfish.admin.amx.util.jmx; +import java.io.Serializable; +import java.lang.reflect.Array; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.Collection; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + import javax.management.ObjectName; import javax.management.openmbean.ArrayType; import javax.management.openmbean.CompositeData; @@ -26,19 +36,10 @@ import javax.management.openmbean.OpenType; import javax.management.openmbean.SimpleType; import javax.management.openmbean.TabularData; -import java.io.Serializable; -import java.lang.reflect.Array; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.Collection; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; -import org.glassfish.admin.amx.util.TypeCast; import org.glassfish.admin.amx.util.ArrayConversion; import org.glassfish.admin.amx.util.IteratorUtil; +import org.glassfish.admin.amx.util.TypeCast; /** Utilities dealing with OpenMBeans diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/package-info.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/package-info.java index 7e3fd21e07b..66b16f329e6 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/package-info.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/package-info.java @@ -20,8 +20,8 @@ @Taxonomy(stability = Stability.UNCOMMITTED) package org.glassfish.admin.amx.util.jmx; -import org.glassfish.external.arc.Taxonomy; import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/AttributeChangeNotificationStringifier.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/AttributeChangeNotificationStringifier.java index a769564f019..4782b67cb22 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/AttributeChangeNotificationStringifier.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/AttributeChangeNotificationStringifier.java @@ -17,6 +17,7 @@ package org.glassfish.admin.amx.util.jmx.stringifier; import javax.management.AttributeChangeNotification; + import org.glassfish.admin.amx.util.stringifier.SmartStringifier; public class AttributeChangeNotificationStringifier diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/AttributeListStringifier.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/AttributeListStringifier.java index 998d05e4012..a518f5eb6ce 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/AttributeListStringifier.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/AttributeListStringifier.java @@ -16,11 +16,12 @@ package org.glassfish.admin.amx.util.jmx.stringifier; -import org.glassfish.admin.amx.util.stringifier.IteratorStringifier; -import org.glassfish.admin.amx.util.stringifier.Stringifier; +import java.util.Iterator; import javax.management.AttributeList; -import java.util.Iterator; + +import org.glassfish.admin.amx.util.stringifier.IteratorStringifier; +import org.glassfish.admin.amx.util.stringifier.Stringifier; public final class AttributeListStringifier implements Stringifier { diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/AttributeStringifier.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/AttributeStringifier.java index 3e28c3095a9..fd88e593196 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/AttributeStringifier.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/AttributeStringifier.java @@ -22,11 +22,11 @@ package org.glassfish.admin.amx.util.jmx.stringifier; +import javax.management.Attribute; + import org.glassfish.admin.amx.util.stringifier.SmartStringifier; import org.glassfish.admin.amx.util.stringifier.Stringifier; -import javax.management.Attribute; - public final class AttributeStringifier implements Stringifier { diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/CompositeDataStringifier.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/CompositeDataStringifier.java index 776c33c963c..3f6881f87ea 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/CompositeDataStringifier.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/CompositeDataStringifier.java @@ -16,13 +16,14 @@ package org.glassfish.admin.amx.util.jmx.stringifier; -import org.glassfish.admin.amx.util.stringifier.SmartStringifier; -import org.glassfish.admin.amx.util.stringifier.Stringifier; +import java.util.Iterator; +import java.util.Set; import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeType; -import java.util.Iterator; -import java.util.Set; + +import org.glassfish.admin.amx.util.stringifier.SmartStringifier; +import org.glassfish.admin.amx.util.stringifier.Stringifier; public class CompositeDataStringifier implements Stringifier { diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanAttributeInfoStringifier.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanAttributeInfoStringifier.java index 43179be3655..42056e65e4f 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanAttributeInfoStringifier.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanAttributeInfoStringifier.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.util.jmx.stringifier; -import org.glassfish.admin.amx.util.stringifier.Stringifier; - import javax.management.MBeanAttributeInfo; +import org.glassfish.admin.amx.util.stringifier.Stringifier; + public class MBeanAttributeInfoStringifier extends MBeanFeatureInfoStringifier implements Stringifier { public final static MBeanAttributeInfoStringifier DEFAULT = diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanConstructorInfoStringifier.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanConstructorInfoStringifier.java index 3b8ae83a01e..7709557e66a 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanConstructorInfoStringifier.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanConstructorInfoStringifier.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.util.jmx.stringifier; -import org.glassfish.admin.amx.util.stringifier.Stringifier; - import javax.management.MBeanConstructorInfo; +import org.glassfish.admin.amx.util.stringifier.Stringifier; + public class MBeanConstructorInfoStringifier extends MBeanFeatureInfoStringifier implements Stringifier { public static final MBeanConstructorInfoStringifier DEFAULT = diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanFeatureInfoStringifier.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanFeatureInfoStringifier.java index 39b11c3bca5..cff154bcd4e 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanFeatureInfoStringifier.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanFeatureInfoStringifier.java @@ -17,7 +17,9 @@ package org.glassfish.admin.amx.util.jmx.stringifier; import java.lang.reflect.Array; + import javax.management.MBeanParameterInfo; + import org.glassfish.admin.amx.util.ClassUtil; import org.glassfish.admin.amx.util.stringifier.ArrayStringifier; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanInfoStringifier.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanInfoStringifier.java index ba4a03e9d2b..98006b0b1ad 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanInfoStringifier.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanInfoStringifier.java @@ -16,15 +16,15 @@ package org.glassfish.admin.amx.util.jmx.stringifier; -import org.glassfish.admin.amx.util.stringifier.ArrayStringifier; -import org.glassfish.admin.amx.util.stringifier.Stringifier; - import javax.management.MBeanAttributeInfo; import javax.management.MBeanConstructorInfo; import javax.management.MBeanInfo; import javax.management.MBeanNotificationInfo; import javax.management.MBeanOperationInfo; +import org.glassfish.admin.amx.util.stringifier.ArrayStringifier; +import org.glassfish.admin.amx.util.stringifier.Stringifier; + public class MBeanInfoStringifier extends MBeanFeatureInfoStringifier implements Stringifier { public static final MBeanInfoStringifier DEFAULT = new MBeanInfoStringifier(); diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanNotificationInfoStringifier.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanNotificationInfoStringifier.java index e4e31658428..6a3fc4b7869 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanNotificationInfoStringifier.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanNotificationInfoStringifier.java @@ -16,11 +16,11 @@ package org.glassfish.admin.amx.util.jmx.stringifier; +import javax.management.MBeanNotificationInfo; + import org.glassfish.admin.amx.util.stringifier.ArrayStringifier; import org.glassfish.admin.amx.util.stringifier.Stringifier; -import javax.management.MBeanNotificationInfo; - public class MBeanNotificationInfoStringifier extends MBeanFeatureInfoStringifier implements Stringifier { diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanOperationInfoStringifier.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanOperationInfoStringifier.java index 818f8420210..6cbe7350483 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanOperationInfoStringifier.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanOperationInfoStringifier.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.util.jmx.stringifier; -import org.glassfish.admin.amx.util.stringifier.Stringifier; - import javax.management.MBeanOperationInfo; +import org.glassfish.admin.amx.util.stringifier.Stringifier; + public class MBeanOperationInfoStringifier extends MBeanFeatureInfoStringifier implements Stringifier { diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanParameterInfoStringifier.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanParameterInfoStringifier.java index 7d3f5a28a95..e20af37281e 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanParameterInfoStringifier.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/MBeanParameterInfoStringifier.java @@ -16,10 +16,10 @@ package org.glassfish.admin.amx.util.jmx.stringifier; -import org.glassfish.admin.amx.util.stringifier.Stringifier; - import javax.management.MBeanParameterInfo; +import org.glassfish.admin.amx.util.stringifier.Stringifier; + public final class MBeanParameterInfoStringifier extends MBeanFeatureInfoStringifier implements Stringifier { diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/NotificationStringifier.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/NotificationStringifier.java index 9ace73af278..fc8dca880dd 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/NotificationStringifier.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/NotificationStringifier.java @@ -16,13 +16,14 @@ package org.glassfish.admin.amx.util.jmx.stringifier; -import org.glassfish.admin.amx.util.StringUtil; -import org.glassfish.admin.amx.util.stringifier.SmartStringifier; -import org.glassfish.admin.amx.util.stringifier.Stringifier; +import java.util.Date; import javax.management.MBeanServerNotification; import javax.management.Notification; -import java.util.Date; + +import org.glassfish.admin.amx.util.StringUtil; +import org.glassfish.admin.amx.util.stringifier.SmartStringifier; +import org.glassfish.admin.amx.util.stringifier.Stringifier; public class NotificationStringifier implements Stringifier { diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/ObjectNameStringifier.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/ObjectNameStringifier.java index 3d770accc3b..7a7ff095b98 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/ObjectNameStringifier.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/ObjectNameStringifier.java @@ -16,12 +16,6 @@ package org.glassfish.admin.amx.util.jmx.stringifier; -import org.glassfish.admin.amx.util.ListUtil; -import org.glassfish.admin.amx.util.StringUtil; -import org.glassfish.admin.amx.util.TypeCast; -import org.glassfish.admin.amx.util.stringifier.Stringifier; - -import javax.management.ObjectName; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -30,6 +24,13 @@ import java.util.Map; import java.util.Set; +import javax.management.ObjectName; + +import org.glassfish.admin.amx.util.ListUtil; +import org.glassfish.admin.amx.util.StringUtil; +import org.glassfish.admin.amx.util.TypeCast; +import org.glassfish.admin.amx.util.stringifier.Stringifier; + /** Stringifier for an ObjectName which sorts the properties in the ObjectName for more consistent and readable output. diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/StringifierRegistryIniter.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/StringifierRegistryIniter.java index 7f9337fea93..59a0bad6268 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/StringifierRegistryIniter.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/StringifierRegistryIniter.java @@ -16,9 +16,18 @@ package org.glassfish.admin.amx.util.jmx.stringifier; -import org.glassfish.admin.amx.util.stringifier.StringifierRegistry; - -import javax.management.*; +import javax.management.Attribute; +import javax.management.AttributeChangeNotification; +import javax.management.AttributeList; +import javax.management.MBeanAttributeInfo; +import javax.management.MBeanConstructorInfo; +import javax.management.MBeanInfo; +import javax.management.MBeanNotificationInfo; +import javax.management.MBeanOperationInfo; +import javax.management.MBeanParameterInfo; +import javax.management.MBeanServerNotification; +import javax.management.Notification; +import javax.management.ObjectName; import javax.management.modelmbean.ModelMBeanAttributeInfo; import javax.management.modelmbean.ModelMBeanConstructorInfo; import javax.management.modelmbean.ModelMBeanInfo; @@ -29,6 +38,8 @@ import javax.management.openmbean.TabularData; import javax.management.openmbean.TabularDataSupport; +import org.glassfish.admin.amx.util.stringifier.StringifierRegistry; + /** Registers all included stringifiers with the default registry. */ diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/TabularDataStringifier.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/TabularDataStringifier.java index af4f909fbdd..c2a0b34cf6a 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/TabularDataStringifier.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/stringifier/TabularDataStringifier.java @@ -18,6 +18,7 @@ import javax.management.openmbean.CompositeData; import javax.management.openmbean.TabularData; + import org.glassfish.admin.amx.util.stringifier.Stringifier; public class TabularDataStringifier implements Stringifier diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/package-info.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/package-info.java index 7740ad0497d..ff7787d2c73 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/package-info.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/package-info.java @@ -20,8 +20,8 @@ @Taxonomy(stability = Stability.UNCOMMITTED) package org.glassfish.admin.amx.util; -import org.glassfish.external.arc.Taxonomy; import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/stringifier/SmartStringifier.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/stringifier/SmartStringifier.java index 8cce08effdb..11c3cd6cf2d 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/stringifier/SmartStringifier.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/stringifier/SmartStringifier.java @@ -19,6 +19,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.Iterator; + import org.glassfish.admin.amx.util.ArrayConversion; import org.glassfish.admin.amx.util.ClassUtil; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/stringifier/X509CertificateStringifier.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/stringifier/X509CertificateStringifier.java index 2bd6b3a2f87..fe7f3ee68ca 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/stringifier/X509CertificateStringifier.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/stringifier/X509CertificateStringifier.java @@ -16,12 +16,12 @@ package org.glassfish.admin.amx.util.stringifier; -import org.glassfish.admin.amx.util.StringUtil; - import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.cert.X509Certificate; +import org.glassfish.admin.amx.util.StringUtil; + /** * Stringifies an X509CertificateStringifier. */ diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/stringifier/package-info.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/stringifier/package-info.java index 39c312a9772..d79af965de3 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/stringifier/package-info.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/stringifier/package-info.java @@ -17,8 +17,8 @@ @Taxonomy(stability = Stability.UNCOMMITTED) package org.glassfish.admin.amx.util.stringifier; -import org.glassfish.external.arc.Taxonomy; import org.glassfish.external.arc.Stability; +import org.glassfish.external.arc.Taxonomy; diff --git a/nucleus/common/amx-core/src/test/java/org/glassfish/admin/amx/core/UtilTest.java b/nucleus/common/amx-core/src/test/java/org/glassfish/admin/amx/core/UtilTest.java index bb635f75fc6..d1cdd808089 100644 --- a/nucleus/common/amx-core/src/test/java/org/glassfish/admin/amx/core/UtilTest.java +++ b/nucleus/common/amx-core/src/test/java/org/glassfish/admin/amx/core/UtilTest.java @@ -18,11 +18,11 @@ package org.glassfish.admin.amx.core; import org.glassfish.admin.amx.base.DomainRoot; +import org.glassfish.admin.amx.test.AmxTestExtension; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.jupiter.api.extension.ExtendWith; -import org.glassfish.admin.amx.test.AmxTestExtension; @ExtendWith(AmxTestExtension.class) public final class UtilTest { diff --git a/nucleus/common/common-util/src/main/java/com/sun/appserv/server/util/PreprocessorUtil.java b/nucleus/common/common-util/src/main/java/com/sun/appserv/server/util/PreprocessorUtil.java index 2c2c27f1a83..33e924b101c 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/appserv/server/util/PreprocessorUtil.java +++ b/nucleus/common/common-util/src/main/java/com/sun/appserv/server/util/PreprocessorUtil.java @@ -17,10 +17,12 @@ package com.sun.appserv.server.util; import com.sun.enterprise.util.CULoggerInfo; + import java.util.Hashtable; import java.util.logging.Level; import java.util.logging.Logger; -import org.glassfish.api.*; + +import org.glassfish.api.BytecodePreprocessor; /** * PreprocessorUtil is a utility class for managing the bytecode diff --git a/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/BaseCache.java b/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/BaseCache.java index 353d842c605..3f3068936df 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/BaseCache.java +++ b/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/BaseCache.java @@ -17,6 +17,7 @@ package com.sun.appserv.util.cache; import com.sun.enterprise.util.CULoggerInfo; + import java.text.MessageFormat; import java.util.ArrayList; import java.util.Enumeration; diff --git a/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/BoundedMultiLruCache.java b/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/BoundedMultiLruCache.java index 26908330b19..cde64e51087 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/BoundedMultiLruCache.java +++ b/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/BoundedMultiLruCache.java @@ -17,11 +17,11 @@ package com.sun.appserv.util.cache; import com.sun.enterprise.util.CULoggerInfo; -import java.text.MessageFormat; -import java.util.Properties; -import java.util.Map; +import java.text.MessageFormat; import java.util.Locale; +import java.util.Map; +import java.util.Properties; /** * MultiLruCache -- in-memory bounded LRU cache with multiple LRU lists diff --git a/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/Cache.java b/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/Cache.java index bb34ee733af..1bac7ed78c9 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/Cache.java +++ b/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/Cache.java @@ -16,8 +16,8 @@ package com.sun.appserv.util.cache; -import java.util.Iterator; import java.util.Enumeration; +import java.util.Iterator; import java.util.Map; import java.util.Properties; diff --git a/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/MultiLruCache.java b/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/MultiLruCache.java index 3894ef01885..4895b62bf72 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/MultiLruCache.java +++ b/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/MultiLruCache.java @@ -16,8 +16,8 @@ package com.sun.appserv.util.cache; -import java.util.Properties; import java.util.Map; +import java.util.Properties; /** * MultiLruCache -- in-memory bounded LRU cache with multiple LRU lists diff --git a/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/mbeans/JmxLruCache.java b/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/mbeans/JmxLruCache.java index 29d9c2721b7..36b14275864 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/mbeans/JmxLruCache.java +++ b/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/mbeans/JmxLruCache.java @@ -21,8 +21,8 @@ package com.sun.appserv.util.cache.mbeans; -import com.sun.appserv.util.cache.LruCache; import com.sun.appserv.util.cache.Constants; +import com.sun.appserv.util.cache.LruCache; /** * This class provides implementation for JmxLruCache MBean * diff --git a/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/mbeans/JmxMultiLruCache.java b/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/mbeans/JmxMultiLruCache.java index be7db981c46..aa32c6d8599 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/mbeans/JmxMultiLruCache.java +++ b/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/mbeans/JmxMultiLruCache.java @@ -21,8 +21,8 @@ package com.sun.appserv.util.cache.mbeans; -import com.sun.appserv.util.cache.MultiLruCache; import com.sun.appserv.util.cache.Constants; +import com.sun.appserv.util.cache.MultiLruCache; /** * This class provides implementation for JmxLruCache MBean * diff --git a/nucleus/common/common-util/src/main/java/com/sun/common/util/logging/LoggingConfig.java b/nucleus/common/common-util/src/main/java/com/sun/common/util/logging/LoggingConfig.java index 16c3ca018f8..a94d9d9af47 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/common/util/logging/LoggingConfig.java +++ b/nucleus/common/common-util/src/main/java/com/sun/common/util/logging/LoggingConfig.java @@ -17,12 +17,12 @@ package com.sun.common.util.logging; -import org.jvnet.hk2.annotations.Contract; - import java.io.IOException; import java.util.Collection; import java.util.Map; +import org.jvnet.hk2.annotations.Contract; + /** * Interface for Logging Commands * diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/security/store/PasswordAdapter.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/security/store/PasswordAdapter.java index cf8f5610c6d..56d892858d1 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/security/store/PasswordAdapter.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/security/store/PasswordAdapter.java @@ -16,8 +16,6 @@ package com.sun.enterprise.security.store; -import static com.sun.enterprise.util.SystemPropertyConstants.INSTANCE_ROOT_PROPERTY; - import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -33,6 +31,8 @@ import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; +import static com.sun.enterprise.util.SystemPropertyConstants.INSTANCE_ROOT_PROPERTY; + /** * This class implements an adapter for password manipulation a JCEKS. Note that although it uses locks ('synchronized'), it * tends to be created anew with each use, an inefficient and potentially problematic use that could create more than one diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/GFBase64Decoder.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/GFBase64Decoder.java index 49497f8faf0..eeb40e4824f 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/GFBase64Decoder.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/GFBase64Decoder.java @@ -17,7 +17,12 @@ package com.sun.enterprise.universal; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.PushbackInputStream; import java.nio.ByteBuffer; public class GFBase64Decoder { // java.util.Base64 is private constructor and so moving/reusing sun.misc.BASE64Decoder diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/GFBase64Encoder.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/GFBase64Encoder.java index 5dcfb7af8cc..4d7ae75dfa4 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/GFBase64Encoder.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/GFBase64Encoder.java @@ -16,7 +16,12 @@ package com.sun.enterprise.universal; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.PrintStream; import java.nio.ByteBuffer; public class GFBase64Encoder { // java.util.Base64 is private constructor and so moving/reusing sun.misc.BASE64Encoder diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/PropertiesDecoder.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/PropertiesDecoder.java index 02089f5f6aa..4d19ebfe6f7 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/PropertiesDecoder.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/PropertiesDecoder.java @@ -16,7 +16,9 @@ package com.sun.enterprise.universal; -import java.util.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; /** * diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/SystemProps.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/SystemProps.java index 5cc6ba3e70e..c4a3bd674e7 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/SystemProps.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/SystemProps.java @@ -22,10 +22,16 @@ package com.sun.enterprise.universal; -import java.util.*; - import com.sun.enterprise.util.StringUtils; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + /** * * @author bnevins diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/ASenvPropertyReader.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/ASenvPropertyReader.java index 4599283dc98..69590ad6370 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/ASenvPropertyReader.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/ASenvPropertyReader.java @@ -17,11 +17,29 @@ package com.sun.enterprise.universal.glassfish; import com.sun.enterprise.universal.io.SmartFile; -import static com.sun.enterprise.util.SystemPropertyConstants.*; import com.sun.enterprise.util.net.NetUtils; -import java.io.*; -import java.util.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import static com.sun.enterprise.util.SystemPropertyConstants.AGENT_ROOT_PROPERTY; +import static com.sun.enterprise.util.SystemPropertyConstants.CONFIG_ROOT_PROPERTY; +import static com.sun.enterprise.util.SystemPropertyConstants.DERBY_ROOT_PROPERTY; +import static com.sun.enterprise.util.SystemPropertyConstants.DOMAINS_ROOT_PROPERTY; +import static com.sun.enterprise.util.SystemPropertyConstants.HOST_NAME_PROPERTY; +import static com.sun.enterprise.util.SystemPropertyConstants.IMQ_BIN_PROPERTY; +import static com.sun.enterprise.util.SystemPropertyConstants.IMQ_LIB_PROPERTY; +import static com.sun.enterprise.util.SystemPropertyConstants.INSTALL_ROOT_PROPERTY; +import static com.sun.enterprise.util.SystemPropertyConstants.JAVA_ROOT_PROPERTY; +import static com.sun.enterprise.util.SystemPropertyConstants.JAVA_ROOT_PROPERTY_ASENV; +import static com.sun.enterprise.util.SystemPropertyConstants.PRODUCT_ROOT_PROPERTY; +import static com.sun.enterprise.util.SystemPropertyConstants.UNIX_ASENV_FILENAME; +import static com.sun.enterprise.util.SystemPropertyConstants.WINDOWS_ASENV_FILENAME; /** * Class ASenvPropertyReader diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/AdminCommandResponse.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/AdminCommandResponse.java index 0300e48757a..749f43456b8 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/AdminCommandResponse.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/AdminCommandResponse.java @@ -18,9 +18,15 @@ import com.sun.enterprise.universal.NameValue; import com.sun.enterprise.universal.collections.ManifestUtils; -import java.io.*; -import java.util.*; -import java.util.jar.*; + +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.jar.Manifest; /** * Wraps the Manifest object returned by the Server. The Manifest object has diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/GFLauncherUtils.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/GFLauncherUtils.java index 1b374eb7e58..91b7a4b8541 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/GFLauncherUtils.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/GFLauncherUtils.java @@ -16,12 +16,18 @@ package com.sun.enterprise.universal.glassfish; -import com.sun.enterprise.util.net.NetUtils; -import static com.sun.enterprise.util.SystemPropertyConstants.*; import com.sun.enterprise.universal.io.SmartFile; -import java.io.*; -import java.net.*; -import java.util.*; +import com.sun.enterprise.util.net.NetUtils; + +import java.io.File; +import java.net.JarURLConnection; +import java.net.URL; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; + +import static com.sun.enterprise.util.SystemPropertyConstants.INSTALL_ROOT_PROPERTY; /** * Package private static utility methods diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/GFSystem.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/GFSystem.java index 5fbc1d04358..f3a720e30c2 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/GFSystem.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/GFSystem.java @@ -16,7 +16,7 @@ package com.sun.enterprise.universal.glassfish; -import java.util.*; +import java.util.Map; /** * A replacement for System Properties diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/GFSystemImpl.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/GFSystemImpl.java index 88f87eb87a4..7e2cfb77ab2 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/GFSystemImpl.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/GFSystemImpl.java @@ -17,7 +17,9 @@ package com.sun.enterprise.universal.glassfish; import com.sun.enterprise.universal.collections.CollectionUtils; -import java.util.*; + +import java.util.Collections; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/TokenResolver.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/TokenResolver.java index ff9fed484d5..2f2b4cc083b 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/TokenResolver.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/TokenResolver.java @@ -22,9 +22,15 @@ */ package com.sun.enterprise.universal.glassfish; -import java.util.*; import com.sun.enterprise.util.SystemPropertyConstants; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * Here is the contract: * You give me a Map object. diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/process/ProcessStreamDrainerWorker.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/process/ProcessStreamDrainerWorker.java index a8195bd6350..4d141f59db7 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/process/ProcessStreamDrainerWorker.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/process/ProcessStreamDrainerWorker.java @@ -16,7 +16,10 @@ package com.sun.enterprise.universal.process; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintStream; /////////////////////////////////////////////////////////////////////////// diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/xml/ParsedCluster.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/xml/ParsedCluster.java index 75c48eca58d..c1fbe0f3960 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/xml/ParsedCluster.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/xml/ParsedCluster.java @@ -17,8 +17,12 @@ package com.sun.enterprise.universal.xml; import com.sun.enterprise.universal.collections.CollectionUtils; -import java.util.*; + //import static com.sun.enterprise.util.StringUtils.ok; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * Normally I'd have named this class "Cluster" but we don't want it to clash diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/AnnotationUtil.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/AnnotationUtil.java index 517bed901eb..d30ebb96768 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/AnnotationUtil.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/AnnotationUtil.java @@ -17,6 +17,7 @@ package com.sun.enterprise.util; import java.lang.annotation.Annotation; + import org.glassfish.api.admin.ManagedJob; /** Place for handy annotation utils. diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/EarlyLogger.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/EarlyLogger.java index 417e8bbcfac..578f8072f41 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/EarlyLogger.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/EarlyLogger.java @@ -17,9 +17,11 @@ package com.sun.enterprise.util; import com.sun.enterprise.universal.i18n.LocalStringsImpl; -import java.util.*; -import java.util.concurrent.*; -import java.util.logging.*; + +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.logging.Level; +import java.util.logging.Logger; /** * diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/LocalStringManagerImpl.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/LocalStringManagerImpl.java index bb2049ee6fa..3bf5e7cb847 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/LocalStringManagerImpl.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/LocalStringManagerImpl.java @@ -19,8 +19,7 @@ import java.text.MessageFormat; import java.util.Locale; import java.util.ResourceBundle; -import java.util.logging.*; -//END OF IASRI 4660742 +import java.util.logging.Level; /** diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/MapBuilder.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/MapBuilder.java index 022330b8f40..6dcb3e8970e 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/MapBuilder.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/MapBuilder.java @@ -16,8 +16,8 @@ package com.sun.enterprise.util; -import java.util.Map; import java.util.HashMap; +import java.util.Map; /** * Convenience class for building a literal map. diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/OS.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/OS.java index 763826631de..6b12ad26ffe 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/OS.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/OS.java @@ -22,7 +22,7 @@ package com.sun.enterprise.util; -import java.io.*; +import java.io.File; import java.util.Locale; /** diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/ObjectAnalyzer.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/ObjectAnalyzer.java index 9016882059f..13c4998bf10 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/ObjectAnalyzer.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/ObjectAnalyzer.java @@ -21,9 +21,12 @@ package com.sun.enterprise.util; // -import java.lang.reflect.*; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; import java.util.Vector; -import java.util.logging.*; +import java.util.logging.Level; +import java.util.logging.Logger; public class ObjectAnalyzer { /** diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/ProfilerImpl.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/ProfilerImpl.java index 4830ade5162..f78dc56b9df 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/ProfilerImpl.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/ProfilerImpl.java @@ -21,7 +21,9 @@ */ package com.sun.enterprise.util; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; /** Simple class for profiling code. beginItem/endItem pairs start and stop the timing for an item. * diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/SystemPropertyConstants.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/SystemPropertyConstants.java index 8c31643b1ba..7fc7dee7df7 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/SystemPropertyConstants.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/SystemPropertyConstants.java @@ -16,10 +16,10 @@ package com.sun.enterprise.util; -import java.io.File; - import com.sun.enterprise.util.i18n.StringManager; +import java.io.File; + public class SystemPropertyConstants { /** diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/i18n/StringManager.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/i18n/StringManager.java index 9c4cb4af734..553c3f96e71 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/i18n/StringManager.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/i18n/StringManager.java @@ -17,8 +17,8 @@ package com.sun.enterprise.util.i18n; import com.sun.enterprise.util.CULoggerInfo; -import java.util.Hashtable; +import java.util.Hashtable; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/i18n/StringManagerBase.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/i18n/StringManagerBase.java index 60e7180a2d1..fc85cdfdef6 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/i18n/StringManagerBase.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/i18n/StringManagerBase.java @@ -17,6 +17,7 @@ package com.sun.enterprise.util.i18n; import com.sun.enterprise.util.CULoggerInfo; + import java.text.MessageFormat; import java.util.Hashtable; import java.util.Locale; diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/io/DomainDirs.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/io/DomainDirs.java index 89d5e54f434..be1ba3c6452 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/io/DomainDirs.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/io/DomainDirs.java @@ -19,10 +19,11 @@ import com.sun.enterprise.universal.glassfish.ASenvPropertyReader; import com.sun.enterprise.universal.i18n.LocalStringsImpl; import com.sun.enterprise.util.SystemPropertyConstants; + import java.io.File; import java.io.FileFilter; import java.io.IOException; -import java.util.*; +import java.util.Map; /** * A class for keeping track of the directories that a domain lives in and under. diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/io/FileLister.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/io/FileLister.java index 9c2b4865116..83ed7989271 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/io/FileLister.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/io/FileLister.java @@ -21,8 +21,9 @@ */ package com.sun.enterprise.util.io; -import java.io.*; -import java.util.*; +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; /** * diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/io/FileListerRelative.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/io/FileListerRelative.java index f52191edc51..e501d74e85c 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/io/FileListerRelative.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/io/FileListerRelative.java @@ -21,7 +21,7 @@ */ package com.sun.enterprise.util.io; -import java.io.*; +import java.io.File; /** * diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/io/InstanceDirs.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/io/InstanceDirs.java index 25b20308df1..4bc4f7959e7 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/io/InstanceDirs.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/io/InstanceDirs.java @@ -18,10 +18,13 @@ import com.sun.enterprise.util.StringUtils; import com.sun.enterprise.util.SystemPropertyConstants; -import java.io.*; + import java.io.File; +import java.io.FileFilter; import java.io.IOException; +import org.glassfish.api.admin.CommandException; + /** * A class for keeping track of the directories that an instance lives in and under. * All the methods throw checked exception to avoid the inevitable NPE otherwise - diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/net/JarURIPattern.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/net/JarURIPattern.java index de4a6c9fdcd..09e4f86fd67 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/net/JarURIPattern.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/net/JarURIPattern.java @@ -17,6 +17,7 @@ package com.sun.enterprise.util.net; import com.sun.enterprise.util.CULoggerInfo; + import java.io.File; import java.net.URI; import java.util.ArrayList; diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/net/NetUtils.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/net/NetUtils.java index d31d9dcd2d7..ff5d19a5a43 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/net/NetUtils.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/net/NetUtils.java @@ -18,10 +18,26 @@ import com.sun.enterprise.util.CULoggerInfo; import com.sun.enterprise.util.StringUtils; -import java.net.*; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.ConnectException; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.InterfaceAddress; +import java.net.NetworkInterface; +import java.net.ServerSocket; +import java.net.Socket; +import java.net.SocketException; +import java.net.SocketTimeoutException; +import java.net.UnknownHostException; import java.security.SecureRandom; -import java.util.*; -import java.io.*; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.List; +import java.util.Locale; +import java.util.StringTokenizer; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/uuid/UuidUtil.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/uuid/UuidUtil.java index 0088fbb8659..e36955367c2 100755 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/uuid/UuidUtil.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/uuid/UuidUtil.java @@ -23,9 +23,7 @@ package com.sun.enterprise.util.uuid; import java.net.InetAddress; - import java.rmi.server.UID; - import java.security.SecureRandom; /** diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/zip/ZipWriter.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/zip/ZipWriter.java index ecfdda0b883..b4fe44ca965 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/zip/ZipWriter.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/zip/ZipWriter.java @@ -20,7 +20,13 @@ package com.sun.enterprise.util.zip; import com.sun.enterprise.util.io.FileListerRelative; -import java.io.*; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/admin/payload/TextPayloadImpl.java b/nucleus/common/common-util/src/main/java/org/glassfish/admin/payload/TextPayloadImpl.java index 92ab3cb7dbc..5dc7db4748f 100644 --- a/nucleus/common/common-util/src/main/java/org/glassfish/admin/payload/TextPayloadImpl.java +++ b/nucleus/common/common-util/src/main/java/org/glassfish/admin/payload/TextPayloadImpl.java @@ -16,10 +16,11 @@ package org.glassfish.admin.payload; -import org.glassfish.api.admin.*; import java.io.InputStream; import java.util.Iterator; +import org.glassfish.api.admin.Payload; + /** * Implements the Payload API for a message containing only a single text part. *

diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/admin/payload/ZipPayloadImpl.java b/nucleus/common/common-util/src/main/java/org/glassfish/admin/payload/ZipPayloadImpl.java index 48261795422..c56f47d55b9 100644 --- a/nucleus/common/common-util/src/main/java/org/glassfish/admin/payload/ZipPayloadImpl.java +++ b/nucleus/common/common-util/src/main/java/org/glassfish/admin/payload/ZipPayloadImpl.java @@ -27,6 +27,7 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; import java.util.zip.ZipOutputStream; + import org.glassfish.api.admin.Payload; /** diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/NonOSGiObjectInputOutputStreamFactoryImpl.java b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/NonOSGiObjectInputOutputStreamFactoryImpl.java index d2f8e57e528..d271692b680 100644 --- a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/NonOSGiObjectInputOutputStreamFactoryImpl.java +++ b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/NonOSGiObjectInputOutputStreamFactoryImpl.java @@ -16,7 +16,12 @@ package org.glassfish.common.util; -import java.io.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.ObjectStreamClass; +import java.io.OutputStream; /** * @author Sanjeeb.Sahoo@Sun.COM 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 585d73aa7c3..1e558006417 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 @@ -17,10 +17,7 @@ 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 com.sun.enterprise.util.CULoggerInfo; import java.io.IOException; import java.io.InputStream; @@ -41,7 +38,10 @@ import org.osgi.util.tracker.BundleTracker; import org.osgi.util.tracker.BundleTrackerCustomizer; -import com.sun.enterprise.util.CULoggerInfo; +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; /** * @author Sanjeeb.Sahoo@Sun.COM diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/ObjectInputOutputStreamFactory.java b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/ObjectInputOutputStreamFactory.java index 99630b8de42..fcf7726b2b3 100644 --- a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/ObjectInputOutputStreamFactory.java +++ b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/ObjectInputOutputStreamFactory.java @@ -16,7 +16,12 @@ package org.glassfish.common.util; -import java.io.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.ObjectStreamClass; +import java.io.OutputStream; /** * @author Sanjeeb.Sahoo@Sun.COM diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/ObjectInputStreamWithLoader.java b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/ObjectInputStreamWithLoader.java index b2c70c3e8d3..3b80543953d 100644 --- a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/ObjectInputStreamWithLoader.java +++ b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/ObjectInputStreamWithLoader.java @@ -16,11 +16,15 @@ package org.glassfish.common.util; -import org.jvnet.hk2.annotations.Service; - -import java.io.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectStreamClass; +import java.io.StreamCorruptedException; import java.lang.reflect.Array; +import org.jvnet.hk2.annotations.Service; + /** * This subclass of ObjectInputStream delegates loading of classes to * an existing ClassLoader. diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/AdminAuthCallback.java b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/AdminAuthCallback.java index 53ce5eff13d..dc92c173d92 100644 --- a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/AdminAuthCallback.java +++ b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/AdminAuthCallback.java @@ -18,6 +18,7 @@ import javax.security.auth.Subject; import javax.security.auth.callback.Callback; + import org.jvnet.hk2.annotations.Contract; /** diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/AdminAuthenticator.java b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/AdminAuthenticator.java index bce44b89858..6c939e1cbdb 100644 --- a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/AdminAuthenticator.java +++ b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/AdminAuthenticator.java @@ -17,9 +17,11 @@ package org.glassfish.common.util.admin; import java.util.List; + import javax.security.auth.Subject; import javax.security.auth.callback.Callback; import javax.security.auth.login.LoginException; + import org.jvnet.hk2.annotations.Contract; /** diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/AsadminInput.java b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/AsadminInput.java index 39bc80e9b3e..3e9f33933c9 100644 --- a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/AsadminInput.java +++ b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/AsadminInput.java @@ -18,6 +18,7 @@ import com.sun.enterprise.util.LocalStringManager; import com.sun.enterprise.util.LocalStringManagerImpl; + import java.io.BufferedReader; import java.io.FileInputStream; import java.io.IOException; diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/AuthTokenManager.java b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/AuthTokenManager.java index 7b003b11680..f2a69bbd420 100644 --- a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/AuthTokenManager.java +++ b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/AuthTokenManager.java @@ -18,14 +18,18 @@ import com.sun.enterprise.util.CULoggerInfo; import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Singleton; + import java.security.SecureRandom; import java.util.HashMap; import java.util.Iterator; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.inject.Singleton; + import javax.security.auth.Subject; + import org.jvnet.hk2.annotations.Service; /** diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/CommandModelImpl.java b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/CommandModelImpl.java index 824aaca2db5..12ac9fd31f7 100644 --- a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/CommandModelImpl.java +++ b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/CommandModelImpl.java @@ -19,6 +19,7 @@ import com.sun.enterprise.util.AnnotationUtil; import com.sun.enterprise.util.LocalStringManager; import com.sun.enterprise.util.LocalStringManagerImpl; + import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Field; @@ -26,6 +27,7 @@ import java.util.Collection; import java.util.LinkedHashMap; import java.util.Map; + import org.glassfish.api.I18n; import org.glassfish.api.Param; import org.glassfish.api.ParamDefaultCalculator; diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/GenericCommandModel.java b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/GenericCommandModel.java index b025527f187..3fc933be389 100644 --- a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/GenericCommandModel.java +++ b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/GenericCommandModel.java @@ -17,21 +17,22 @@ package org.glassfish.common.util.admin; import com.sun.enterprise.util.LocalStringManager; -import org.glassfish.api.I18n; -import org.glassfish.api.Param; -import org.glassfish.api.admin.ExecuteOn; -import org.glassfish.api.admin.CommandModel; -import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.ConfigBeanProxy; -import org.jvnet.hk2.config.ConfigModel; -import org.jvnet.hk2.config.DomDocument; import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.Collection; import java.util.HashMap; import java.util.Map; + +import org.glassfish.api.I18n; +import org.glassfish.api.Param; import org.glassfish.api.ParamDefaultCalculator; +import org.glassfish.api.admin.CommandModel; +import org.glassfish.api.admin.ExecuteOn; +import org.jvnet.hk2.config.Attribute; +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.ConfigModel; +import org.jvnet.hk2.config.DomDocument; public class GenericCommandModel extends CommandModel { diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/GlassFishErrorServiceImpl.java b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/GlassFishErrorServiceImpl.java index b4ef3141523..d7c4302f280 100644 --- a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/GlassFishErrorServiceImpl.java +++ b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/GlassFishErrorServiceImpl.java @@ -17,6 +17,8 @@ package org.glassfish.common.util.admin; +import com.sun.enterprise.util.FelixPrettyPrinter; + import jakarta.inject.Singleton; import java.util.HashSet; @@ -28,8 +30,6 @@ import org.jvnet.hk2.annotations.Service; import org.osgi.framework.BundleException; -import com.sun.enterprise.util.FelixPrettyPrinter; - /** * @author jwells * diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/HK2BindTracingService.java b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/HK2BindTracingService.java index 07c08a89da5..4e239b1a107 100644 --- a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/HK2BindTracingService.java +++ b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/HK2BindTracingService.java @@ -16,10 +16,10 @@ package org.glassfish.common.util.admin; -import java.util.StringTokenizer; - import jakarta.inject.Singleton; +import java.util.StringTokenizer; + import org.glassfish.hk2.api.ActiveDescriptor; import org.glassfish.hk2.api.Descriptor; import org.glassfish.hk2.api.Filter; diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/ManPageFinder.java b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/ManPageFinder.java index 8dc1847276d..5faa73ecb82 100644 --- a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/ManPageFinder.java +++ b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/ManPageFinder.java @@ -16,19 +16,19 @@ package org.glassfish.common.util.admin; -import java.io.InputStream; -import java.io.Reader; import java.io.BufferedReader; +import java.io.InputStream; import java.io.InputStreamReader; +import java.io.Reader; import java.io.UnsupportedEncodingException; -import java.util.Locale; +import java.util.ArrayList; +import java.util.Collections; import java.util.Iterator; -import java.util.NoSuchElementException; import java.util.List; -import java.util.Collections; -import java.util.ArrayList; -import java.util.logging.Logger; +import java.util.Locale; +import java.util.NoSuchElementException; import java.util.logging.Level; +import java.util.logging.Logger; /** * A utility class that gets the plain text man page for the diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/ManagedFile.java b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/ManagedFile.java index c79ad21c979..685d117c371 100644 --- a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/ManagedFile.java +++ b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/ManagedFile.java @@ -18,6 +18,7 @@ import com.sun.enterprise.util.CULoggerInfo; import com.sun.enterprise.util.LocalStringManagerImpl; + import java.io.File; import java.io.IOException; import java.io.RandomAccessFile; diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/MapInjectionResolver.java b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/MapInjectionResolver.java index ed3e1fca33b..7fdbbe15669 100644 --- a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/MapInjectionResolver.java +++ b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/MapInjectionResolver.java @@ -17,6 +17,7 @@ package org.glassfish.common.util.admin; import com.sun.enterprise.util.LocalStringManagerImpl; + import java.io.File; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Field; @@ -29,6 +30,7 @@ import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; + import org.glassfish.api.ExecutionContext; import org.glassfish.api.Param; import org.glassfish.api.ParamDefaultCalculator; diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/ParamTokenizer.java b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/ParamTokenizer.java index 12ba3e37b2f..ae91669a0c5 100644 --- a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/ParamTokenizer.java +++ b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/ParamTokenizer.java @@ -16,9 +16,10 @@ package org.glassfish.common.util.admin; -import java.util.NoSuchElementException; import com.sun.enterprise.util.LocalStringManagerImpl; +import java.util.NoSuchElementException; + /** * Separate parameters to admin commands into tokens. * Mostly used for parameters that take a list of values diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/ParameterMapExtractor.java b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/ParameterMapExtractor.java index 19035c03ac0..b5b65524941 100644 --- a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/ParameterMapExtractor.java +++ b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/ParameterMapExtractor.java @@ -24,6 +24,7 @@ import java.util.Enumeration; import java.util.List; import java.util.Properties; + import org.glassfish.api.Param; import org.glassfish.api.admin.CommandModel; import org.glassfish.api.admin.ParameterMap; diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/RestSessionManager.java b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/RestSessionManager.java index 897e50de76c..e21e70e0ef4 100644 --- a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/RestSessionManager.java +++ b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/RestSessionManager.java @@ -16,14 +16,17 @@ package org.glassfish.common.util.admin; +import jakarta.inject.Singleton; + import java.math.BigInteger; import java.security.SecureRandom; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; + import javax.security.auth.Subject; + import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Singleton; /** * Manages Rest Sessions. diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/timer/TimerSchedule.java b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/timer/TimerSchedule.java index 5dddfd625fa..f5b9c0c2e97 100755 --- a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/timer/TimerSchedule.java +++ b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/timer/TimerSchedule.java @@ -16,19 +16,19 @@ package org.glassfish.common.util.timer; +import java.io.Serializable; import java.util.ArrayList; +import java.util.BitSet; import java.util.Calendar; import java.util.Collections; -import java.util.BitSet; import java.util.Date; import java.util.GregorianCalendar; -import java.util.TimeZone; import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Locale; +import java.util.Map; +import java.util.TimeZone; import java.util.regex.Pattern; -import java.io.Serializable; /** * This class converts a cron-like string to its internal representation diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/quality/ToDo.java b/nucleus/common/common-util/src/main/java/org/glassfish/quality/ToDo.java index f52143ec66a..95ef730ec38 100644 --- a/nucleus/common/common-util/src/main/java/org/glassfish/quality/ToDo.java +++ b/nucleus/common/common-util/src/main/java/org/glassfish/quality/ToDo.java @@ -16,11 +16,18 @@ package org.glassfish.quality; +import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.CONSTRUCTOR; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.LOCAL_VARIABLE; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PACKAGE; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; /** diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/security/common/CNonceCache.java b/nucleus/common/common-util/src/main/java/org/glassfish/security/common/CNonceCache.java index 8ecdfe73897..a21711c74d0 100644 --- a/nucleus/common/common-util/src/main/java/org/glassfish/security/common/CNonceCache.java +++ b/nucleus/common/common-util/src/main/java/org/glassfish/security/common/CNonceCache.java @@ -17,6 +17,7 @@ package org.glassfish.security.common; import java.util.Map; + import org.jvnet.hk2.annotations.Contract; /** diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/security/common/CipherInfo.java b/nucleus/common/common-util/src/main/java/org/glassfish/security/common/CipherInfo.java index 22ac11fb21f..894ba64a1a7 100644 --- a/nucleus/common/common-util/src/main/java/org/glassfish/security/common/CipherInfo.java +++ b/nucleus/common/common-util/src/main/java/org/glassfish/security/common/CipherInfo.java @@ -18,6 +18,7 @@ import java.util.HashMap; import java.util.Map; + import javax.net.ssl.SSLServerSocketFactory; /** diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/security/common/MasterPassword.java b/nucleus/common/common-util/src/main/java/org/glassfish/security/common/MasterPassword.java index fec03497808..fdec5f4d08a 100644 --- a/nucleus/common/common-util/src/main/java/org/glassfish/security/common/MasterPassword.java +++ b/nucleus/common/common-util/src/main/java/org/glassfish/security/common/MasterPassword.java @@ -18,10 +18,12 @@ package org.glassfish.security.common; import com.sun.enterprise.security.store.PasswordAdapter; + import java.io.IOException; import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; import java.security.cert.CertificateException; + import org.jvnet.hk2.annotations.Contract; /** diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/security/common/SSHA.java b/nucleus/common/common-util/src/main/java/org/glassfish/security/common/SSHA.java index dfb1b53778d..32b715706eb 100644 --- a/nucleus/common/common-util/src/main/java/org/glassfish/security/common/SSHA.java +++ b/nucleus/common/common-util/src/main/java/org/glassfish/security/common/SSHA.java @@ -16,13 +16,13 @@ package org.glassfish.security.common; -import java.io.*; -import java.util.*; -import java.security.*; - -import com.sun.enterprise.util.i18n.StringManager; import com.sun.enterprise.universal.GFBase64Decoder; import com.sun.enterprise.universal.GFBase64Encoder; +import com.sun.enterprise.util.i18n.StringManager; + +import java.io.IOException; +import java.security.MessageDigest; +import java.util.Arrays; /** * Util class for salted SHA processing. diff --git a/nucleus/common/common-util/src/test/java/org/glassfish/common/util/admin/locking/ReadLockTest.java b/nucleus/common/common-util/src/test/java/org/glassfish/common/util/admin/locking/ReadLockTest.java index b40acc258bf..e5590564db2 100644 --- a/nucleus/common/common-util/src/test/java/org/glassfish/common/util/admin/locking/ReadLockTest.java +++ b/nucleus/common/common-util/src/test/java/org/glassfish/common/util/admin/locking/ReadLockTest.java @@ -17,11 +17,6 @@ package org.glassfish.common.util.admin.locking; -import org.glassfish.common.util.admin.ManagedFile; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertTrue; - import java.io.File; import java.io.IOException; import java.net.URISyntaxException; @@ -33,6 +28,11 @@ import java.util.concurrent.Future; import java.util.concurrent.locks.Lock; +import org.glassfish.common.util.admin.ManagedFile; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; + /** * Tests for ManagedFile.accessRead() method * @author Jerome Dochez diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/Absolutized.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/Absolutized.java index ee29da29e58..4c1290639cc 100644 --- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/Absolutized.java +++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/Absolutized.java @@ -16,16 +16,16 @@ package org.glassfish.api; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.SOURCE; - import java.io.File; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.SOURCE; + /** * Used in conjunction with {@link File} or {@link String} that represents a file to indicate that the path is * absolutized. diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/I18n.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/I18n.java index 44f135ec3c8..84ce6f33ccf 100644 --- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/I18n.java +++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/I18n.java @@ -16,14 +16,14 @@ package org.glassfish.api; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - /** * Identify an I18n resource associated with the annotated element. The value() holds the name of the resource as it * stored in the LocalStrings.properties and can be used by the runtime to generate appropriate localized meta-data. diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/Param.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/Param.java index 813d477fe07..d3e8ce8b6d8 100644 --- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/Param.java +++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/Param.java @@ -16,13 +16,13 @@ package org.glassfish.api; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - /** * Param is a parameter to a command. This annotation can be placed on a field or setter method to identify the * parameters of a command and have those parameters injected by the system before the command is executed. diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/StartupRunLevel.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/StartupRunLevel.java index d1fe497b071..543c45db31a 100644 --- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/StartupRunLevel.java +++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/StartupRunLevel.java @@ -16,15 +16,15 @@ package org.glassfish.api; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import org.glassfish.hk2.runlevel.RunLevel; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + /** * The meta annotation representing the Startup RunLevel. * diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/UnknownOptionsAreOperands.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/UnknownOptionsAreOperands.java index 00682845730..0484b18fd5f 100644 --- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/UnknownOptionsAreOperands.java +++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/UnknownOptionsAreOperands.java @@ -16,12 +16,12 @@ package org.glassfish.api; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - import java.lang.annotation.Retention; import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + /** * If this annotation is applied to a command class, the asadmin client will treat any unknown option on the command * line as the start of the operands. This is used by the create-jvm-options and delete-jvm-options commands so that diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/AdminCommandLock.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/AdminCommandLock.java index ba09c0411cc..0850256b0fd 100644 --- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/AdminCommandLock.java +++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/AdminCommandLock.java @@ -17,6 +17,9 @@ package org.glassfish.api.admin; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import java.util.Date; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; @@ -29,9 +32,6 @@ import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import jakarta.inject.Singleton; - /** * The implementation of the admin command lock. * diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/RestEndpoints.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/RestEndpoints.java index 9749b5c16f4..5aa895af0cf 100644 --- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/RestEndpoints.java +++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/RestEndpoints.java @@ -16,11 +16,11 @@ package org.glassfish.api.admin; +import jakarta.inject.Qualifier; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import jakarta.inject.Qualifier; - /** * * @author Jason Lee diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/Supplemental.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/Supplemental.java index e32eaa397f4..f12b6c01f59 100755 --- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/Supplemental.java +++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/Supplemental.java @@ -16,6 +16,8 @@ package org.glassfish.api.admin; +import jakarta.inject.Qualifier; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -23,8 +25,6 @@ import org.glassfish.hk2.api.Metadata; -import jakarta.inject.Qualifier; - /** * Annotation to define a supplemental command * diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/TargetBasedExecutor.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/TargetBasedExecutor.java index d378d5bd4a3..c42aaf63f96 100644 --- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/TargetBasedExecutor.java +++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/TargetBasedExecutor.java @@ -16,12 +16,12 @@ package org.glassfish.api.admin; -import org.glassfish.api.ActionReport; -import org.jvnet.hk2.annotations.Service; - import jakarta.inject.Inject; import jakarta.inject.Named; +import org.glassfish.api.ActionReport; +import org.jvnet.hk2.annotations.Service; + /** * Convenience implementation that delegate to a provided system executor. This provider will be looked up from the * habitat by its type ClusterExecutor and the "target" name. diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/config/PropertiesDesc.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/config/PropertiesDesc.java index 3bcbb5c50e5..9545965de9a 100644 --- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/config/PropertiesDesc.java +++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/config/PropertiesDesc.java @@ -16,13 +16,13 @@ package org.glassfish.api.admin.config; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + /** * Annotation that holds an array of {@link PropertyDesc} for properties eg {@link org.jvnet.hk2.config.types.Property}. * Needed because it's not otherwise possible to have more than one annotation of the same type. diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/config/PropertyDesc.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/config/PropertyDesc.java index c8fa6c6e4c9..a1bb1b29a06 100644 --- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/config/PropertyDesc.java +++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/config/PropertyDesc.java @@ -16,15 +16,15 @@ package org.glassfish.api.admin.config; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.SOURCE; - import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; import org.jvnet.hk2.config.DataType; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.SOURCE; + /** * Describes properties or system properties that might exist as sub-elements. */ diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/progress/JobInfo.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/progress/JobInfo.java index 8339ef3d14f..00acbf75912 100644 --- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/progress/JobInfo.java +++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/progress/JobInfo.java @@ -16,12 +16,12 @@ package org.glassfish.api.admin.progress; -import java.io.File; - import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlTransient; import jakarta.xml.bind.annotation.XmlType; +import java.io.File; + /** * This class contains information related to a job which will be persisted to jobs.xml * diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/progress/JobInfos.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/progress/JobInfos.java index 434072e0a34..c58c30e0a9f 100644 --- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/progress/JobInfos.java +++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/admin/progress/JobInfos.java @@ -16,12 +16,12 @@ package org.glassfish.api.admin.progress; -import java.util.ArrayList; -import java.util.List; - import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlRootElement; +import java.util.ArrayList; +import java.util.List; + /** * This class contains information of all the jobs which will be persisted to jobs.xml * diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/container/Sniffer.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/container/Sniffer.java index 27eb3667859..08c8c8c2f69 100644 --- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/container/Sniffer.java +++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/container/Sniffer.java @@ -17,6 +17,8 @@ package org.glassfish.api.container; +import com.sun.enterprise.module.HK2Module; + import java.io.IOException; import java.lang.annotation.Annotation; import java.util.Map; @@ -27,8 +29,6 @@ import org.glassfish.api.deployment.archive.ReadableArchive; import org.jvnet.hk2.annotations.Contract; -import com.sun.enterprise.module.HK2Module; - /** * A sniffer implementation is responsible for identifying a particular application type and/or a particular file type. * diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/deployment/archive/ArchiveDetector.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/deployment/archive/ArchiveDetector.java index 3794fc3e47a..06160a4cd98 100644 --- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/deployment/archive/ArchiveDetector.java +++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/deployment/archive/ArchiveDetector.java @@ -16,12 +16,12 @@ package org.glassfish.api.deployment.archive; +import jakarta.inject.Singleton; + import java.io.IOException; import org.jvnet.hk2.annotations.Contract; -import jakarta.inject.Singleton; - /** * {@link ArchiveHandler}s are considered part of container implementation, hence are not available until the * corresponding container is setup. On the other hand, ArchiveDetectors are pretty light weight and used for selecting diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/naming/NamespacePrefixes.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/naming/NamespacePrefixes.java index 2c317ede85e..1ec1d72506d 100644 --- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/naming/NamespacePrefixes.java +++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/naming/NamespacePrefixes.java @@ -16,7 +16,7 @@ package org.glassfish.api.naming; -import static java.lang.annotation.RetentionPolicy.RUNTIME; +import jakarta.inject.Qualifier; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -25,7 +25,7 @@ import org.glassfish.hk2.api.Metadata; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Qualifier; +import static java.lang.annotation.RetentionPolicy.RUNTIME; /** * Goes with {@link Service} annotation on a {@link NamedNamingObjectProxy}. Using this annotation a diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/naming/SimpleJndiName.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/naming/SimpleJndiName.java index c0d24dea537..be12b1ba614 100644 --- a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/naming/SimpleJndiName.java +++ b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/naming/SimpleJndiName.java @@ -17,6 +17,7 @@ package org.glassfish.api.naming; import java.io.Serializable; + import javax.naming.CompositeName; import javax.naming.InvalidNameException; import javax.naming.Name; diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/AdminAccessController.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/AdminAccessController.java index 6b20f242ae5..45eed36cdd4 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/AdminAccessController.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/AdminAccessController.java @@ -18,6 +18,7 @@ import javax.security.auth.Subject; import javax.security.auth.login.LoginException; + import org.glassfish.grizzly.http.server.Request; import org.jvnet.hk2.annotations.Contract; diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/ClassLoaderHierarchy.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/ClassLoaderHierarchy.java index 421f5b829b8..482ee3368cf 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/ClassLoaderHierarchy.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/ClassLoaderHierarchy.java @@ -17,14 +17,14 @@ package org.glassfish.internal.api; -import org.glassfish.api.deployment.DeploymentContext; -import org.jvnet.hk2.annotations.Contract; +import com.sun.enterprise.module.ResolveError; -import java.net.URI; import java.net.MalformedURLException; +import java.net.URI; import java.util.List; -import com.sun.enterprise.module.ResolveError; +import org.glassfish.api.deployment.DeploymentContext; +import org.jvnet.hk2.annotations.Contract; /** * This class is responsible for creation of class loader hierarchy diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/DelegatingClassLoader.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/DelegatingClassLoader.java index 4aca781c376..2b0de80a8ac 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/DelegatingClassLoader.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/DelegatingClassLoader.java @@ -19,11 +19,11 @@ import com.sun.enterprise.module.common_impl.CompositeEnumeration; -import java.util.List; +import java.io.IOException; +import java.net.URL; import java.util.ArrayList; import java.util.Enumeration; -import java.net.URL; -import java.io.IOException; +import java.util.List; import java.util.Objects; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/DomainUpgrade.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/DomainUpgrade.java index 88dd77bd5f2..808f31e85e4 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/DomainUpgrade.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/DomainUpgrade.java @@ -16,7 +16,7 @@ package org.glassfish.internal.api; -import org.jvnet.hk2.annotations.*; +import org.jvnet.hk2.annotations.Contract; /** * Such service implementations are invoked when the domain directory diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/EmbeddedSystemAdministrator.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/EmbeddedSystemAdministrator.java index 73b560aaeeb..b07dbd04c97 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/EmbeddedSystemAdministrator.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/EmbeddedSystemAdministrator.java @@ -17,6 +17,7 @@ package org.glassfish.internal.api; import javax.security.auth.Subject; + import org.jvnet.hk2.annotations.Service; /** diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/Globals.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/Globals.java index f9cd1a70935..0b139ddb1eb 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/Globals.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/Globals.java @@ -17,10 +17,6 @@ package org.glassfish.internal.api; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.hk2.runlevel.RunLevel; -import org.jvnet.hk2.annotations.Service; - import com.sun.enterprise.config.serverbeans.ConfigBeansUtilities; import com.sun.enterprise.module.ModulesRegistry; import com.sun.enterprise.module.single.StaticModulesRegistry; @@ -28,6 +24,10 @@ import jakarta.inject.Inject; import jakarta.inject.Singleton; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.hk2.runlevel.RunLevel; +import org.jvnet.hk2.annotations.Service; + /** * Very sensitive class, anything stored here cannot be garbage collected * diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/InitRunLevel.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/InitRunLevel.java index 874f0d5eed4..63c600a21fc 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/InitRunLevel.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/InitRunLevel.java @@ -16,15 +16,15 @@ package org.glassfish.internal.api; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import org.glassfish.hk2.runlevel.RunLevel; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + /** * The meta annotation representing the Init RunLevel. * diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/InternalSystemAdministrator.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/InternalSystemAdministrator.java index e062a1de7b1..cb3b4ca8cd1 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/InternalSystemAdministrator.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/InternalSystemAdministrator.java @@ -17,6 +17,7 @@ package org.glassfish.internal.api; import javax.security.auth.Subject; + import org.jvnet.hk2.annotations.Contract; /** diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/LocalPassword.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/LocalPassword.java index b1f9ae0acfc..54b9d904580 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/LocalPassword.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/LocalPassword.java @@ -16,7 +16,7 @@ package org.glassfish.internal.api; -import org.jvnet.hk2.annotations.*; +import org.jvnet.hk2.annotations.Contract; /** * Manage a local password, which is a cryptographically secure random number diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/PostStartupRunLevel.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/PostStartupRunLevel.java index ef81c726317..237ca541534 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/PostStartupRunLevel.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/PostStartupRunLevel.java @@ -16,15 +16,15 @@ package org.glassfish.internal.api; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import org.glassfish.hk2.runlevel.RunLevel; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + /** * The meta annotation representing the {@link PostStartup} RunLevel. * diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/RelativePathResolver.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/RelativePathResolver.java index 5ed438db64f..5da7e56a354 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/RelativePathResolver.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/RelativePathResolver.java @@ -19,6 +19,7 @@ import com.sun.enterprise.security.store.DomainScopedPasswordAliasStore; import com.sun.enterprise.util.i18n.StringManager; import com.sun.enterprise.util.i18n.StringManagerBase; + import java.io.File; import java.io.IOException; import java.security.KeyStoreException; @@ -27,6 +28,7 @@ import java.security.cert.CertificateException; import java.util.logging.Level; import java.util.logging.Logger; + import org.glassfish.api.admin.PasswordAliasStore; /** diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/ServerContext.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/ServerContext.java index de9d8bdd940..10de187ea26 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/ServerContext.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/ServerContext.java @@ -16,12 +16,13 @@ package org.glassfish.internal.api; -import org.jvnet.hk2.annotations.Contract; -import org.glassfish.api.invocation.InvocationManager; -import org.glassfish.hk2.api.ServiceLocator; +import java.io.File; import javax.naming.InitialContext; -import java.io.File; + +import org.glassfish.api.invocation.InvocationManager; +import org.glassfish.hk2.api.ServiceLocator; +import org.jvnet.hk2.annotations.Contract; /** * ServerContext interface: the server-wide runtime environment created by diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/Target.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/Target.java index 99bb910eea1..9b1751388f9 100755 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/Target.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/Target.java @@ -16,16 +16,22 @@ package org.glassfish.internal.api; -import com.sun.enterprise.config.serverbeans.*; -import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.config.support.CommandTarget; -import org.glassfish.hk2.api.ServiceLocator; -import org.jvnet.hk2.annotations.Service; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Node; +import com.sun.enterprise.config.serverbeans.Server; import jakarta.inject.Inject; + import java.util.ArrayList; import java.util.List; +import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.config.support.CommandTarget; +import org.glassfish.hk2.api.ServiceLocator; +import org.jvnet.hk2.annotations.Service; + @Service public class Target { @Inject diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/UndoableCommand.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/UndoableCommand.java index e6897201a6d..74d0e237114 100755 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/UndoableCommand.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/UndoableCommand.java @@ -17,11 +17,16 @@ package org.glassfish.internal.api; import com.sun.enterprise.config.serverbeans.Server; -import org.glassfish.api.ActionReport; -import org.glassfish.api.admin.*; import java.util.List; +import org.glassfish.api.ActionReport; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.FailurePolicy; +import org.glassfish.api.admin.IfFailure; +import org.glassfish.api.admin.ParameterMap; + /** * Interface that augment the AdminCommand responsibilities by adding the ability * to undo a previously successful execution of an administrative command. diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/events/CommandInvokedEvent.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/events/CommandInvokedEvent.java index be135a315bf..6836c55a179 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/events/CommandInvokedEvent.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/events/CommandInvokedEvent.java @@ -16,9 +16,12 @@ package org.glassfish.internal.api.events; import java.util.Optional; + import javax.security.auth.Subject; + import org.glassfish.api.admin.ParameterMap; import org.glassfish.hk2.api.messaging.MessageReceiver; +import org.glassfish.hk2.api.messaging.SubscribeTo; import org.glassfish.security.common.UserPrincipal; /** diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/events/InvokeEventService.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/events/InvokeEventService.java index 25ac63d1eb3..bea03c079c7 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/events/InvokeEventService.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/api/events/InvokeEventService.java @@ -16,6 +16,7 @@ package org.glassfish.internal.api.events; import jakarta.inject.Inject; + import org.glassfish.hk2.api.messaging.Topic; import org.glassfish.internal.api.Globals; import org.jvnet.hk2.annotations.Service; diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/config/UnprocessedConfigListener.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/config/UnprocessedConfigListener.java index 3a599e91e8a..519bf0a8ce7 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/config/UnprocessedConfigListener.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/config/UnprocessedConfigListener.java @@ -16,20 +16,20 @@ package org.glassfish.internal.config; -import org.jvnet.hk2.annotations.Service; +import jakarta.inject.Inject; + +import java.beans.PropertyChangeEvent; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import org.glassfish.hk2.api.PostConstruct; import org.glassfish.hk2.runlevel.RunLevel; +import org.glassfish.internal.api.PostStartupRunLevel; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.TransactionListener; import org.jvnet.hk2.config.Transactions; import org.jvnet.hk2.config.UnprocessedChangeEvents; -import java.beans.PropertyChangeEvent; - -import org.glassfish.internal.api.*; - -import jakarta.inject.Inject; -import java.util.List; -import java.util.ArrayList; -import java.util.Collections; /** Listens for unprocessed config changes diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/ApplicationRegistry.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/ApplicationRegistry.java index 110c82c25fe..1b15a4bbbcd 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/ApplicationRegistry.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/ApplicationRegistry.java @@ -17,14 +17,14 @@ package org.glassfish.internal.data; +import jakarta.inject.Singleton; + import java.util.HashMap; import java.util.Map; import java.util.Set; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Singleton; - /** * Registry for deployed Applications * diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/ContainerRegistry.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/ContainerRegistry.java index cabe77b66bc..799549dd15e 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/ContainerRegistry.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/ContainerRegistry.java @@ -17,6 +17,9 @@ package org.glassfish.internal.data; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -26,9 +29,6 @@ import org.glassfish.hk2.api.ServiceLocator; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import jakarta.inject.Singleton; - /** * The container Registry holds references to the currently running containers. * diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/EngineInfo.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/EngineInfo.java index a4fffe1d46b..9ad54b31687 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/EngineInfo.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/EngineInfo.java @@ -17,8 +17,6 @@ package org.glassfish.internal.data; -import static java.util.logging.Level.FINE; - import java.util.logging.Logger; import org.glassfish.api.container.Container; @@ -28,6 +26,8 @@ import org.glassfish.hk2.api.ServiceHandle; import org.glassfish.internal.deployment.ExtendedDeploymentContext; +import static java.util.logging.Level.FINE; + /** * This class holds information about a particular container such as a reference to the sniffer, the container itself * and the list of applications deployed in that container. diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/EngineRef.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/EngineRef.java index 5a6e647ed5b..c686ec9b526 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/EngineRef.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/EngineRef.java @@ -17,7 +17,8 @@ package org.glassfish.internal.data; -import static java.util.logging.Level.WARNING; +import com.sun.enterprise.config.serverbeans.ApplicationConfig; +import com.sun.enterprise.config.serverbeans.Engine; import java.beans.PropertyVetoException; @@ -28,8 +29,7 @@ import org.glassfish.internal.deployment.ExtendedDeploymentContext; import org.jvnet.hk2.config.TransactionFailure; -import com.sun.enterprise.config.serverbeans.ApplicationConfig; -import com.sun.enterprise.config.serverbeans.Engine; +import static java.util.logging.Level.WARNING; /** * When a module is attached to a LoadedEngine, it creates an Engine reference. Each module of an application can be diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/ProgressTracker.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/ProgressTracker.java index 2c2b1c692a3..bc5e8a3ee06 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/ProgressTracker.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/data/ProgressTracker.java @@ -17,14 +17,14 @@ package org.glassfish.internal.data; -import static java.util.Collections.emptyList; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.logging.Logger; +import static java.util.Collections.emptyList; + /** * Simple tracker objects to remember what operations were performed * diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/ApplicationInfoProvider.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/ApplicationInfoProvider.java index 323ed97baf7..9ac6ebadba3 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/ApplicationInfoProvider.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/ApplicationInfoProvider.java @@ -16,9 +16,9 @@ package org.glassfish.internal.deployment; -import org.jvnet.hk2.annotations.Contract; -import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.api.deployment.DeploymentContext; +import org.glassfish.api.deployment.archive.ReadableArchive; +import org.jvnet.hk2.annotations.Contract; @Contract public interface ApplicationInfoProvider { diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/Deployment.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/Deployment.java index 637f7bf1c90..6ee909afd1d 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/Deployment.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/Deployment.java @@ -17,6 +17,9 @@ package org.glassfish.internal.deployment; +import com.sun.enterprise.config.serverbeans.Application; +import com.sun.enterprise.config.serverbeans.ApplicationRef; + import java.io.File; import java.io.IOException; import java.util.Collection; @@ -42,9 +45,6 @@ import org.jvnet.hk2.config.Transaction; import org.jvnet.hk2.config.TransactionFailure; -import com.sun.enterprise.config.serverbeans.Application; -import com.sun.enterprise.config.serverbeans.ApplicationRef; - /** * Deployment facility * diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/DeploymentOrder.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/DeploymentOrder.java index 12bbb97e88c..3da7b325e91 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/DeploymentOrder.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/DeploymentOrder.java @@ -16,13 +16,13 @@ package org.glassfish.internal.deployment; -import java.util.Iterator; +import com.sun.enterprise.config.serverbeans.Application; + +import java.util.ArrayList; import java.util.Comparator; -import java.util.TreeSet; +import java.util.Iterator; import java.util.List; -import java.util.ArrayList; - -import com.sun.enterprise.config.serverbeans.Application; +import java.util.TreeSet; public class DeploymentOrder { diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/DeploymentTargetResolver.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/DeploymentTargetResolver.java index 2bda39f2144..7934d0eb057 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/DeploymentTargetResolver.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/DeploymentTargetResolver.java @@ -16,8 +16,8 @@ package org.glassfish.internal.deployment; -import org.jvnet.hk2.annotations.Contract; import org.glassfish.api.admin.ParameterMap; +import org.jvnet.hk2.annotations.Contract; @Contract public interface DeploymentTargetResolver { diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/DeploymentType.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/DeploymentType.java index b9df05b290e..060f9945fa1 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/DeploymentType.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/DeploymentType.java @@ -16,10 +16,10 @@ package org.glassfish.internal.deployment; -import java.util.Comparator; - import com.sun.enterprise.config.serverbeans.ServerTags; +import java.util.Comparator; + /** * DeploymentType defines the various deployment entity types, * and deployment ordering within the types. diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/ExtendedDeploymentContext.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/ExtendedDeploymentContext.java index 84e6ab0eb7c..32c5180799a 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/ExtendedDeploymentContext.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/ExtendedDeploymentContext.java @@ -17,11 +17,6 @@ package org.glassfish.internal.deployment; -import org.glassfish.api.deployment.DeploymentContext; -import org.glassfish.api.deployment.archive.ArchiveHandler; -import org.glassfish.api.deployment.archive.ReadableArchive; -import org.glassfish.internal.api.ClassLoaderHierarchy; - import java.io.File; import java.io.IOException; import java.net.MalformedURLException; @@ -29,6 +24,11 @@ import java.util.Map; import java.util.Properties; +import org.glassfish.api.deployment.DeploymentContext; +import org.glassfish.api.deployment.archive.ArchiveHandler; +import org.glassfish.api.deployment.archive.ReadableArchive; +import org.glassfish.internal.api.ClassLoaderHierarchy; + /** * Semi-private interface to the deployment context. * diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/GenericDeployer.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/GenericDeployer.java index b0efa12df29..eebc9dd8fba 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/GenericDeployer.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/GenericDeployer.java @@ -16,8 +16,10 @@ package org.glassfish.internal.deployment; -import org.glassfish.api.deployment.*; import org.glassfish.api.container.Container; +import org.glassfish.api.deployment.Deployer; +import org.glassfish.api.deployment.DeploymentContext; +import org.glassfish.api.deployment.MetaData; import org.jvnet.hk2.annotations.Service; /** diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/EmbeddedContainer.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/EmbeddedContainer.java index edb257a4d46..087675ffd32 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/EmbeddedContainer.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/EmbeddedContainer.java @@ -16,11 +16,11 @@ package org.glassfish.internal.embedded; +import java.util.List; + import org.glassfish.api.container.Sniffer; import org.jvnet.hk2.annotations.Contract; -import java.util.List; - /** * Embedded container definition, although most containers will be bound * to a {@link Port} instance, it's not automatic, for instance JPA and diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/EmbeddedDeployer.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/EmbeddedDeployer.java index f6595e9122a..61ad93cb6f9 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/EmbeddedDeployer.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/EmbeddedDeployer.java @@ -16,12 +16,13 @@ package org.glassfish.internal.embedded; +import java.io.File; + +import org.glassfish.api.deployment.DeployCommandParameters; +import org.glassfish.api.deployment.UndeployCommandParameters; import org.glassfish.api.deployment.archive.ReadableArchive; -import org.glassfish.api.deployment.*; import org.jvnet.hk2.annotations.Contract; -import java.io.File; - /** * Service to deploy applications to the embedded server. * diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/EmbeddedFileSystem.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/EmbeddedFileSystem.java index 51f1c500671..ce79820796f 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/EmbeddedFileSystem.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/EmbeddedFileSystem.java @@ -16,10 +16,10 @@ package org.glassfish.internal.embedded; -import org.glassfish.hk2.api.PreDestroy; - import java.io.File; -import java.util.logging.*; +import java.util.logging.Logger; + +import org.glassfish.hk2.api.PreDestroy; /** * Abstraction for a virtual filesystem that be used by the server to store important files. diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/Ports.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/Ports.java index fe76b9bf6f8..67f50f3b0b7 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/Ports.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/Ports.java @@ -16,11 +16,11 @@ package org.glassfish.internal.embedded; -import org.jvnet.hk2.annotations.Contract; - import java.io.IOException; import java.util.Collection; +import org.jvnet.hk2.annotations.Contract; + /** * Management interfaces for all embedded ports * diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/ScatteredArchive.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/ScatteredArchive.java index 4b09c3f515a..2713d82aa6d 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/ScatteredArchive.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/ScatteredArchive.java @@ -16,18 +16,28 @@ package org.glassfish.internal.embedded; -import org.glassfish.api.deployment.archive.ReadableArchiveAdapter; - -import java.io.*; -import java.net.URL; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; -import java.net.MalformedURLException; -import java.util.*; -import java.util.jar.Manifest; +import java.net.URL; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Vector; +import java.util.jar.JarEntry; import java.util.jar.JarFile; +import java.util.jar.Manifest; import java.util.zip.ZipEntry; -import java.util.jar.JarEntry; + +import org.glassfish.api.deployment.archive.ReadableArchiveAdapter; /** * Abstraction for a scattered archive (parts disseminated in various directories) diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/admin/AdminInfo.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/admin/AdminInfo.java index e47fd5572b5..ac8e52ed92c 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/admin/AdminInfo.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/admin/AdminInfo.java @@ -16,12 +16,12 @@ package org.glassfish.internal.embedded.admin; +import jakarta.inject.Inject; + import org.glassfish.internal.embedded.ContainerBuilder; import org.glassfish.internal.embedded.Server; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; - /** * So far, the admin container does not require much configuration but we * could imagine that it will eventually support configuring wether or not diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/admin/CommandParameters.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/admin/CommandParameters.java index 79842b0065d..759581845c8 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/admin/CommandParameters.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/admin/CommandParameters.java @@ -16,7 +16,9 @@ package org.glassfish.internal.embedded.admin; -import java.util.*; +import java.util.ArrayList; +import java.util.List; + import org.glassfish.api.admin.ParameterMap; /** diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/grizzly/GrizzlyContainer.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/grizzly/GrizzlyContainer.java index ceb58c84926..71b940c8d49 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/grizzly/GrizzlyContainer.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/grizzly/GrizzlyContainer.java @@ -16,9 +16,9 @@ package org.glassfish.internal.embedded.grizzly; +import org.glassfish.api.container.Adapter; import org.glassfish.internal.embedded.EmbeddedContainer; import org.glassfish.internal.embedded.Port; -import org.glassfish.api.container.Adapter; /** * Grizzly container, should probably be implemented using the GrizzlyWebServer object. diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/grizzly/GrizzlyInfo.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/grizzly/GrizzlyInfo.java index e77533029ee..710ce08f1c1 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/grizzly/GrizzlyInfo.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/grizzly/GrizzlyInfo.java @@ -16,10 +16,10 @@ package org.glassfish.internal.embedded.grizzly; -import org.glassfish.internal.embedded.ContainerBuilder; - import java.util.Properties; +import org.glassfish.internal.embedded.ContainerBuilder; + /** * */ diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/grizzly/V3Mapper.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/grizzly/V3Mapper.java index 7572b58f885..bb48b4712ed 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/grizzly/V3Mapper.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/grizzly/V3Mapper.java @@ -19,8 +19,8 @@ import java.util.logging.Level; import java.util.logging.Logger; -import org.glassfish.grizzly.http.server.naming.NamingContext; +import org.glassfish.grizzly.http.server.naming.NamingContext; import org.glassfish.grizzly.http.server.util.Mapper; import org.jvnet.hk2.annotations.ContractsProvided; import org.jvnet.hk2.annotations.Service; diff --git a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/AMXStartupServiceMBean.java b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/AMXStartupServiceMBean.java index b42244296f8..80d9f33fad9 100644 --- a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/AMXStartupServiceMBean.java +++ b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/AMXStartupServiceMBean.java @@ -21,7 +21,6 @@ import org.glassfish.api.amx.AMXLoader; import org.glassfish.external.amx.AMXUtil; - import org.jvnet.hk2.annotations.Contract; /** diff --git a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/AdminAuthorizedMBeanServer.java b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/AdminAuthorizedMBeanServer.java index bad26ad0747..96953188cb9 100644 --- a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/AdminAuthorizedMBeanServer.java +++ b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/AdminAuthorizedMBeanServer.java @@ -26,10 +26,19 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import javax.management.*; + +import javax.management.InstanceNotFoundException; +import javax.management.IntrospectionException; +import javax.management.MBeanInfo; +import javax.management.MBeanOperationInfo; +import javax.management.MBeanParameterInfo; +import javax.management.MBeanServer; +import javax.management.ObjectName; +import javax.management.ReflectionException; import javax.management.remote.MBeanServerForwarder; -import org.glassfish.internal.api.AdminAccessController; + import org.glassfish.external.amx.AMXGlassfish; +import org.glassfish.internal.api.AdminAccessController; import org.glassfish.logging.annotation.LogMessageInfo; /** diff --git a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/BootAMXListener.java b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/BootAMXListener.java index c90f32e833d..dfe2591a177 100644 --- a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/BootAMXListener.java +++ b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/BootAMXListener.java @@ -18,11 +18,13 @@ import java.util.logging.Level; import java.util.logging.Logger; + import javax.management.ListenerNotFoundException; import javax.management.Notification; import javax.management.NotificationListener; import javax.management.remote.JMXConnectionNotification; import javax.management.remote.JMXConnectorServer; + import org.glassfish.external.amx.BootAMXMBean; import org.glassfish.logging.annotation.LogMessageInfo; diff --git a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ConnectorStarter.java b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ConnectorStarter.java index 3c2a5b5627d..acc1454a535 100644 --- a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ConnectorStarter.java +++ b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ConnectorStarter.java @@ -16,15 +16,16 @@ package org.glassfish.admin.mbeanserver; -import org.glassfish.hk2.api.ServiceLocator; +import java.io.IOException; +import java.net.UnknownHostException; import javax.management.MBeanServer; import javax.management.remote.JMXAuthenticator; import javax.management.remote.JMXConnectorServer; import javax.management.remote.JMXServiceURL; import javax.security.auth.Subject; -import java.io.IOException; -import java.net.UnknownHostException; + +import org.glassfish.hk2.api.ServiceLocator; /** Start and stop JMX connectors, base class. diff --git a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/JMXSslConfigHolder.java b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/JMXSslConfigHolder.java index fb863c6fdf9..0b3c593efe5 100644 --- a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/JMXSslConfigHolder.java +++ b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/JMXSslConfigHolder.java @@ -16,9 +16,10 @@ package org.glassfish.admin.mbeanserver; -import org.glassfish.grizzly.config.dom.Ssl; import javax.net.ssl.SSLException; + import org.glassfish.grizzly.config.SSLConfigurator; +import org.glassfish.grizzly.config.dom.Ssl; import org.glassfish.hk2.api.ServiceLocator; /** diff --git a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/JMXStartupService.java b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/JMXStartupService.java index bf540036bb3..3ad40345697 100644 --- a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/JMXStartupService.java +++ b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/JMXStartupService.java @@ -17,51 +17,42 @@ package org.glassfish.admin.mbeanserver; -import java.util.logging.Level; -import java.util.logging.Logger; +import com.sun.enterprise.config.serverbeans.AdminService; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.JmxConnector; + import jakarta.inject.Inject; import jakarta.inject.Named; -import javax.management.InstanceNotFoundException; -import javax.management.MBeanRegistrationException; -import org.glassfish.hk2.runlevel.RunLevel; -import org.jvnet.hk2.annotations.Service; +import java.io.IOException; +import java.lang.management.ManagementFactory; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.management.InstanceNotFoundException; +import javax.management.JMException; +import javax.management.MBeanRegistrationException; import javax.management.MBeanServer; import javax.management.ObjectName; - -import org.glassfish.external.amx.BootAMXMBean; - -import org.glassfish.hk2.api.PostConstruct; -import org.glassfish.hk2.api.ServiceLocator; - -import java.util.List; -import java.util.ArrayList; - -import java.lang.management.ManagementFactory; - -import com.sun.enterprise.config.serverbeans.AdminService; -import com.sun.enterprise.config.serverbeans.JmxConnector; -import com.sun.enterprise.config.serverbeans.Domain; - -import org.glassfish.grizzly.config.dom.Ssl; - import javax.management.remote.JMXConnectorServer; import javax.management.remote.JMXServiceURL; - -import java.io.IOException; -import java.util.Set; -import javax.management.JMException; -import org.glassfish.api.admin.*; - +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.api.event.EventListener; import org.glassfish.api.event.EventTypes; import org.glassfish.api.event.Events; +import org.glassfish.external.amx.BootAMXMBean; +import org.glassfish.grizzly.config.dom.Ssl; +import org.glassfish.hk2.api.PostConstruct; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.hk2.runlevel.RunLevel; import org.glassfish.internal.api.Globals; import org.glassfish.internal.api.PostStartupRunLevel; - import org.glassfish.logging.annotation.LogMessageInfo; +import org.jvnet.hk2.annotations.Service; /** * Responsible for creating the {@link BootAMXMBean}, and starting JMXConnectors, diff --git a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/MBeanServerFactory.java b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/MBeanServerFactory.java index b34b10d2323..a0e2a45c539 100644 --- a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/MBeanServerFactory.java +++ b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/MBeanServerFactory.java @@ -16,13 +16,12 @@ package org.glassfish.admin.mbeanserver; -import org.glassfish.hk2.api.Factory; -import org.glassfish.hk2.runlevel.RunLevel; -import org.jvnet.hk2.annotations.Service; - import javax.management.MBeanServer; +import org.glassfish.hk2.api.Factory; +import org.glassfish.hk2.runlevel.RunLevel; import org.glassfish.internal.api.PostStartupRunLevel; +import org.jvnet.hk2.annotations.Service; /** Factory for the MBeanServer. Required so that HK2 can find an MBeanServer diff --git a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/PendingConfigBeanJob.java b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/PendingConfigBeanJob.java index 0e3de9695fe..a928510282c 100644 --- a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/PendingConfigBeanJob.java +++ b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/PendingConfigBeanJob.java @@ -16,9 +16,10 @@ package org.glassfish.admin.mbeanserver; -import org.jvnet.hk2.config.ConfigBean; import java.util.concurrent.CountDownLatch; +import org.jvnet.hk2.config.ConfigBean; + /** used internally for the queue {@link PendindingConfigBeans} */ public final class PendingConfigBeanJob { diff --git a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/PendingConfigBeans.java b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/PendingConfigBeans.java index 001ed60ac34..8daff4fd968 100644 --- a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/PendingConfigBeans.java +++ b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/PendingConfigBeans.java @@ -16,18 +16,25 @@ package org.glassfish.admin.mbeanserver; +import jakarta.inject.Inject; + import java.beans.PropertyChangeEvent; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.LinkedBlockingQueue; import java.util.logging.Level; -import jakarta.inject.Inject; + import org.glassfish.config.support.ConfigBeanListener; import org.glassfish.hk2.api.ActiveDescriptor; import org.glassfish.hk2.api.PostConstruct; import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.config.*; +import org.jvnet.hk2.config.ConfigBean; +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Dom; +import org.jvnet.hk2.config.TransactionListener; +import org.jvnet.hk2.config.Transactions; +import org.jvnet.hk2.config.UnprocessedChangeEvents; /** Called when ConfigBeans come into the habitat (see GlassfishConfigBean); a job queue diff --git a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/RMIConnectorStarter.java b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/RMIConnectorStarter.java index 1ebe66ea412..c080db408a5 100644 --- a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/RMIConnectorStarter.java +++ b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/RMIConnectorStarter.java @@ -19,7 +19,11 @@ import java.io.File; import java.io.IOException; -import java.net.*; +import java.net.InetAddress; +import java.net.MalformedURLException; +import java.net.ServerSocket; +import java.net.Socket; +import java.net.UnknownHostException; import java.rmi.NotBoundException; import java.rmi.RemoteException; import java.rmi.registry.LocateRegistry; @@ -33,6 +37,7 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; + import javax.management.MBeanServer; import javax.management.remote.JMXAuthenticator; import javax.management.remote.JMXConnectorServer; @@ -44,6 +49,7 @@ import javax.net.ssl.SSLContext; import javax.rmi.ssl.SslRMIClientSocketFactory; import javax.security.auth.Subject; + import org.glassfish.admin.mbeanserver.ssl.JMXMasterPasswordImpl; import org.glassfish.admin.mbeanserver.ssl.SSLClientConfigurator; import org.glassfish.admin.mbeanserver.ssl.SSLParams; diff --git a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/Util.java b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/Util.java index 6d5b3ae0bb3..1fe82c64b9e 100644 --- a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/Util.java +++ b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/Util.java @@ -17,6 +17,7 @@ package org.glassfish.admin.mbeanserver; import java.util.logging.Logger; + import org.glassfish.logging.annotation.LogMessagesResourceBundle; import org.glassfish.logging.annotation.LoggerInfo; diff --git a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/JMXMasterPasswordImpl.java b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/JMXMasterPasswordImpl.java index b7808136dfd..332d1a0e4a1 100644 --- a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/JMXMasterPasswordImpl.java +++ b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/JMXMasterPasswordImpl.java @@ -18,12 +18,15 @@ import com.sun.enterprise.security.store.IdentityManagement; import com.sun.enterprise.security.store.PasswordAdapter; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import java.io.IOException; import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; import java.security.cert.CertificateException; -import jakarta.inject.Inject; -import jakarta.inject.Singleton; + import org.glassfish.security.common.MasterPassword; import org.jvnet.hk2.annotations.Optional; import org.jvnet.hk2.annotations.Service; diff --git a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/SSLClientConfigurator.java b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/SSLClientConfigurator.java index a4a47a49f05..4a9f5456cd3 100644 --- a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/SSLClientConfigurator.java +++ b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/SSLClientConfigurator.java @@ -17,16 +17,44 @@ package org.glassfish.admin.mbeanserver.ssl; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; import java.security.KeyStore; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; -import java.security.cert.*; +import java.security.cert.CRL; +import java.security.cert.CRLException; +import java.security.cert.CertPathParameters; +import java.security.cert.CertStore; +import java.security.cert.CertStoreParameters; +import java.security.cert.CertificateException; +import java.security.cert.CertificateFactory; +import java.security.cert.CollectionCertStoreParameters; +import java.security.cert.PKIXBuilderParameters; +import java.security.cert.X509CertSelector; import java.text.MessageFormat; -import java.util.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import javax.net.ssl.*; + +import javax.net.ssl.CertPathTrustManagerParameters; +import javax.net.ssl.KeyManager; +import javax.net.ssl.KeyManagerFactory; +import javax.net.ssl.ManagerFactoryParameters; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLServerSocketFactory; +import javax.net.ssl.TrustManager; +import javax.net.ssl.TrustManagerFactory; + import org.glassfish.admin.mbeanserver.Util; import org.glassfish.logging.annotation.LogMessageInfo; diff --git a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/SecureRMIClientSocketFactory.java b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/SecureRMIClientSocketFactory.java index 12640ab1078..3cd26c7eaff 100644 --- a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/SecureRMIClientSocketFactory.java +++ b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ssl/SecureRMIClientSocketFactory.java @@ -25,9 +25,11 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; + import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocket; import javax.rmi.ssl.SslRMIClientSocketFactory; + import org.glassfish.admin.mbeanserver.Util; import org.glassfish.logging.annotation.LogMessageInfo; diff --git a/nucleus/common/scattered-archive-api/src/main/java/org/glassfish/embeddable/archive/ScatteredArchive.java b/nucleus/common/scattered-archive-api/src/main/java/org/glassfish/embeddable/archive/ScatteredArchive.java index 4145b69f4d4..ef005afd364 100644 --- a/nucleus/common/scattered-archive-api/src/main/java/org/glassfish/embeddable/archive/ScatteredArchive.java +++ b/nucleus/common/scattered-archive-api/src/main/java/org/glassfish/embeddable/archive/ScatteredArchive.java @@ -19,13 +19,13 @@ import java.io.File; import java.io.IOException; +import java.lang.System.Logger.Level; import java.net.URI; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Predicate; -import java.lang.System.Logger.Level; /** * Abstraction for a Scattered Jakarta EE module (parts disseminated in various directories). diff --git a/nucleus/common/scattered-archive-api/src/test/java/org/glassfish/embeddable/archive/ScatteredArchiveTest.java b/nucleus/common/scattered-archive-api/src/test/java/org/glassfish/embeddable/archive/ScatteredArchiveTest.java index 5d67fcb7eca..09e08dfd4a8 100644 --- a/nucleus/common/scattered-archive-api/src/test/java/org/glassfish/embeddable/archive/ScatteredArchiveTest.java +++ b/nucleus/common/scattered-archive-api/src/test/java/org/glassfish/embeddable/archive/ScatteredArchiveTest.java @@ -11,17 +11,18 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; + +import org.junit.jupiter.api.extension.ParameterContext; import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.converter.ArgumentConversionException; +import org.junit.jupiter.params.converter.ArgumentConverter; +import org.junit.jupiter.params.converter.ConvertWith; import org.junit.jupiter.params.provider.CsvSource; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; import static org.junit.jupiter.api.Assertions.assertAll; -import org.junit.jupiter.api.extension.ParameterContext; -import org.junit.jupiter.params.converter.ArgumentConversionException; -import org.junit.jupiter.params.converter.ArgumentConverter; -import org.junit.jupiter.params.converter.ConvertWith; /** * diff --git a/nucleus/common/simple-glassfish-api/src/main/java/org/glassfish/embeddable/GlassFishRuntime.java b/nucleus/common/simple-glassfish-api/src/main/java/org/glassfish/embeddable/GlassFishRuntime.java index c50472adb1a..3ceca71df50 100644 --- a/nucleus/common/simple-glassfish-api/src/main/java/org/glassfish/embeddable/GlassFishRuntime.java +++ b/nucleus/common/simple-glassfish-api/src/main/java/org/glassfish/embeddable/GlassFishRuntime.java @@ -17,14 +17,14 @@ package org.glassfish.embeddable; -import org.glassfish.embeddable.spi.RuntimeBuilder; - import java.util.Iterator; import java.util.ServiceConfigurationError; import java.util.ServiceLoader; import java.util.logging.Level; import java.util.logging.Logger; +import org.glassfish.embeddable.spi.RuntimeBuilder; + /** * This is the entry point API to bootstrap GlassFish. * From 5b678a8a40ee1bc504b44b2189de06da59ddd098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sat, 10 Aug 2024 21:39:30 +0200 Subject: [PATCH 04/40] Imports: security packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../ctl/AuthorizationIDResponseControl.java | 4 +- .../com/sun/jndi/ldap/ctl/DirSyncControl.java | 6 +- .../jndi/ldap/ctl/DirSyncResponseControl.java | 6 +- .../ldap/ctl/GetEffectiveRightsControl.java | 6 +- .../jndi/ldap/ctl/PagedResultsControl.java | 6 +- .../ldap/ctl/PagedResultsResponseControl.java | 6 +- .../ctl/PasswordExpiredResponseControl.java | 2 + .../ctl/PasswordExpiringResponseControl.java | 3 +- .../ldap/ctl/ProxiedAuthorizationControl.java | 4 +- .../com/sun/jndi/ldap/ctl/SortControl.java | 6 +- .../com/sun/jndi/ldap/obj/LdapPrincipal.java | 4 +- .../src/main/java/org/jvnet/libpam/PAM.java | 20 +++--- .../main/java/org/jvnet/libpam/UnixUser.java | 6 +- .../java/org/jvnet/libpam/impl/CLibrary.java | 10 +-- .../org/jvnet/libpam/impl/PAMLibrary.java | 10 +-- .../appclient/AppClientSecurityInfoImpl.java | 14 +++-- .../AppclientIIOPInterceptorFactory.java | 3 +- .../security/appclient/ConfigXMLParser.java | 9 ++- .../security/ee/J2EESecurityManager.java | 7 ++- .../security/ee/JavaEESecurityLifecycle.java | 28 ++++----- .../security/ee/SecuritySniffer.java | 12 ++-- .../enterprise/security/ee/SecurityUtil.java | 22 +++---- .../security/ee/acl/RoleMapperFactory.java | 4 +- .../ee/authentication/ProgrammaticLogin.java | 20 +++--- .../glassfish/digest/DigestLoginModule.java | 4 +- .../glassfish/digest/DigestRealmBase.java | 9 +-- .../digest/impl/DigestParameterGenerator.java | 4 +- .../digest/impl/DigestProcessor.java | 12 ++-- .../impl/HttpAlgorithmParameterImpl.java | 4 +- .../digest/impl/HttpDigestParamGenerator.java | 24 +++---- .../impl/NestedDigestAlgoParamImpl.java | 4 +- .../glassfish/jdbc/JDBCLoginModule.java | 8 ++- .../glassfish/jdbc/JDBCRealm.java | 9 ++- .../glassfish/pam/PamLoginModule.java | 7 ++- .../glassfish/pam/PamRealm.java | 10 +-- .../security/ee/authorize/HandlerData.java | 7 ++- .../authorize/PolicyContextHandlerImpl.java | 4 +- .../cache/PermissionCacheFactory.java | 1 + .../security/ee/jmac/AuthMessagePolicy.java | 26 ++++---- .../security/ee/jmac/ConfigDomainParser.java | 20 +++--- ...essageSecurityConfigEventListenerImpl.java | 16 ++--- .../security/ee/jmac/WebServicesDelegate.java | 3 + .../ClientContainerCallbackHandler.java | 18 +++--- .../callback/ContainerCallbackHandler.java | 4 +- .../GlassFishBaseCallbackHandler.java | 20 +++--- .../ServerContainerCallbackHandler.java | 10 +-- .../ee/perms/EarEEPermissionsProcessor.java | 1 + .../ee/perms/PermissionsProcessor.java | 4 +- .../ee/perms/PermsArchiveDelegate.java | 4 +- .../security/ee/perms/SMGlobalPolicyUtil.java | 4 +- .../GlassFishToExousiaConverter.java | 18 +++--- .../web/integration/WebProgrammaticLogin.java | 4 +- .../web/integration/WebSecurityManager.java | 53 ++++++++-------- .../ee/perms/SMGlobalPolicyUtilTest.java | 11 ++-- .../security/ee/perms/VoidPermissionTest.java | 7 ++- .../web/security/CNonceCacheFactoryImpl.java | 16 ++--- .../sun/web/security/HttpRequestWrapper.java | 24 +++---- .../sun/web/security/HttpResponseWrapper.java | 12 ++-- .../web/security/RequestFacadeWrapper.java | 24 +++---- .../security/WebProgrammaticLoginImpl.java | 1 + ...WebSecurityComponentInvocationHandler.java | 6 +- .../security/webservices/LogUtils.java | 1 + .../webservices/SecurityServiceImpl.java | 13 ++-- .../SoapAuthenticationService.java | 63 ++++++++++--------- .../webservices/WebServicesDelegateImpl.java | 8 ++- .../webservices/client/ClientPipeCloser.java | 4 +- .../client/ClientSecurityPipe.java | 29 +++++---- .../client/ClientSecurityPipeCreator.java | 20 +++--- .../server/ServerSecurityPipe.java | 19 +++--- .../server/ServerSecurityPipeCreator.java | 25 ++++---- .../common/iiop/security/GSSUPName.java | 6 +- .../security/AppCNonceCacheMap.java | 4 +- .../security/BasePasswordLoginModule.java | 9 ++- .../enterprise/security/EmbeddedSecurity.java | 4 +- .../enterprise/security/GUILoginDialog.java | 6 +- .../sun/enterprise/security/LoginContext.java | 6 +- .../sun/enterprise/security/PolicyLoader.java | 41 ++++++------ .../security/SecurityConfigListener.java | 29 ++++----- .../enterprise/security/SecurityContext.java | 8 +-- .../security/SecurityLifecycle.java | 20 +++--- .../security/SecurityServicesUtil.java | 9 +-- .../security/SecurityUpgradeService.java | 16 ++--- .../enterprise/security/TextLoginDialog.java | 6 +- .../security/UsernamePasswordStore.java | 3 +- .../admin/cli/DisableSecureAdminCommand.java | 6 +- .../admin/cli/SecureAdminHelperImpl.java | 26 ++++---- .../admin/cli/SecureAdminUpgradeHelper.java | 26 ++++---- .../security/audit/BaseAuditManager.java | 16 ++--- .../login/ClientCertificateLoginModule.java | 12 ++-- .../auth/login/ClientPasswordLoginModule.java | 10 +-- .../security/auth/login/FileLoginModule.java | 5 +- .../security/auth/login/LDAPLoginModule.java | 9 +-- .../auth/login/LoginCallbackHandler.java | 8 +-- .../auth/login/SolarisLoginModule.java | 6 +- .../common/ServerLoginCallbackHandler.java | 4 +- .../realm/AbstractGlassFishRealmState.java | 1 + .../auth/realm/GlassFishUserStore.java | 1 + .../security/auth/realm/GroupMapper.java | 4 +- .../enterprise/security/auth/realm/Realm.java | 12 ++-- .../security/auth/realm/RealmConfig.java | 14 ++--- .../security/auth/realm/RealmsManager.java | 18 +++--- .../enterprise/security/auth/realm/User.java | 1 + .../security/auth/realm/file/FileRealm.java | 14 +++-- .../auth/realm/file/FileRealmUser.java | 7 ++- .../auth/realm/ldap/CustomSocketFactory.java | 10 +-- .../security/auth/realm/ldap/LDAPRealm.java | 23 ++++--- .../auth/realm/solaris/SolarisRealm.java | 8 ++- .../sun/enterprise/security/cli/CLIUtil.java | 8 +-- .../security/cli/CreateAuditModule.java | 22 +++---- .../security/cli/CreateAuthRealm.java | 26 ++++---- .../security/cli/CreateFileUser.java | 2 +- .../security/cli/CreateJACCProvider.java | 20 +++--- .../cli/CreateMessageSecurityProvider.java | 30 ++++----- .../security/cli/CreatePasswordAlias.java | 12 ++-- .../security/cli/DeleteAuditModule.java | 22 +++---- .../security/cli/DeleteAuthRealm.java | 22 +++---- .../security/cli/DeleteFileUser.java | 28 ++++----- .../security/cli/DeleteJaccProvider.java | 20 +++--- .../cli/DeleteMessageSecurityProvider.java | 22 +++---- .../security/cli/DeletePasswordAlias.java | 12 ++-- .../security/cli/ListAuditModule.java | 20 +++--- .../security/cli/ListAuthRealm.java | 22 +++---- .../security/cli/ListFileGroup.java | 32 +++++----- .../enterprise/security/cli/ListFileUser.java | 30 ++++----- .../security/cli/ListJaccProviders.java | 22 +++---- .../cli/ListMessageSecurityProvider.java | 22 +++---- .../security/cli/ListPasswordAlias.java | 12 ++-- .../cli/ListSupportedCipherSuites.java | 14 ++--- .../security/cli/UpdatePasswordAlias.java | 12 ++-- .../common/AbstractSecurityContext.java | 4 +- .../AbstractInternalSystemAdministrator.java | 2 + .../authentication/AuthenticationService.java | 3 +- .../authorization/AuthorizationService.java | 1 + .../api/authorization/RoleMappingService.java | 1 + .../api/context/SecurityContextService.java | 1 - .../security/services/commands/CLIUtil.java | 1 + .../commands/CreateLoginModuleConfig.java | 22 +++---- .../commands/CreateSecurityProvider.java | 21 +++---- .../commands/CreateSecurityService.java | 25 ++++---- .../commands/LDAPAdminAccessConfigurator.java | 45 ++++++++----- .../security/services/common/Secure.java | 8 ++- .../common/SecureServiceAccessPermission.java | 4 +- .../SecurityAccessValidationService.java | 4 +- .../common/SecurityAccessValidator.java | 22 +++---- .../services/common/SecurityScope.java | 8 ++- .../services/common/SecurityScopeContext.java | 6 +- .../config/SecurityConfigUpgradeService.java | 12 ++-- .../services/config/SecurityProvider.java | 6 +- .../config/SecurityProviderConfig.java | 2 +- .../impl/AuthenticationServiceFactory.java | 12 ++-- .../impl/AuthenticationServiceImpl.java | 17 ++--- .../impl/JCEKSDomainPasswordAliasStore.java | 5 +- .../impl/JCEKSPasswordAliasStore.java | 3 + .../NucleusInternalSystemAdministrator.java | 1 + .../services/impl/ServiceFactory.java | 6 +- .../AuthorizationServiceImpl.java | 46 +++++++------- .../impl/authorization/AzResourceImpl.java | 10 +-- .../impl/authorization/AzResultImpl.java | 4 +- .../impl/authorization/AzSubjectImpl.java | 4 +- .../authorization/RoleMappingServiceImpl.java | 19 +++--- .../services/impl/common/AttributeImpl.java | 2 +- .../context/SecurityContextServiceImpl.java | 4 +- .../SimpleAuthorizationProviderImpl.java | 26 +++++--- .../SimpleRoleMappingProviderImpl.java | 6 +- .../authorization/AuthorizationProvider.java | 13 ++-- .../authorization/RoleMappingProvider.java | 1 - .../security/ssl/impl/MasterPasswordImpl.java | 7 ++- .../ssl/manager/UnifiedX509KeyManager.java | 3 +- .../ssl/manager/UnifiedX509TrustManager.java | 5 +- 169 files changed, 1083 insertions(+), 962 deletions(-) diff --git a/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/AuthorizationIDResponseControl.java b/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/AuthorizationIDResponseControl.java index 0c2e2bede40..5eb7cbbd3d2 100644 --- a/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/AuthorizationIDResponseControl.java +++ b/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/AuthorizationIDResponseControl.java @@ -16,10 +16,10 @@ package com.sun.jndi.ldap.ctl; -import javax.naming.ldap.BasicControl; - import java.io.IOException; +import javax.naming.ldap.BasicControl; + /** * This class implements the LDAP response control for Authorization Identity * Response control. This control retrieves the current authorization identity diff --git a/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/DirSyncControl.java b/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/DirSyncControl.java index ebe3c3b8e59..432825c0bb6 100644 --- a/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/DirSyncControl.java +++ b/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/DirSyncControl.java @@ -16,11 +16,13 @@ package com.sun.jndi.ldap.ctl; -import java.io.IOException; -import javax.naming.ldap.BasicControl; import com.sun.jndi.ldap.Ber; import com.sun.jndi.ldap.BerEncoder; +import java.io.IOException; + +import javax.naming.ldap.BasicControl; + /** * This class implements the LDAPv3 Request Control for directory * synchronization as defined in draft-armijo-ldap-dirsync-01.txt diff --git a/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/DirSyncResponseControl.java b/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/DirSyncResponseControl.java index 8f2e4a0d780..74f5ab602d1 100644 --- a/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/DirSyncResponseControl.java +++ b/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/DirSyncResponseControl.java @@ -16,11 +16,13 @@ package com.sun.jndi.ldap.ctl; -import java.io.IOException; -import javax.naming.ldap.BasicControl; import com.sun.jndi.ldap.Ber; import com.sun.jndi.ldap.BerDecoder; +import java.io.IOException; + +import javax.naming.ldap.BasicControl; + /** * This class implements the LDAPv3 Response Control for directory * synchronization as defined in diff --git a/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/GetEffectiveRightsControl.java b/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/GetEffectiveRightsControl.java index 083bfea89e5..5b508cbc88d 100644 --- a/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/GetEffectiveRightsControl.java +++ b/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/GetEffectiveRightsControl.java @@ -16,11 +16,13 @@ package com.sun.jndi.ldap.ctl; -import java.io.IOException; -import javax.naming.ldap.BasicControl; import com.sun.jndi.ldap.Ber; import com.sun.jndi.ldap.BerEncoder; +import java.io.IOException; + +import javax.naming.ldap.BasicControl; + /** * This class implements the getEffectiveRights control to obtain the * access control rights in effect for a given user. This control may be diff --git a/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/PagedResultsControl.java b/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/PagedResultsControl.java index 860af82dc7d..43aac40a936 100644 --- a/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/PagedResultsControl.java +++ b/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/PagedResultsControl.java @@ -16,11 +16,13 @@ package com.sun.jndi.ldap.ctl; -import java.io.IOException; -import javax.naming.ldap.BasicControl; import com.sun.jndi.ldap.Ber; import com.sun.jndi.ldap.BerEncoder; +import java.io.IOException; + +import javax.naming.ldap.BasicControl; + /** * This class implements the LDAPv3 Control for paged-results as defined in * RFC-2696. diff --git a/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/PagedResultsResponseControl.java b/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/PagedResultsResponseControl.java index 5a9cad60dff..74477ee8b1f 100644 --- a/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/PagedResultsResponseControl.java +++ b/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/PagedResultsResponseControl.java @@ -16,11 +16,13 @@ package com.sun.jndi.ldap.ctl; -import java.io.IOException; -import javax.naming.ldap.BasicControl; import com.sun.jndi.ldap.Ber; import com.sun.jndi.ldap.BerDecoder; +import java.io.IOException; + +import javax.naming.ldap.BasicControl; + /** * This class implements the LDAPv3 Response Control for * paged-results as defined in diff --git a/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/PasswordExpiredResponseControl.java b/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/PasswordExpiredResponseControl.java index 5632d754671..a2fb09b6056 100644 --- a/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/PasswordExpiredResponseControl.java +++ b/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/PasswordExpiredResponseControl.java @@ -16,6 +16,8 @@ package com.sun.jndi.ldap.ctl; +import java.io.IOException; + import javax.naming.ldap.BasicControl; /** diff --git a/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/PasswordExpiringResponseControl.java b/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/PasswordExpiringResponseControl.java index 24873f9a671..f4f9fe59a9e 100644 --- a/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/PasswordExpiringResponseControl.java +++ b/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/PasswordExpiringResponseControl.java @@ -16,9 +16,10 @@ package com.sun.jndi.ldap.ctl; -import javax.naming.ldap.BasicControl; import java.io.IOException; +import javax.naming.ldap.BasicControl; + /** * This class implements the LDAP response control notifying * password expiration. The Password Expiring control is a notification diff --git a/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/ProxiedAuthorizationControl.java b/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/ProxiedAuthorizationControl.java index 21ea87d87c5..38c69bff611 100644 --- a/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/ProxiedAuthorizationControl.java +++ b/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/ProxiedAuthorizationControl.java @@ -16,9 +16,11 @@ package com.sun.jndi.ldap.ctl; +import com.sun.jndi.ldap.BerEncoder; + import java.io.IOException; + import javax.naming.ldap.BasicControl; -import com.sun.jndi.ldap.BerEncoder; /** * This class implements the LDAP request control for proxied authorization. diff --git a/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/SortControl.java b/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/SortControl.java index dcc263e65b3..3255be62ac0 100644 --- a/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/SortControl.java +++ b/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/ctl/SortControl.java @@ -16,11 +16,13 @@ package com.sun.jndi.ldap.ctl; -import java.io.IOException; -import javax.naming.ldap.BasicControl; import com.sun.jndi.ldap.Ber; import com.sun.jndi.ldap.BerEncoder; +import java.io.IOException; + +import javax.naming.ldap.BasicControl; + /** * This class implements the LDAPv3 Request Control for server-side sorting * of search results as defined in diff --git a/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/obj/LdapPrincipal.java b/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/obj/LdapPrincipal.java index b83e19d8a60..d02708266a5 100644 --- a/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/obj/LdapPrincipal.java +++ b/appserver/ldapbp/src/main/java/com/sun/jndi/ldap/obj/LdapPrincipal.java @@ -16,9 +16,11 @@ package com.sun.jndi.ldap.obj; +import com.sun.jndi.ldap.LdapName; + import java.security.Principal; + import javax.naming.NamingException; -import com.sun.jndi.ldap.LdapName; /** * A principal from the LDAP directory. diff --git a/appserver/libpam4j/src/main/java/org/jvnet/libpam/PAM.java b/appserver/libpam4j/src/main/java/org/jvnet/libpam/PAM.java index 5fc65c8057b..fa8595ebd57 100644 --- a/appserver/libpam4j/src/main/java/org/jvnet/libpam/PAM.java +++ b/appserver/libpam4j/src/main/java/org/jvnet/libpam/PAM.java @@ -16,14 +16,8 @@ package org.jvnet.libpam; -import static com.sun.jna.Native.POINTER_SIZE; -import static java.util.logging.Level.FINE; -import static org.jvnet.libpam.impl.CLibrary.libc; -import static org.jvnet.libpam.impl.PAMLibrary.PAM_CONV_ERR; -import static org.jvnet.libpam.impl.PAMLibrary.PAM_PROMPT_ECHO_OFF; -import static org.jvnet.libpam.impl.PAMLibrary.PAM_SUCCESS; -import static org.jvnet.libpam.impl.PAMLibrary.PAM_USER; -import static org.jvnet.libpam.impl.PAMLibrary.libpam; +import com.sun.jna.Pointer; +import com.sun.jna.ptr.PointerByReference; import java.util.Set; import java.util.logging.Logger; @@ -35,8 +29,14 @@ import org.jvnet.libpam.impl.PAMLibrary.pam_message; import org.jvnet.libpam.impl.PAMLibrary.pam_response; -import com.sun.jna.Pointer; -import com.sun.jna.ptr.PointerByReference; +import static com.sun.jna.Native.POINTER_SIZE; +import static java.util.logging.Level.FINE; +import static org.jvnet.libpam.impl.CLibrary.libc; +import static org.jvnet.libpam.impl.PAMLibrary.PAM_CONV_ERR; +import static org.jvnet.libpam.impl.PAMLibrary.PAM_PROMPT_ECHO_OFF; +import static org.jvnet.libpam.impl.PAMLibrary.PAM_SUCCESS; +import static org.jvnet.libpam.impl.PAMLibrary.PAM_USER; +import static org.jvnet.libpam.impl.PAMLibrary.libpam; /** * PAM authenticator. diff --git a/appserver/libpam4j/src/main/java/org/jvnet/libpam/UnixUser.java b/appserver/libpam4j/src/main/java/org/jvnet/libpam/UnixUser.java index eaf5c7f494c..58ce97a2ba4 100644 --- a/appserver/libpam4j/src/main/java/org/jvnet/libpam/UnixUser.java +++ b/appserver/libpam4j/src/main/java/org/jvnet/libpam/UnixUser.java @@ -16,7 +16,8 @@ package org.jvnet.libpam; -import static org.jvnet.libpam.impl.CLibrary.libc; +import com.sun.jna.Memory; +import com.sun.jna.ptr.IntByReference; import java.util.Collections; import java.util.HashSet; @@ -25,8 +26,7 @@ import org.jvnet.libpam.impl.CLibrary.Group; import org.jvnet.libpam.impl.CLibrary.Passwd; -import com.sun.jna.Memory; -import com.sun.jna.ptr.IntByReference; +import static org.jvnet.libpam.impl.CLibrary.libc; /** * Represents an Unix user. Immutable. diff --git a/appserver/libpam4j/src/main/java/org/jvnet/libpam/impl/CLibrary.java b/appserver/libpam4j/src/main/java/org/jvnet/libpam/impl/CLibrary.java index 3ff6aaa859e..b0a56a8762d 100644 --- a/appserver/libpam4j/src/main/java/org/jvnet/libpam/impl/CLibrary.java +++ b/appserver/libpam4j/src/main/java/org/jvnet/libpam/impl/CLibrary.java @@ -16,11 +16,6 @@ package org.jvnet.libpam.impl; -import java.util.Arrays; -import java.util.List; - -import org.jvnet.libpam.PAMException; - import com.sun.jna.Library; import com.sun.jna.Memory; import com.sun.jna.Native; @@ -29,6 +24,11 @@ import com.sun.jna.Structure; import com.sun.jna.ptr.IntByReference; +import java.util.Arrays; +import java.util.List; + +import org.jvnet.libpam.PAMException; + /** * @author Kohsuke Kawaguchi */ diff --git a/appserver/libpam4j/src/main/java/org/jvnet/libpam/impl/PAMLibrary.java b/appserver/libpam4j/src/main/java/org/jvnet/libpam/impl/PAMLibrary.java index bab2d77124b..7c1d64eb490 100644 --- a/appserver/libpam4j/src/main/java/org/jvnet/libpam/impl/PAMLibrary.java +++ b/appserver/libpam4j/src/main/java/org/jvnet/libpam/impl/PAMLibrary.java @@ -16,11 +16,6 @@ package org.jvnet.libpam.impl; -import static org.jvnet.libpam.impl.CLibrary.libc; - -import java.util.Arrays; -import java.util.List; - import com.sun.jna.Callback; import com.sun.jna.Library; import com.sun.jna.Native; @@ -29,6 +24,11 @@ import com.sun.jna.Structure; import com.sun.jna.ptr.PointerByReference; +import java.util.Arrays; +import java.util.List; + +import static org.jvnet.libpam.impl.CLibrary.libc; + /** * libpam.so binding. * diff --git a/appserver/security/appclient.security/src/main/java/com/sun/enterprise/security/appclient/AppClientSecurityInfoImpl.java b/appserver/security/appclient.security/src/main/java/com/sun/enterprise/security/appclient/AppClientSecurityInfoImpl.java index 8bb7e382bf6..c47bcca322b 100644 --- a/appserver/security/appclient.security/src/main/java/com/sun/enterprise/security/appclient/AppClientSecurityInfoImpl.java +++ b/appserver/security/appclient.security/src/main/java/com/sun/enterprise/security/appclient/AppClientSecurityInfoImpl.java @@ -16,11 +16,6 @@ package com.sun.enterprise.security.appclient; -import static jakarta.security.auth.message.config.AuthConfigFactory.DEFAULT_FACTORY_SECURITY_PROPERTY; -import static java.lang.System.Logger.Level.DEBUG; -import static java.lang.System.Logger.Level.ERROR; -import static java.lang.System.Logger.Level.WARNING; - import com.sun.enterprise.security.SecurityServicesUtil; import com.sun.enterprise.security.UsernamePasswordStore; import com.sun.enterprise.security.appclient.integration.AppClientSecurityInfo; @@ -32,11 +27,15 @@ import com.sun.enterprise.security.ee.J2EESecurityManager; import com.sun.enterprise.security.integration.AppClientSSL; import com.sun.enterprise.security.ssl.SSLUtils; + import jakarta.inject.Inject; + import java.lang.System.Logger; import java.util.List; + import javax.security.auth.Subject; import javax.security.auth.callback.CallbackHandler; + import org.glassfish.appclient.client.acc.config.MessageSecurityConfig; import org.glassfish.appclient.client.acc.config.Security; import org.glassfish.appclient.client.acc.config.Ssl; @@ -45,6 +44,11 @@ import org.glassfish.epicyro.config.factory.file.AuthConfigFileFactory; import org.jvnet.hk2.annotations.Service; +import static jakarta.security.auth.message.config.AuthConfigFactory.DEFAULT_FACTORY_SECURITY_PROPERTY; +import static java.lang.System.Logger.Level.DEBUG; +import static java.lang.System.Logger.Level.ERROR; +import static java.lang.System.Logger.Level.WARNING; + /** * * @author Kumar diff --git a/appserver/security/appclient.security/src/main/java/com/sun/enterprise/security/appclient/AppclientIIOPInterceptorFactory.java b/appserver/security/appclient.security/src/main/java/com/sun/enterprise/security/appclient/AppclientIIOPInterceptorFactory.java index 4aa06cb9409..040aae403a7 100644 --- a/appserver/security/appclient.security/src/main/java/com/sun/enterprise/security/appclient/AppclientIIOPInterceptorFactory.java +++ b/appserver/security/appclient.security/src/main/java/com/sun/enterprise/security/appclient/AppclientIIOPInterceptorFactory.java @@ -23,8 +23,6 @@ import jakarta.inject.Inject; import jakarta.inject.Singleton; -import static java.lang.System.Logger.Level.ERROR; - import java.lang.System.Logger; import org.glassfish.api.admin.ProcessEnvironment; @@ -36,6 +34,7 @@ import org.omg.PortableInterceptor.ServerRequestInterceptor; import static com.sun.enterprise.iiop.security.AlternateSecurityInterceptorFactory.SEC_INTEROP_INTFACTORY_PROP; +import static java.lang.System.Logger.Level.ERROR; /** * @author Kumar diff --git a/appserver/security/appclient.security/src/main/java/com/sun/enterprise/security/appclient/ConfigXMLParser.java b/appserver/security/appclient.security/src/main/java/com/sun/enterprise/security/appclient/ConfigXMLParser.java index 44472d60175..aedb174dbfd 100644 --- a/appserver/security/appclient.security/src/main/java/com/sun/enterprise/security/appclient/ConfigXMLParser.java +++ b/appserver/security/appclient.security/src/main/java/com/sun/enterprise/security/appclient/ConfigXMLParser.java @@ -17,13 +17,12 @@ package com.sun.enterprise.security.appclient; -import static java.lang.System.Logger.Level.ERROR; -import static java.util.regex.Matcher.quoteReplacement; - import com.sun.enterprise.security.common.Util; + import jakarta.security.auth.message.MessagePolicy; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBException; + import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -37,6 +36,7 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; + import org.glassfish.appclient.client.acc.config.ClientContainer; import org.glassfish.appclient.client.acc.config.MessageSecurityConfig; import org.glassfish.appclient.client.acc.config.Property; @@ -49,6 +49,9 @@ import org.glassfish.epicyro.data.AuthModulesLayerConfig; import org.glassfish.internal.api.Globals; +import static java.lang.System.Logger.Level.ERROR; +import static java.util.regex.Matcher.quoteReplacement; + /** * Parser for message-security-config in glassfish-acc.xml */ diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/J2EESecurityManager.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/J2EESecurityManager.java index efe393138b3..bc8df49feb6 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/J2EESecurityManager.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/J2EESecurityManager.java @@ -16,13 +16,14 @@ package com.sun.enterprise.security.ee; +import com.sun.enterprise.security.ee.authorize.cache.CachedPermissionImpl; +import com.sun.enterprise.security.ee.authorize.cache.PermissionCache; +import com.sun.enterprise.security.ssl.SSLUtils; + import java.net.SocketPermission; // IASRI 4660742 START // IASRI 4660742 END import java.util.PropertyPermission; -import com.sun.enterprise.security.ee.authorize.cache.CachedPermissionImpl; -import com.sun.enterprise.security.ee.authorize.cache.PermissionCache; -import com.sun.enterprise.security.ssl.SSLUtils; /** * Java 2 security manager that enforces code security. diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/JavaEESecurityLifecycle.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/JavaEESecurityLifecycle.java index 5f3057f93b0..3dce3644e65 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/JavaEESecurityLifecycle.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/JavaEESecurityLifecycle.java @@ -17,9 +17,15 @@ package com.sun.enterprise.security.ee; -import static jakarta.security.auth.message.config.AuthConfigFactory.DEFAULT_FACTORY_SECURITY_PROPERTY; -import static java.util.logging.Level.WARNING; -import static org.glassfish.epicyro.config.factory.file.AuthConfigFileFactory.DEFAULT_FACTORY_DEFAULT_PROVIDERS; +import com.sun.enterprise.security.ContainerSecurityLifecycle; +import com.sun.enterprise.security.ee.jmac.AuthMessagePolicy; +import com.sun.enterprise.security.ee.jmac.ConfigDomainParser; +import com.sun.enterprise.security.ee.jmac.WebServicesDelegate; +import com.sun.logging.LogDomains; + +import jakarta.inject.Singleton; +import jakarta.security.auth.message.MessageInfo; +import jakarta.security.auth.message.MessagePolicy; import java.security.Provider; import java.security.Security; @@ -28,21 +34,15 @@ import java.util.function.Function; import java.util.logging.Logger; +import org.glassfish.epicyro.config.factory.file.AuthConfigFileFactory; +import org.glassfish.epicyro.config.module.configprovider.GFServerConfigProvider; import org.glassfish.hk2.api.PostConstruct; import org.glassfish.internal.api.Globals; import org.jvnet.hk2.annotations.Service; -import org.glassfish.epicyro.config.factory.file.AuthConfigFileFactory; -import org.glassfish.epicyro.config.module.configprovider.GFServerConfigProvider; - -import com.sun.enterprise.security.ContainerSecurityLifecycle; -import com.sun.enterprise.security.ee.jmac.AuthMessagePolicy; -import com.sun.enterprise.security.ee.jmac.ConfigDomainParser; -import com.sun.enterprise.security.ee.jmac.WebServicesDelegate; -import com.sun.logging.LogDomains; -import jakarta.inject.Singleton; -import jakarta.security.auth.message.MessageInfo; -import jakarta.security.auth.message.MessagePolicy; +import static jakarta.security.auth.message.config.AuthConfigFactory.DEFAULT_FACTORY_SECURITY_PROPERTY; +import static java.util.logging.Level.WARNING; +import static org.glassfish.epicyro.config.factory.file.AuthConfigFileFactory.DEFAULT_FACTORY_DEFAULT_PROVIDERS; /** * @author vbkumarjayanti diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecuritySniffer.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecuritySniffer.java index 94b5a05fb76..0cedc79be40 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecuritySniffer.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecuritySniffer.java @@ -16,6 +16,12 @@ package com.sun.enterprise.security.ee; +import com.sun.enterprise.deployment.util.DOLUtils; +import com.sun.enterprise.module.HK2Module; +import com.sun.enterprise.security.SecurityLifecycle; + +import jakarta.inject.Inject; + import java.io.IOException; import java.lang.annotation.Annotation; import java.util.logging.Logger; @@ -29,12 +35,6 @@ import org.glassfish.internal.deployment.GenericSniffer; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.deployment.util.DOLUtils; -import com.sun.enterprise.module.HK2Module; -import com.sun.enterprise.security.SecurityLifecycle; - -import jakarta.inject.Inject; - /** * SecuritySniffer for security related activities */ diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecurityUtil.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecurityUtil.java index 6a29dbe96bd..54914c5a576 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecurityUtil.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecurityUtil.java @@ -16,17 +16,6 @@ package com.sun.enterprise.security.ee; -import static org.glassfish.deployment.versioning.VersioningUtils.getRepositoryName; - -import java.security.Policy; -import java.util.Collection; -import java.util.logging.Logger; - -import org.glassfish.api.deployment.DeploymentContext; -import org.glassfish.api.deployment.OpsParams; -import org.glassfish.deployment.common.SecurityRoleMapperFactory; -import org.glassfish.deployment.versioning.VersioningUtils; - import com.sun.enterprise.deployment.Application; import com.sun.enterprise.deployment.EjbBundleDescriptor; import com.sun.enterprise.deployment.WebBundleDescriptor; @@ -39,6 +28,17 @@ import jakarta.security.jacc.PolicyConfigurationFactory; import jakarta.security.jacc.PolicyContextException; +import java.security.Policy; +import java.util.Collection; +import java.util.logging.Logger; + +import org.glassfish.api.deployment.DeploymentContext; +import org.glassfish.api.deployment.OpsParams; +import org.glassfish.deployment.common.SecurityRoleMapperFactory; +import org.glassfish.deployment.versioning.VersioningUtils; + +import static org.glassfish.deployment.versioning.VersioningUtils.getRepositoryName; + /** * This utility class encloses all the calls to a ejb method in a specified subject * diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/acl/RoleMapperFactory.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/acl/RoleMapperFactory.java index eb4ffc87be3..ffb8f6b7ed6 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/acl/RoleMapperFactory.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/acl/RoleMapperFactory.java @@ -16,6 +16,8 @@ package com.sun.enterprise.security.ee.acl; +import jakarta.inject.Singleton; + import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -23,8 +25,6 @@ import org.glassfish.deployment.common.SecurityRoleMapperFactory; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Singleton; - /** * * @author Jerome Dochez diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/ProgrammaticLogin.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/ProgrammaticLogin.java index 232708fbf00..23c20f954d3 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/ProgrammaticLogin.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/ProgrammaticLogin.java @@ -16,16 +16,6 @@ package com.sun.enterprise.security.ee.authentication; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.security.PrivilegedExceptionAction; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.glassfish.hk2.api.PerLookup; -import org.glassfish.hk2.api.ServiceLocator; -import org.jvnet.hk2.annotations.Service; - import com.sun.appserv.security.ProgrammaticLoginPermission; import com.sun.enterprise.security.SecurityServicesUtil; import com.sun.enterprise.security.UsernamePasswordStore; @@ -38,6 +28,16 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.security.PrivilegedExceptionAction; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; +import org.jvnet.hk2.annotations.Service; + /** * Implement programmatic login. * diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/DigestLoginModule.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/DigestLoginModule.java index 3b793b66a1b..f8c5437f9dc 100755 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/DigestLoginModule.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/DigestLoginModule.java @@ -17,8 +17,6 @@ package com.sun.enterprise.security.ee.authentication.glassfish.digest; -import static java.util.logging.Level.SEVERE; - import com.sun.enterprise.security.PrincipalGroupFactory; import com.sun.enterprise.security.auth.digest.api.DigestAlgorithmParameter; import com.sun.enterprise.security.auth.realm.Realm; @@ -44,6 +42,8 @@ import org.glassfish.security.common.Group; import org.glassfish.security.common.UserPrincipal; +import static java.util.logging.Level.SEVERE; + /** * * @author K.Venugopal@sun.com diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/DigestRealmBase.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/DigestRealmBase.java index 16a4581db0e..51b719cb159 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/DigestRealmBase.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/DigestRealmBase.java @@ -17,20 +17,21 @@ package com.sun.enterprise.security.ee.authentication.glassfish.digest; -import static com.sun.enterprise.security.auth.digest.api.Constants.A1; -import static com.sun.enterprise.security.auth.digest.api.Constants.RESPONSE; -import static java.util.logging.Level.SEVERE; - import com.sun.enterprise.security.auth.digest.api.DigestAlgorithmParameter; import com.sun.enterprise.security.auth.digest.api.Key; import com.sun.enterprise.security.auth.digest.api.Password; import com.sun.enterprise.security.auth.realm.Realm; import com.sun.enterprise.security.ee.authentication.glassfish.digest.impl.DigestProcessor; + import java.io.IOException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.logging.Level; +import static com.sun.enterprise.security.auth.digest.api.Constants.A1; +import static com.sun.enterprise.security.auth.digest.api.Constants.RESPONSE; +import static java.util.logging.Level.SEVERE; + /** * Base class for all realms wanting to support Digest based authentication. * diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/impl/DigestParameterGenerator.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/impl/DigestParameterGenerator.java index c9ec8c8641f..d000dda8c00 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/impl/DigestParameterGenerator.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/impl/DigestParameterGenerator.java @@ -16,11 +16,11 @@ package com.sun.enterprise.security.ee.authentication.glassfish.digest.impl; +import com.sun.enterprise.security.auth.digest.api.DigestAlgorithmParameter; + import java.security.InvalidAlgorithmParameterException; import java.security.spec.AlgorithmParameterSpec; -import com.sun.enterprise.security.auth.digest.api.DigestAlgorithmParameter; - /** * This Factory provides DigestParameterGenerator instances to generate DigestAlgorithmParameter objects from Http and * Sip servlet requests. diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/impl/DigestProcessor.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/impl/DigestProcessor.java index d0e1e50eddc..a786538be79 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/impl/DigestProcessor.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/impl/DigestProcessor.java @@ -16,7 +16,11 @@ package com.sun.enterprise.security.ee.authentication.glassfish.digest.impl; -import static com.sun.enterprise.security.auth.digest.api.Constants.A1; +import com.sun.enterprise.security.auth.digest.api.DigestAlgorithmParameter; +import com.sun.enterprise.security.auth.digest.api.NestedDigestAlgoParam; +import com.sun.enterprise.security.auth.digest.api.Password; +import com.sun.enterprise.util.i18n.StringManager; +import com.sun.logging.LogDomains; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -26,11 +30,7 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.security.auth.digest.api.DigestAlgorithmParameter; -import com.sun.enterprise.security.auth.digest.api.NestedDigestAlgoParam; -import com.sun.enterprise.security.auth.digest.api.Password; -import com.sun.enterprise.util.i18n.StringManager; -import com.sun.logging.LogDomains; +import static com.sun.enterprise.security.auth.digest.api.Constants.A1; /** * supports creation and validation of digest. diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/impl/HttpAlgorithmParameterImpl.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/impl/HttpAlgorithmParameterImpl.java index 4ec7457e093..40af9a3fbc4 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/impl/HttpAlgorithmParameterImpl.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/impl/HttpAlgorithmParameterImpl.java @@ -25,10 +25,10 @@ package com.sun.enterprise.security.ee.authentication.glassfish.digest.impl; -import java.security.spec.AlgorithmParameterSpec; - import jakarta.servlet.http.HttpServletRequest; +import java.security.spec.AlgorithmParameterSpec; + /** * represents HttpServlet request parameter * diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/impl/HttpDigestParamGenerator.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/impl/HttpDigestParamGenerator.java index 8a9bf125637..178dbf6078d 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/impl/HttpDigestParamGenerator.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/impl/HttpDigestParamGenerator.java @@ -17,6 +17,18 @@ package com.sun.enterprise.security.ee.authentication.glassfish.digest.impl; +import com.sun.enterprise.security.auth.digest.api.DigestAlgorithmParameter; + +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.http.HttpServletRequest; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.security.InvalidAlgorithmParameterException; +import java.security.spec.AlgorithmParameterSpec; +import java.util.StringTokenizer; +import java.util.logging.Logger; + import static com.sun.enterprise.security.auth.digest.api.Constants.A2; import static com.sun.enterprise.security.auth.digest.api.Constants.CNONCE; import static com.sun.enterprise.security.auth.digest.api.Constants.DATA; @@ -28,18 +40,6 @@ import static com.sun.enterprise.security.auth.digest.api.Constants.URI; import static java.util.logging.Level.SEVERE; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.security.InvalidAlgorithmParameterException; -import java.security.spec.AlgorithmParameterSpec; -import java.util.StringTokenizer; -import java.util.logging.Logger; - -import com.sun.enterprise.security.auth.digest.api.DigestAlgorithmParameter; - -import jakarta.servlet.ServletInputStream; -import jakarta.servlet.http.HttpServletRequest; - /** * HttpDigestParamGenerator consumes Authorization header from HttpServlet request and generates Digest parameter * objects to be used by Digest validators. diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/impl/NestedDigestAlgoParamImpl.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/impl/NestedDigestAlgoParamImpl.java index 3f43dbf2fc3..69d0d25089a 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/impl/NestedDigestAlgoParamImpl.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/impl/NestedDigestAlgoParamImpl.java @@ -16,10 +16,10 @@ package com.sun.enterprise.security.ee.authentication.glassfish.digest.impl; -import java.security.spec.AlgorithmParameterSpec; - import com.sun.enterprise.security.auth.digest.api.NestedDigestAlgoParam; +import java.security.spec.AlgorithmParameterSpec; + /** * * @author K.Venugopal@sun.com diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/jdbc/JDBCLoginModule.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/jdbc/JDBCLoginModule.java index 99378b7246f..abfd7810e9e 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/jdbc/JDBCLoginModule.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/jdbc/JDBCLoginModule.java @@ -17,13 +17,15 @@ package com.sun.enterprise.security.ee.authentication.glassfish.jdbc; -import static com.sun.enterprise.util.Utility.isEmpty; -import static java.util.logging.Level.FINEST; - import com.sun.enterprise.security.BasePasswordLoginModule; + import java.util.Arrays; + import javax.security.auth.login.LoginException; +import static com.sun.enterprise.util.Utility.isEmpty; +import static java.util.logging.Level.FINEST; + /** * This class implement a JDBC Login module for Glassfish. The work is derivated from Sun's sample JDBC login module. * Enhancement has been done to use latest features. sample setting in server.xml for JDBCLoginModule diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/jdbc/JDBCRealm.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/jdbc/JDBCRealm.java index 1f4666aba10..96222c25265 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/jdbc/JDBCRealm.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/jdbc/JDBCRealm.java @@ -17,9 +17,6 @@ package com.sun.enterprise.security.ee.authentication.glassfish.jdbc; -import static com.sun.enterprise.security.common.Util.getDefaultHabitat; -import static java.util.logging.Level.FINEST; - import com.sun.appserv.connectors.internal.api.ConnectorRuntime; import com.sun.enterprise.security.auth.digest.api.DigestAlgorithmParameter; import com.sun.enterprise.security.auth.digest.api.Password; @@ -30,6 +27,7 @@ import com.sun.enterprise.security.ee.authentication.glassfish.digest.DigestRealmBase; import com.sun.enterprise.universal.GFBase64Encoder; import com.sun.enterprise.util.Utility; + import java.io.Reader; import java.nio.charset.CharacterCodingException; import java.security.MessageDigest; @@ -49,13 +47,18 @@ import java.util.Properties; import java.util.Vector; import java.util.logging.Level; + import javax.security.auth.login.LoginException; import javax.sql.DataSource; + import org.glassfish.api.naming.SimpleJndiName; import org.glassfish.hk2.api.ActiveDescriptor; import org.glassfish.hk2.utilities.BuilderHelper; import org.jvnet.hk2.annotations.Service; +import static com.sun.enterprise.security.common.Util.getDefaultHabitat; +import static java.util.logging.Level.FINEST; + /** * Realm for supporting JDBC authentication. * diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/pam/PamLoginModule.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/pam/PamLoginModule.java index 359c1d340ef..9dc25c03c49 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/pam/PamLoginModule.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/pam/PamLoginModule.java @@ -17,12 +17,13 @@ package com.sun.enterprise.security.ee.authentication.glassfish.pam; -import static com.sun.enterprise.util.Utility.isEmpty; -import static java.util.logging.Level.FINE; - import com.sun.enterprise.security.BasePasswordLoginModule; + import javax.security.auth.login.LoginException; +import static com.sun.enterprise.util.Utility.isEmpty; +import static java.util.logging.Level.FINE; + /** * This is the main LoginModule for PAM realm that invokes the calls to libpam4j classes to authenticate the given * username and password diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/pam/PamRealm.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/pam/PamRealm.java index 1fb9dc0afbe..d37a08fac47 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/pam/PamRealm.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/pam/PamRealm.java @@ -17,23 +17,25 @@ package com.sun.enterprise.security.ee.authentication.glassfish.pam; -import static java.util.Collections.enumeration; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.SEVERE; - import com.sun.enterprise.security.auth.realm.Realm; import com.sun.enterprise.security.auth.realm.exceptions.BadRealmException; import com.sun.enterprise.security.auth.realm.exceptions.NoSuchRealmException; import com.sun.enterprise.security.auth.realm.exceptions.NoSuchUserException; + import java.util.Enumeration; import java.util.Properties; import java.util.Set; import java.util.logging.Logger; + import org.jvnet.hk2.annotations.Service; import org.jvnet.libpam.PAM; import org.jvnet.libpam.PAMException; import org.jvnet.libpam.UnixUser; +import static java.util.Collections.enumeration; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.SEVERE; + /** * Realm wrapper for supporting PAM based authentication for all Unix machines. The PAM realm uses the Operating * System's PAM login mechanism to authenticate the applications with their OS usernames and passwords. diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authorize/HandlerData.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authorize/HandlerData.java index b049b851467..27dc99273d7 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authorize/HandlerData.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authorize/HandlerData.java @@ -16,13 +16,14 @@ package com.sun.enterprise.security.ee.authorize; -import org.glassfish.api.invocation.ComponentInvocation; -import org.glassfish.internal.api.Globals; - import com.sun.enterprise.security.SecurityContext; import com.sun.enterprise.security.ee.authorize.cache.PermissionCacheFactory; + import jakarta.servlet.http.HttpServletRequest; +import org.glassfish.api.invocation.ComponentInvocation; +import org.glassfish.internal.api.Globals; + /** * This class implements a thread scoped data used for PolicyContext. * diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authorize/PolicyContextHandlerImpl.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authorize/PolicyContextHandlerImpl.java index 72650812f61..5510d6e71a6 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authorize/PolicyContextHandlerImpl.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authorize/PolicyContextHandlerImpl.java @@ -16,10 +16,10 @@ package com.sun.enterprise.security.ee.authorize; -import java.security.SecurityPermission; - import jakarta.security.jacc.PolicyContextHandler; +import java.security.SecurityPermission; + /** * This class is created by the container and handed over to the JACC provider. This lets the jacc provider to use the * information in making authorization decisions, if it wishes to do so. diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authorize/cache/PermissionCacheFactory.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authorize/cache/PermissionCacheFactory.java index 06b96e25e1a..573cd7ab312 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authorize/cache/PermissionCacheFactory.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authorize/cache/PermissionCacheFactory.java @@ -17,6 +17,7 @@ package com.sun.enterprise.security.ee.authorize.cache; import com.sun.enterprise.security.ee.J2EESecurityManager; + import java.security.CodeSource; import java.security.Permission; import java.security.Policy; diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/AuthMessagePolicy.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/AuthMessagePolicy.java index 2bde9500f4b..37b291f7992 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/AuthMessagePolicy.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/AuthMessagePolicy.java @@ -17,19 +17,6 @@ package com.sun.enterprise.security.ee.jmac; -import static com.sun.enterprise.deployment.runtime.common.MessageSecurityBindingDescriptor.AUTH_LAYER; -import static com.sun.enterprise.deployment.runtime.common.MessageSecurityBindingDescriptor.PROVIDER_ID; -import static org.glassfish.epicyro.config.helper.HttpServletConstants.SOAP; - -import java.security.PrivilegedActionException; -import java.security.PrivilegedExceptionAction; -import java.util.List; -import java.util.Map; - -import javax.security.auth.callback.CallbackHandler; - -import org.glassfish.internal.api.Globals; - import com.sun.enterprise.deployment.ServiceReferenceDescriptor; import com.sun.enterprise.deployment.WebBundleDescriptor; import com.sun.enterprise.deployment.WebServiceEndpoint; @@ -42,6 +29,19 @@ import jakarta.security.auth.message.MessagePolicy; +import java.security.PrivilegedActionException; +import java.security.PrivilegedExceptionAction; +import java.util.List; +import java.util.Map; + +import javax.security.auth.callback.CallbackHandler; + +import org.glassfish.internal.api.Globals; + +import static com.sun.enterprise.deployment.runtime.common.MessageSecurityBindingDescriptor.AUTH_LAYER; +import static com.sun.enterprise.deployment.runtime.common.MessageSecurityBindingDescriptor.PROVIDER_ID; +import static org.glassfish.epicyro.config.helper.HttpServletConstants.SOAP; + /** * Utility class for Jakarta Authentication appserver implementation. */ diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/ConfigDomainParser.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/ConfigDomainParser.java index 8f5a47e164d..8e1752cecb2 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/ConfigDomainParser.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/ConfigDomainParser.java @@ -17,8 +17,14 @@ package com.sun.enterprise.security.ee.jmac; -import static java.util.logging.Level.FINE; -import static java.util.regex.Matcher.quoteReplacement; +import com.sun.enterprise.config.serverbeans.MessageSecurityConfig; +import com.sun.enterprise.config.serverbeans.ProviderConfig; +import com.sun.enterprise.config.serverbeans.RequestPolicy; +import com.sun.enterprise.config.serverbeans.ResponsePolicy; +import com.sun.enterprise.config.serverbeans.SecurityService; +import com.sun.logging.LogDomains; + +import jakarta.security.auth.message.MessagePolicy; import java.io.IOException; import java.util.HashMap; @@ -38,14 +44,8 @@ import org.glassfish.internal.api.Globals; import org.jvnet.hk2.config.types.Property; -import com.sun.enterprise.config.serverbeans.MessageSecurityConfig; -import com.sun.enterprise.config.serverbeans.ProviderConfig; -import com.sun.enterprise.config.serverbeans.RequestPolicy; -import com.sun.enterprise.config.serverbeans.ResponsePolicy; -import com.sun.enterprise.config.serverbeans.SecurityService; -import com.sun.logging.LogDomains; - -import jakarta.security.auth.message.MessagePolicy; +import static java.util.logging.Level.FINE; +import static java.util.regex.Matcher.quoteReplacement; /** * Parser for message-security-config in domain.xml diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/MessageSecurityConfigEventListenerImpl.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/MessageSecurityConfigEventListenerImpl.java index 4f676172954..830e4e4acf9 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/MessageSecurityConfigEventListenerImpl.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/MessageSecurityConfigEventListenerImpl.java @@ -17,7 +17,13 @@ package com.sun.enterprise.security.ee.jmac; -import static java.util.logging.Level.FINE; +import com.sun.enterprise.config.serverbeans.MessageSecurityConfig; +import com.sun.enterprise.config.serverbeans.SecurityService; +import com.sun.logging.LogDomains; + +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.security.auth.message.config.AuthConfigFactory; import java.beans.PropertyChangeEvent; import java.util.logging.Logger; @@ -33,13 +39,7 @@ import org.jvnet.hk2.config.NotProcessed; import org.jvnet.hk2.config.UnprocessedChangeEvents; -import com.sun.enterprise.config.serverbeans.MessageSecurityConfig; -import com.sun.enterprise.config.serverbeans.SecurityService; -import com.sun.logging.LogDomains; - -import jakarta.inject.Inject; -import jakarta.inject.Named; -import jakarta.security.auth.message.config.AuthConfigFactory; +import static java.util.logging.Level.FINE; /** * Listener class to handle admin message-security-config element events. diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/WebServicesDelegate.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/WebServicesDelegate.java index c48f9197f2b..10180632580 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/WebServicesDelegate.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/WebServicesDelegate.java @@ -19,8 +19,11 @@ import com.sun.enterprise.deployment.ServiceReferenceDescriptor; import com.sun.enterprise.deployment.runtime.common.MessageSecurityBindingDescriptor; + import jakarta.security.auth.message.MessageInfo; + import java.util.Map; + import org.jvnet.hk2.annotations.Contract; /** diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/callback/ClientContainerCallbackHandler.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/callback/ClientContainerCallbackHandler.java index df77abd7b7b..344a196adcd 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/callback/ClientContainerCallbackHandler.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/callback/ClientContainerCallbackHandler.java @@ -22,15 +22,6 @@ package com.sun.enterprise.security.ee.jmac.callback; -import java.io.IOException; - -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.CallbackHandler; -import javax.security.auth.callback.ChoiceCallback; -import javax.security.auth.callback.NameCallback; -import javax.security.auth.callback.PasswordCallback; -import javax.security.auth.callback.UnsupportedCallbackException; - import com.sun.enterprise.security.SecurityServicesUtil; import com.sun.enterprise.security.UsernamePasswordStore; @@ -42,6 +33,15 @@ import jakarta.security.auth.message.callback.SecretKeyCallback; import jakarta.security.auth.message.callback.TrustStoreCallback; +import java.io.IOException; + +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.callback.ChoiceCallback; +import javax.security.auth.callback.NameCallback; +import javax.security.auth.callback.PasswordCallback; +import javax.security.auth.callback.UnsupportedCallbackException; + /** * Appclient side Callback Handler for WSS. * diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/callback/ContainerCallbackHandler.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/callback/ContainerCallbackHandler.java index cf3fcc17518..e778ec0ff5a 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/callback/ContainerCallbackHandler.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/callback/ContainerCallbackHandler.java @@ -23,6 +23,8 @@ package com.sun.enterprise.security.ee.jmac.callback; +import com.sun.enterprise.security.SecurityServicesUtil; + import java.io.IOException; import javax.security.auth.callback.Callback; @@ -33,8 +35,6 @@ import org.jvnet.hk2.annotations.ContractsProvided; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.security.SecurityServicesUtil; - /** * @author Shing Wai Chan */ diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/callback/GlassFishBaseCallbackHandler.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/callback/GlassFishBaseCallbackHandler.java index 8bd16473e0d..ac5b0c35969 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/callback/GlassFishBaseCallbackHandler.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/callback/GlassFishBaseCallbackHandler.java @@ -16,9 +16,13 @@ */ package com.sun.enterprise.security.ee.jmac.callback; -import static com.sun.logging.LogDomains.SECURITY_LOGGER; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.WARNING; +import com.sun.enterprise.security.SecurityServicesUtil; +import com.sun.enterprise.security.ssl.SSLUtils; +import com.sun.enterprise.security.store.PasswordAdapter; +import com.sun.enterprise.server.pluggable.SecuritySupport; +import com.sun.logging.LogDomains; + +import jakarta.security.auth.message.callback.SecretKeyCallback; import java.io.IOException; import java.security.GeneralSecurityException; @@ -36,13 +40,9 @@ import org.glassfish.internal.api.Globals; import org.glassfish.security.common.MasterPassword; -import com.sun.enterprise.security.SecurityServicesUtil; -import com.sun.enterprise.security.ssl.SSLUtils; -import com.sun.enterprise.security.store.PasswordAdapter; -import com.sun.enterprise.server.pluggable.SecuritySupport; -import com.sun.logging.LogDomains; - -import jakarta.security.auth.message.callback.SecretKeyCallback; +import static com.sun.logging.LogDomains.SECURITY_LOGGER; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.WARNING; public abstract class GlassFishBaseCallbackHandler extends BaseCallbackHandler { diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/callback/ServerContainerCallbackHandler.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/callback/ServerContainerCallbackHandler.java index f14f313cc98..1075313aac8 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/callback/ServerContainerCallbackHandler.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/jmac/callback/ServerContainerCallbackHandler.java @@ -22,11 +22,6 @@ package com.sun.enterprise.security.ee.jmac.callback; -import java.io.IOException; - -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.UnsupportedCallbackException; - import com.sun.enterprise.security.auth.login.LoginContextDriver; import com.sun.enterprise.security.auth.login.common.LoginException; @@ -38,6 +33,11 @@ import jakarta.security.auth.message.callback.SecretKeyCallback; import jakarta.security.auth.message.callback.TrustStoreCallback; +import java.io.IOException; + +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.UnsupportedCallbackException; + /** * Callback Handler for ServerContainer * diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/perms/EarEEPermissionsProcessor.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/perms/EarEEPermissionsProcessor.java index aea2ab4cf32..76ac7e28b11 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/perms/EarEEPermissionsProcessor.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/perms/EarEEPermissionsProcessor.java @@ -18,6 +18,7 @@ package com.sun.enterprise.security.ee.perms; import com.sun.enterprise.security.ee.perms.SMGlobalPolicyUtil.CommponentType; + import java.net.MalformedURLException; import java.security.Permission; import java.security.PermissionCollection; diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/perms/PermissionsProcessor.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/perms/PermissionsProcessor.java index 4b44e017369..6afa44078ee 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/perms/PermissionsProcessor.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/perms/PermissionsProcessor.java @@ -16,6 +16,8 @@ package com.sun.enterprise.security.ee.perms; +import com.sun.logging.LogDomains; + import java.io.File; import java.io.FilePermission; import java.net.MalformedURLException; @@ -28,8 +30,6 @@ import org.glassfish.api.deployment.DeploymentContext; -import com.sun.logging.LogDomains; - public class PermissionsProcessor { public static final String CURRENT_FOLDER = "*"; diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/perms/PermsArchiveDelegate.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/perms/PermsArchiveDelegate.java index 0c40bcaea43..73d9c3f391b 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/perms/PermsArchiveDelegate.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/perms/PermsArchiveDelegate.java @@ -16,6 +16,8 @@ package com.sun.enterprise.security.ee.perms; +import com.sun.enterprise.security.integration.DDPermissionsLoader; + import java.io.File; import java.io.FileNotFoundException; import java.security.PermissionCollection; @@ -26,8 +28,6 @@ import org.glassfish.api.deployment.DeploymentContext; import org.glassfish.internal.deployment.ExtendedDeploymentContext; -import com.sun.enterprise.security.integration.DDPermissionsLoader; - public class PermsArchiveDelegate { /** diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/perms/SMGlobalPolicyUtil.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/perms/SMGlobalPolicyUtil.java index b61fb46c877..ca84b9ddc37 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/perms/SMGlobalPolicyUtil.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/perms/SMGlobalPolicyUtil.java @@ -17,6 +17,8 @@ package com.sun.enterprise.security.ee.perms; +import com.sun.logging.LogDomains; + import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -39,8 +41,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import com.sun.logging.LogDomains; - /** * Utility class to load the EE permissions, EE restrictions, and check restrictions for a given permission set */ diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/web/integration/GlassFishToExousiaConverter.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/web/integration/GlassFishToExousiaConverter.java index 1da52c3846c..8027fa17927 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/web/integration/GlassFishToExousiaConverter.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/web/integration/GlassFishToExousiaConverter.java @@ -16,10 +16,11 @@ package com.sun.enterprise.security.ee.web.integration; -import static jakarta.servlet.annotation.ServletSecurity.TransportGuarantee.CONFIDENTIAL; -import static jakarta.servlet.annotation.ServletSecurity.TransportGuarantee.NONE; -import static java.util.Collections.list; -import static java.util.stream.Collectors.toSet; +import com.sun.enterprise.deployment.WebBundleDescriptor; +import com.sun.enterprise.deployment.WebComponentDescriptor; +import com.sun.enterprise.deployment.web.SecurityRoleReference; + +import jakarta.servlet.annotation.ServletSecurity.TransportGuarantee; import java.util.ArrayList; import java.util.HashMap; @@ -32,11 +33,10 @@ import org.glassfish.exousia.constraints.WebResourceCollection; import org.glassfish.exousia.mapping.SecurityRoleRef; -import com.sun.enterprise.deployment.WebBundleDescriptor; -import com.sun.enterprise.deployment.WebComponentDescriptor; -import com.sun.enterprise.deployment.web.SecurityRoleReference; - -import jakarta.servlet.annotation.ServletSecurity.TransportGuarantee; +import static jakarta.servlet.annotation.ServletSecurity.TransportGuarantee.CONFIDENTIAL; +import static jakarta.servlet.annotation.ServletSecurity.TransportGuarantee.NONE; +import static java.util.Collections.list; +import static java.util.stream.Collectors.toSet; /** * This class converts from GlassFish security types to Exousia security types. diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/web/integration/WebProgrammaticLogin.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/web/integration/WebProgrammaticLogin.java index 047bc167af0..b96455d05ab 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/web/integration/WebProgrammaticLogin.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/web/integration/WebProgrammaticLogin.java @@ -21,11 +21,11 @@ package com.sun.enterprise.security.ee.web.integration; -import org.jvnet.hk2.annotations.Contract; - import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import org.jvnet.hk2.annotations.Contract; + /** * Web specific Programmatic Login An implementation of this will be injected into * com.sun.appserv.security.api.ProgrammaticLogin diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/web/integration/WebSecurityManager.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/web/integration/WebSecurityManager.java index ef593709067..f76ad6b5dd3 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/web/integration/WebSecurityManager.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/web/integration/WebSecurityManager.java @@ -17,32 +17,6 @@ package com.sun.enterprise.security.ee.web.integration; -import static com.sun.enterprise.security.ee.authorize.PolicyContextHandlerImpl.HTTP_SERVLET_REQUEST; -import static com.sun.enterprise.security.ee.authorize.cache.PermissionCacheFactory.createPermissionCache; -import static com.sun.enterprise.security.ee.web.integration.GlassFishToExousiaConverter.getConstraintsFromBundle; -import static com.sun.enterprise.security.ee.web.integration.GlassFishToExousiaConverter.getSecurityRoleRefsFromBundle; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.SEVERE; -import static java.util.stream.Collectors.toSet; -import static org.glassfish.api.web.Constants.ADMIN_VS; - -import java.net.MalformedURLException; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; -import java.security.CodeSource; -import java.security.Permission; -import java.security.Principal; -import java.security.cert.Certificate; -import java.util.List; -import java.util.Set; -import java.util.logging.Logger; - -import org.glassfish.exousia.AuthorizationService; -import org.glassfish.internal.api.ServerContext; -import org.glassfish.security.common.Group; -import org.glassfish.security.common.UserNameAndPassword; - import com.sun.enterprise.config.serverbeans.ApplicationRef; import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.deployment.WebBundleDescriptor; @@ -61,12 +35,39 @@ import com.sun.enterprise.security.ee.authorize.cache.CachedPermissionImpl; import com.sun.enterprise.security.ee.authorize.cache.PermissionCache; import com.sun.enterprise.security.ee.authorize.cache.PermissionCacheFactory; + import jakarta.security.jacc.PolicyContext; import jakarta.security.jacc.PolicyContextException; import jakarta.security.jacc.WebResourcePermission; import jakarta.security.jacc.WebUserDataPermission; import jakarta.servlet.http.HttpServletRequest; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.security.CodeSource; +import java.security.Permission; +import java.security.Principal; +import java.security.cert.Certificate; +import java.util.List; +import java.util.Set; +import java.util.logging.Logger; + +import org.glassfish.exousia.AuthorizationService; +import org.glassfish.internal.api.ServerContext; +import org.glassfish.security.common.Group; +import org.glassfish.security.common.UserNameAndPassword; + +import static com.sun.enterprise.security.ee.authorize.PolicyContextHandlerImpl.HTTP_SERVLET_REQUEST; +import static com.sun.enterprise.security.ee.authorize.cache.PermissionCacheFactory.createPermissionCache; +import static com.sun.enterprise.security.ee.web.integration.GlassFishToExousiaConverter.getConstraintsFromBundle; +import static com.sun.enterprise.security.ee.web.integration.GlassFishToExousiaConverter.getSecurityRoleRefsFromBundle; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.SEVERE; +import static java.util.stream.Collectors.toSet; +import static org.glassfish.api.web.Constants.ADMIN_VS; + /** * The class implements the JSR 115 - JavaTM Authorization Contract for Containers. This class is a companion class of * EJBSecurityManager. diff --git a/appserver/security/core-ee/src/test/java/com/sun/enterprise/security/ee/perms/SMGlobalPolicyUtilTest.java b/appserver/security/core-ee/src/test/java/com/sun/enterprise/security/ee/perms/SMGlobalPolicyUtilTest.java index a7f200f531b..9d8f2e2cd52 100644 --- a/appserver/security/core-ee/src/test/java/com/sun/enterprise/security/ee/perms/SMGlobalPolicyUtilTest.java +++ b/appserver/security/core-ee/src/test/java/com/sun/enterprise/security/ee/perms/SMGlobalPolicyUtilTest.java @@ -17,11 +17,6 @@ package com.sun.enterprise.security.ee.perms; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - import java.io.File; import java.io.FilePermission; import java.net.MalformedURLException; @@ -36,9 +31,15 @@ import java.security.URIParameter; import java.security.cert.Certificate; import java.util.Enumeration; + import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class SMGlobalPolicyUtilTest { private static final String plfile = "server.policy"; diff --git a/appserver/security/core-ee/src/test/java/com/sun/enterprise/security/ee/perms/VoidPermissionTest.java b/appserver/security/core-ee/src/test/java/com/sun/enterprise/security/ee/perms/VoidPermissionTest.java index 4440323d0cb..51e5a8e1b62 100644 --- a/appserver/security/core-ee/src/test/java/com/sun/enterprise/security/ee/perms/VoidPermissionTest.java +++ b/appserver/security/core-ee/src/test/java/com/sun/enterprise/security/ee/perms/VoidPermissionTest.java @@ -17,14 +17,15 @@ package com.sun.enterprise.security.ee.perms; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - import java.io.FilePermission; import java.security.AllPermission; import java.security.Permission; + import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class VoidPermissionTest { @Test diff --git a/appserver/security/webintegration/src/main/java/com/sun/web/security/CNonceCacheFactoryImpl.java b/appserver/security/webintegration/src/main/java/com/sun/web/security/CNonceCacheFactoryImpl.java index 654b43732b0..fa344abb887 100644 --- a/appserver/security/webintegration/src/main/java/com/sun/web/security/CNonceCacheFactoryImpl.java +++ b/appserver/security/webintegration/src/main/java/com/sun/web/security/CNonceCacheFactoryImpl.java @@ -16,14 +16,6 @@ package com.sun.web.security; -import java.util.HashMap; -import java.util.Map; - -import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.hk2.api.PostConstruct; -import org.glassfish.security.common.CNonceCache; -import org.jvnet.hk2.annotations.Service; - import com.sun.enterprise.config.serverbeans.SecurityService; import com.sun.enterprise.security.CNonceCacheFactory; @@ -32,6 +24,14 @@ import jakarta.inject.Provider; import jakarta.inject.Singleton; +import java.util.HashMap; +import java.util.Map; + +import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.hk2.api.PostConstruct; +import org.glassfish.security.common.CNonceCache; +import org.jvnet.hk2.annotations.Service; + /** * * @author vbkumarjayanti diff --git a/appserver/security/webintegration/src/main/java/com/sun/web/security/HttpRequestWrapper.java b/appserver/security/webintegration/src/main/java/com/sun/web/security/HttpRequestWrapper.java index d9176626010..bf83ef6e41a 100644 --- a/appserver/security/webintegration/src/main/java/com/sun/web/security/HttpRequestWrapper.java +++ b/appserver/security/webintegration/src/main/java/com/sun/web/security/HttpRequestWrapper.java @@ -17,6 +17,18 @@ package com.sun.web.security; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.FilterChain; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletConnection; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -38,18 +50,6 @@ import org.apache.catalina.connector.Request; import org.glassfish.grizzly.http.util.DataChunk; -import jakarta.servlet.AsyncContext; -import jakarta.servlet.DispatcherType; -import jakarta.servlet.FilterChain; -import jakarta.servlet.RequestDispatcher; -import jakarta.servlet.ServletConnection; -import jakarta.servlet.ServletContext; -import jakarta.servlet.ServletInputStream; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.http.Cookie; -import jakarta.servlet.http.HttpServletRequest; - class HttpRequestWrapper implements HttpRequest, ServletRequest { private final Request httpRequest; diff --git a/appserver/security/webintegration/src/main/java/com/sun/web/security/HttpResponseWrapper.java b/appserver/security/webintegration/src/main/java/com/sun/web/security/HttpResponseWrapper.java index 401fb5b6b54..06371cb6c17 100644 --- a/appserver/security/webintegration/src/main/java/com/sun/web/security/HttpResponseWrapper.java +++ b/appserver/security/webintegration/src/main/java/com/sun/web/security/HttpResponseWrapper.java @@ -16,6 +16,12 @@ package com.sun.web.security; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; + import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; @@ -26,12 +32,6 @@ import org.apache.catalina.HttpResponse; import org.apache.catalina.Request; -import jakarta.servlet.ServletOutputStream; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.http.Cookie; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.servlet.http.HttpServletResponseWrapper; - class HttpResponseWrapper extends HttpServletResponseWrapper implements HttpResponse { private final HttpResponse httpResponse; diff --git a/appserver/security/webintegration/src/main/java/com/sun/web/security/RequestFacadeWrapper.java b/appserver/security/webintegration/src/main/java/com/sun/web/security/RequestFacadeWrapper.java index 1988108551d..940a7bd2f48 100644 --- a/appserver/security/webintegration/src/main/java/com/sun/web/security/RequestFacadeWrapper.java +++ b/appserver/security/webintegration/src/main/java/com/sun/web/security/RequestFacadeWrapper.java @@ -16,18 +16,6 @@ package com.sun.web.security; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.security.Principal; -import java.util.Collection; -import java.util.Enumeration; -import java.util.Locale; -import java.util.Map; - -import org.apache.catalina.connector.Request; -import org.apache.catalina.connector.RequestFacade; - import jakarta.servlet.AsyncContext; import jakarta.servlet.DispatcherType; import jakarta.servlet.RequestDispatcher; @@ -43,6 +31,18 @@ import jakarta.servlet.http.HttpSession; import jakarta.servlet.http.Part; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.security.Principal; +import java.util.Collection; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Map; + +import org.apache.catalina.connector.Request; +import org.apache.catalina.connector.RequestFacade; + class RequestFacadeWrapper extends RequestFacade implements HttpServletRequest { private final HttpServletRequest servletRequest; diff --git a/appserver/security/webintegration/src/main/java/com/sun/web/security/WebProgrammaticLoginImpl.java b/appserver/security/webintegration/src/main/java/com/sun/web/security/WebProgrammaticLoginImpl.java index a1a5adb505a..cf856437b85 100644 --- a/appserver/security/webintegration/src/main/java/com/sun/web/security/WebProgrammaticLoginImpl.java +++ b/appserver/security/webintegration/src/main/java/com/sun/web/security/WebProgrammaticLoginImpl.java @@ -21,6 +21,7 @@ import com.sun.enterprise.security.auth.login.LoginContextDriver; import com.sun.enterprise.security.ee.web.integration.WebPrincipal; import com.sun.enterprise.security.ee.web.integration.WebProgrammaticLogin; + import jakarta.servlet.ServletRequest; import jakarta.servlet.ServletRequestWrapper; import jakarta.servlet.http.HttpServletRequest; diff --git a/appserver/security/webintegration/src/main/java/com/sun/web/security/WebSecurityComponentInvocationHandler.java b/appserver/security/webintegration/src/main/java/com/sun/web/security/WebSecurityComponentInvocationHandler.java index 098970c08bf..557656081de 100644 --- a/appserver/security/webintegration/src/main/java/com/sun/web/security/WebSecurityComponentInvocationHandler.java +++ b/appserver/security/webintegration/src/main/java/com/sun/web/security/WebSecurityComponentInvocationHandler.java @@ -16,7 +16,8 @@ package com.sun.web.security; -import static org.glassfish.api.invocation.ComponentInvocation.ComponentInvocationType.SERVLET_INVOCATION; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.apache.catalina.Realm; import org.apache.catalina.core.ContainerBase; @@ -28,8 +29,7 @@ import org.glassfish.api.invocation.RegisteredComponentInvocationHandler; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import jakarta.inject.Singleton; +import static org.glassfish.api.invocation.ComponentInvocation.ComponentInvocationType.SERVLET_INVOCATION; @Service(name = "webSecurityCIH") @Singleton diff --git a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/LogUtils.java b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/LogUtils.java index fe659a9b59a..bfe6f32e73d 100644 --- a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/LogUtils.java +++ b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/LogUtils.java @@ -17,6 +17,7 @@ package com.sun.enterprise.security.webservices; import java.util.logging.Logger; + import org.glassfish.logging.annotation.LogMessageInfo; import org.glassfish.logging.annotation.LogMessagesResourceBundle; import org.glassfish.logging.annotation.LoggerInfo; diff --git a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/SecurityServiceImpl.java b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/SecurityServiceImpl.java index eb7472b5910..76380ca6338 100644 --- a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/SecurityServiceImpl.java +++ b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/SecurityServiceImpl.java @@ -17,11 +17,6 @@ package com.sun.enterprise.security.webservices; -import static com.sun.enterprise.security.webservices.LogUtils.BASIC_AUTH_ERROR; -import static com.sun.enterprise.util.Utility.isEmpty; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.WARNING; - import com.sun.enterprise.deployment.ServiceReferenceDescriptor; import com.sun.enterprise.deployment.WebServiceEndpoint; import com.sun.enterprise.security.SecurityContext; @@ -32,14 +27,17 @@ import com.sun.enterprise.web.WebModule; import com.sun.web.security.RealmAdapter; import com.sun.xml.ws.assembler.metro.dev.ClientPipelineHook; + import jakarta.inject.Inject; import jakarta.inject.Singleton; import jakarta.security.jacc.PolicyContext; import jakarta.servlet.http.HttpServletRequest; + import java.security.Principal; import java.security.cert.X509Certificate; import java.util.Base64; import java.util.logging.Logger; + import org.apache.catalina.Globals; import org.glassfish.security.common.UserNameAndPassword; import org.glassfish.webservices.EjbRuntimeEndpointInfo; @@ -50,6 +48,11 @@ import org.glassfish.webservices.monitoring.WebServiceEngineImpl; import org.jvnet.hk2.annotations.Service; +import static com.sun.enterprise.security.webservices.LogUtils.BASIC_AUTH_ERROR; +import static com.sun.enterprise.util.Utility.isEmpty; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.WARNING; + /** * @author Kumar */ diff --git a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/SoapAuthenticationService.java b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/SoapAuthenticationService.java index f688d44d1f8..4d04ec75771 100644 --- a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/SoapAuthenticationService.java +++ b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/SoapAuthenticationService.java @@ -17,37 +17,6 @@ package com.sun.enterprise.security.webservices; -import static com.sun.xml.wss.provider.wsit.PipeConstants.BINDING; -import static com.sun.xml.wss.provider.wsit.PipeConstants.CLIENT_SUBJECT; -import static com.sun.xml.wss.provider.wsit.PipeConstants.ENDPOINT; -import static com.sun.xml.wss.provider.wsit.PipeConstants.ENDPOINT_ADDRESS; -import static com.sun.xml.wss.provider.wsit.PipeConstants.POLICY; -import static com.sun.xml.wss.provider.wsit.PipeConstants.SEI_MODEL; -import static com.sun.xml.wss.provider.wsit.PipeConstants.SERVICE_ENDPOINT; -import static com.sun.xml.wss.provider.wsit.PipeConstants.SERVICE_REF; -import static com.sun.xml.wss.provider.wsit.PipeConstants.SOAP_LAYER; -import static com.sun.xml.wss.provider.wsit.PipeConstants.WSDL_MODEL; -import static jakarta.xml.ws.handler.MessageContext.SERVLET_REQUEST; - -import java.lang.reflect.Method; -import java.net.URL; -import java.security.AccessController; -import java.security.PrivilegedActionException; -import java.security.PrivilegedExceptionAction; -import java.util.Map; -import java.util.function.BiFunction; -import java.util.function.Function; - -import javax.security.auth.Subject; -import javax.security.auth.callback.CallbackHandler; - -import org.glassfish.api.invocation.ComponentInvocation; -import org.glassfish.api.invocation.InvocationManager; -import org.glassfish.deployment.common.ModuleDescriptor; -import org.glassfish.epicyro.config.module.configprovider.GFServerConfigProvider; -import org.glassfish.epicyro.services.BaseAuthenticationService; -import org.glassfish.internal.api.Globals; - import com.sun.enterprise.deployment.Application; import com.sun.enterprise.deployment.BundleDescriptor; import com.sun.enterprise.deployment.EjbDescriptor; @@ -79,6 +48,7 @@ import com.sun.xml.ws.api.model.wsdl.WSDLPort; import com.sun.xml.ws.api.server.WSEndpoint; import com.sun.xml.wss.provider.wsit.PipeConstants; + import jakarta.security.auth.message.AuthException; import jakarta.security.auth.message.AuthStatus; import jakarta.security.auth.message.MessageInfo; @@ -91,6 +61,37 @@ import jakarta.xml.bind.UnmarshalException; import jakarta.xml.ws.WebServiceException; +import java.lang.reflect.Method; +import java.net.URL; +import java.security.AccessController; +import java.security.PrivilegedActionException; +import java.security.PrivilegedExceptionAction; +import java.util.Map; +import java.util.function.BiFunction; +import java.util.function.Function; + +import javax.security.auth.Subject; +import javax.security.auth.callback.CallbackHandler; + +import org.glassfish.api.invocation.ComponentInvocation; +import org.glassfish.api.invocation.InvocationManager; +import org.glassfish.deployment.common.ModuleDescriptor; +import org.glassfish.epicyro.config.module.configprovider.GFServerConfigProvider; +import org.glassfish.epicyro.services.BaseAuthenticationService; +import org.glassfish.internal.api.Globals; + +import static com.sun.xml.wss.provider.wsit.PipeConstants.BINDING; +import static com.sun.xml.wss.provider.wsit.PipeConstants.CLIENT_SUBJECT; +import static com.sun.xml.wss.provider.wsit.PipeConstants.ENDPOINT; +import static com.sun.xml.wss.provider.wsit.PipeConstants.ENDPOINT_ADDRESS; +import static com.sun.xml.wss.provider.wsit.PipeConstants.POLICY; +import static com.sun.xml.wss.provider.wsit.PipeConstants.SEI_MODEL; +import static com.sun.xml.wss.provider.wsit.PipeConstants.SERVICE_ENDPOINT; +import static com.sun.xml.wss.provider.wsit.PipeConstants.SERVICE_REF; +import static com.sun.xml.wss.provider.wsit.PipeConstants.SOAP_LAYER; +import static com.sun.xml.wss.provider.wsit.PipeConstants.WSDL_MODEL; +import static jakarta.xml.ws.handler.MessageContext.SERVLET_REQUEST; + public class SoapAuthenticationService extends BaseAuthenticationService { private static final LocalStringManagerImpl localStrings = new LocalStringManagerImpl(PipeConstants.class); diff --git a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/WebServicesDelegateImpl.java b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/WebServicesDelegateImpl.java index cbec77bb8f7..4817e84956a 100644 --- a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/WebServicesDelegateImpl.java +++ b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/WebServicesDelegateImpl.java @@ -17,8 +17,6 @@ package com.sun.enterprise.security.webservices; -import static java.util.logging.Level.FINE; - import com.sun.enterprise.deployment.ServiceRefPortInfo; import com.sun.enterprise.deployment.ServiceReferenceDescriptor; import com.sun.enterprise.deployment.runtime.common.MessageSecurityBindingDescriptor; @@ -28,6 +26,7 @@ import com.sun.xml.ws.api.model.wsdl.WSDLBoundOperation; import com.sun.xml.ws.api.model.wsdl.WSDLPort; import com.sun.xml.wss.provider.wsit.PacketMessageInfo; + import jakarta.inject.Singleton; import jakarta.security.auth.message.MessageInfo; import jakarta.xml.soap.MimeHeaders; @@ -39,12 +38,17 @@ import jakarta.xml.soap.SOAPException; import jakarta.xml.soap.SOAPMessage; import jakarta.xml.soap.SOAPPart; + import java.util.Iterator; import java.util.Map; import java.util.logging.Logger; + import javax.xml.namespace.QName; + import org.jvnet.hk2.annotations.Service; +import static java.util.logging.Level.FINE; + /** * * @author kumar.jayanti diff --git a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/client/ClientPipeCloser.java b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/client/ClientPipeCloser.java index 277a5cdda81..437cc70bbd7 100644 --- a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/client/ClientPipeCloser.java +++ b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/client/ClientPipeCloser.java @@ -17,14 +17,14 @@ package com.sun.enterprise.security.webservices.client; +import com.sun.enterprise.deployment.ServiceReferenceDescriptor; + import java.util.Collections; import java.util.Map; import java.util.WeakHashMap; import org.glassfish.epicyro.services.AuthConfigRegistrationWrapper; -import com.sun.enterprise.deployment.ServiceReferenceDescriptor; - public class ClientPipeCloser { private Map svcRefListenerMap = diff --git a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/client/ClientSecurityPipe.java b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/client/ClientSecurityPipe.java index c373a4254bd..6d1e7322556 100644 --- a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/client/ClientSecurityPipe.java +++ b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/client/ClientSecurityPipe.java @@ -17,19 +17,6 @@ package com.sun.enterprise.security.webservices.client; -import static com.sun.enterprise.security.webservices.LogUtils.ERROR_REQUEST_SECURING; -import static com.sun.xml.wss.provider.wsit.PipeConstants.CLIENT_SUBJECT; -import static com.sun.xml.wss.provider.wsit.PipeConstants.SECURITY_PIPE; -import static com.sun.xml.wss.provider.wsit.PipeConstants.SECURITY_TOKEN; -import static com.sun.xml.wss.provider.wsit.PipeConstants.SOAP_LAYER; -import static com.sun.xml.wss.provider.wsit.PipeConstants.WSDL_MODEL; -import static com.sun.xml.wss.provider.wsit.PipeConstants.WSDL_SERVICE; -import static jakarta.security.auth.message.AuthStatus.FAILURE; -import static jakarta.security.auth.message.AuthStatus.SEND_CONTINUE; -import static jakarta.security.auth.message.AuthStatus.SEND_SUCCESS; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.SEVERE; - import com.sun.enterprise.security.ee.jmac.callback.ClientContainerCallbackHandler; import com.sun.enterprise.security.webservices.LogUtils; import com.sun.enterprise.security.webservices.SoapAuthenticationService; @@ -45,16 +32,32 @@ import com.sun.xml.wss.provider.wsit.PacketMapMessageInfo; import com.sun.xml.wss.provider.wsit.PacketMessageInfo; import com.sun.xml.wss.provider.wsit.PipeConstants; + import jakarta.security.auth.message.AuthStatus; import jakarta.security.auth.message.config.ClientAuthContext; import jakarta.xml.bind.JAXBElement; import jakarta.xml.ws.Endpoint; import jakarta.xml.ws.WebServiceException; + import java.util.HashMap; import java.util.Map; import java.util.logging.Logger; + import javax.security.auth.Subject; +import static com.sun.enterprise.security.webservices.LogUtils.ERROR_REQUEST_SECURING; +import static com.sun.xml.wss.provider.wsit.PipeConstants.CLIENT_SUBJECT; +import static com.sun.xml.wss.provider.wsit.PipeConstants.SECURITY_PIPE; +import static com.sun.xml.wss.provider.wsit.PipeConstants.SECURITY_TOKEN; +import static com.sun.xml.wss.provider.wsit.PipeConstants.SOAP_LAYER; +import static com.sun.xml.wss.provider.wsit.PipeConstants.WSDL_MODEL; +import static com.sun.xml.wss.provider.wsit.PipeConstants.WSDL_SERVICE; +import static jakarta.security.auth.message.AuthStatus.FAILURE; +import static jakarta.security.auth.message.AuthStatus.SEND_CONTINUE; +import static jakarta.security.auth.message.AuthStatus.SEND_SUCCESS; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.SEVERE; + /** * This pipe is used to do client side security for app server */ diff --git a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/client/ClientSecurityPipeCreator.java b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/client/ClientSecurityPipeCreator.java index dd33d36e782..957ace5acfa 100644 --- a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/client/ClientSecurityPipeCreator.java +++ b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/client/ClientSecurityPipeCreator.java @@ -17,6 +17,17 @@ package com.sun.enterprise.security.webservices.client; +import com.sun.enterprise.deployment.ServiceReferenceDescriptor; +import com.sun.xml.ws.api.pipe.ClientPipeAssemblerContext; +import com.sun.xml.ws.api.pipe.Pipe; +import com.sun.xml.ws.assembler.metro.dev.ClientPipelineHook; +import com.sun.xml.ws.policy.PolicyMap; + +import java.util.HashMap; +import java.util.Map; + +import org.glassfish.epicyro.services.AuthConfigRegistrationWrapper; + import static com.sun.xml.wss.provider.wsit.PipeConstants.ASSEMBLER_CONTEXT; import static com.sun.xml.wss.provider.wsit.PipeConstants.BINDING; import static com.sun.xml.wss.provider.wsit.PipeConstants.CONTAINER; @@ -27,15 +38,6 @@ import static com.sun.xml.wss.provider.wsit.PipeConstants.SERVICE_REF; import static com.sun.xml.wss.provider.wsit.PipeConstants.WSDL_MODEL; -import com.sun.enterprise.deployment.ServiceReferenceDescriptor; -import com.sun.xml.ws.api.pipe.ClientPipeAssemblerContext; -import com.sun.xml.ws.api.pipe.Pipe; -import com.sun.xml.ws.assembler.metro.dev.ClientPipelineHook; -import com.sun.xml.ws.policy.PolicyMap; -import java.util.HashMap; -import java.util.Map; -import org.glassfish.epicyro.services.AuthConfigRegistrationWrapper; - /** * This is used by WSClientContainer to return proper Jakarta Authentication security pipe to the StandAlonePipeAssembler and * TangoPipeAssembler diff --git a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/server/ServerSecurityPipe.java b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/server/ServerSecurityPipe.java index 31ee7a47de1..dba76b91a2d 100644 --- a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/server/ServerSecurityPipe.java +++ b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/server/ServerSecurityPipe.java @@ -17,14 +17,6 @@ package com.sun.enterprise.security.webservices.server; -import static com.sun.enterprise.security.webservices.LogUtils.ERROR_RESPONSE_SECURING; -import static com.sun.xml.wss.provider.wsit.PipeConstants.CLIENT_SUBJECT; -import static com.sun.xml.wss.provider.wsit.PipeConstants.SECURITY_PIPE; -import static com.sun.xml.wss.provider.wsit.PipeConstants.SOAP_LAYER; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.INFO; -import static java.util.logging.Level.SEVERE; - import com.sun.enterprise.security.ee.jmac.callback.ServerContainerCallbackHandler; import com.sun.enterprise.security.webservices.LogUtils; import com.sun.enterprise.security.webservices.SoapAuthenticationService; @@ -36,16 +28,27 @@ import com.sun.xml.wss.provider.wsit.PacketMapMessageInfo; import com.sun.xml.wss.provider.wsit.PacketMessageInfo; import com.sun.xml.wss.provider.wsit.PipeConstants; + import jakarta.security.auth.message.AuthException; import jakarta.security.auth.message.AuthStatus; import jakarta.security.auth.message.config.ServerAuthContext; import jakarta.xml.ws.WebServiceException; + import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; import java.util.Map; import java.util.logging.Logger; + import javax.security.auth.Subject; +import static com.sun.enterprise.security.webservices.LogUtils.ERROR_RESPONSE_SECURING; +import static com.sun.xml.wss.provider.wsit.PipeConstants.CLIENT_SUBJECT; +import static com.sun.xml.wss.provider.wsit.PipeConstants.SECURITY_PIPE; +import static com.sun.xml.wss.provider.wsit.PipeConstants.SOAP_LAYER; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.INFO; +import static java.util.logging.Level.SEVERE; + /** * This pipe uses Jakarta Authentication to authenticate messages / packages. */ diff --git a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/server/ServerSecurityPipeCreator.java b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/server/ServerSecurityPipeCreator.java index f807c4f97ae..b4f9ff687df 100644 --- a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/server/ServerSecurityPipeCreator.java +++ b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/server/ServerSecurityPipeCreator.java @@ -17,17 +17,6 @@ package com.sun.enterprise.security.webservices.server; -import static com.sun.enterprise.util.Utility.isAnyNull; -import static com.sun.xml.ws.policy.PolicyMap.createWsdlEndpointScopeKey; -import static com.sun.xml.ws.policy.PolicyMap.createWsdlOperationScopeKey; -import static com.sun.xml.wss.provider.wsit.PipeConstants.CONTAINER; -import static com.sun.xml.wss.provider.wsit.PipeConstants.ENDPOINT; -import static com.sun.xml.wss.provider.wsit.PipeConstants.NEXT_PIPE; -import static com.sun.xml.wss.provider.wsit.PipeConstants.POLICY; -import static com.sun.xml.wss.provider.wsit.PipeConstants.SEI_MODEL; -import static com.sun.xml.wss.provider.wsit.PipeConstants.SERVICE_ENDPOINT; -import static com.sun.xml.wss.provider.wsit.PipeConstants.WSDL_MODEL; - import com.sun.xml.ws.api.model.SEIModel; import com.sun.xml.ws.api.model.wsdl.WSDLBoundOperation; import com.sun.xml.ws.api.model.wsdl.WSDLPort; @@ -37,12 +26,26 @@ import com.sun.xml.ws.policy.PolicyException; import com.sun.xml.ws.policy.PolicyMap; import com.sun.xml.ws.policy.PolicyMapKey; + import jakarta.inject.Singleton; + import java.util.HashMap; import java.util.Map; + import org.glassfish.webservices.ServerPipeCreator; import org.jvnet.hk2.annotations.Service; +import static com.sun.enterprise.util.Utility.isAnyNull; +import static com.sun.xml.ws.policy.PolicyMap.createWsdlEndpointScopeKey; +import static com.sun.xml.ws.policy.PolicyMap.createWsdlOperationScopeKey; +import static com.sun.xml.wss.provider.wsit.PipeConstants.CONTAINER; +import static com.sun.xml.wss.provider.wsit.PipeConstants.ENDPOINT; +import static com.sun.xml.wss.provider.wsit.PipeConstants.NEXT_PIPE; +import static com.sun.xml.wss.provider.wsit.PipeConstants.POLICY; +import static com.sun.xml.wss.provider.wsit.PipeConstants.SEI_MODEL; +import static com.sun.xml.wss.provider.wsit.PipeConstants.SERVICE_ENDPOINT; +import static com.sun.xml.wss.provider.wsit.PipeConstants.WSDL_MODEL; + /** * This is used by JAXWSContainer to return proper Jakarta Authentication security and app server monitoring pipes to * the StandAlonePipeAssembler and TangoPipeAssembler diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/common/iiop/security/GSSUPName.java b/nucleus/security/core/src/main/java/com/sun/enterprise/common/iiop/security/GSSUPName.java index 7e62bd81bd2..0082dba0938 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/common/iiop/security/GSSUPName.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/common/iiop/security/GSSUPName.java @@ -16,12 +16,12 @@ package com.sun.enterprise.common.iiop.security; -import java.util.StringTokenizer; -import java.util.logging.Level; - import com.sun.enterprise.security.SecurityLoggerInfo; import com.sun.enterprise.security.common.Util; +import java.util.StringTokenizer; +import java.util.logging.Level; + /** * This class implements the GSSAPI exported name functionality as required by CSIV2. * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/AppCNonceCacheMap.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/AppCNonceCacheMap.java index fb47683a713..0b495b1d0e5 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/AppCNonceCacheMap.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/AppCNonceCacheMap.java @@ -16,13 +16,13 @@ package com.sun.enterprise.security; +import jakarta.inject.Singleton; + import java.util.HashMap; import org.glassfish.security.common.CNonceCache; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Singleton; - /** * * @author vbkumarjayanti diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/BasePasswordLoginModule.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/BasePasswordLoginModule.java index 2c334ffc542..d7c51cf5d15 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/BasePasswordLoginModule.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/BasePasswordLoginModule.java @@ -17,28 +17,31 @@ package com.sun.enterprise.security; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.SEVERE; - import com.sun.enterprise.security.auth.login.LoginCallbackHandler; import com.sun.enterprise.security.auth.login.common.PasswordCredential; import com.sun.enterprise.security.auth.realm.Realm; import com.sun.enterprise.util.i18n.StringManager; + import java.security.Principal; import java.util.Arrays; import java.util.Map; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; + import javax.security.auth.Subject; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.login.LoginException; import javax.security.auth.spi.LoginModule; + import org.glassfish.internal.api.Globals; import org.glassfish.security.common.Group; import org.glassfish.security.common.UserNameAndPassword; import org.glassfish.security.common.UserPrincipal; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.SEVERE; + /** * Abstract base class for password-based login modules. * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/EmbeddedSecurity.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/EmbeddedSecurity.java index 616fec6ed53..de58fa90d80 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/EmbeddedSecurity.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/EmbeddedSecurity.java @@ -16,6 +16,8 @@ package com.sun.enterprise.security; +import com.sun.enterprise.config.serverbeans.SecurityService; + import java.io.File; import java.io.IOException; import java.util.List; @@ -26,8 +28,6 @@ import org.glassfish.hk2.api.ServiceLocator; import org.jvnet.hk2.annotations.Contract; -import com.sun.enterprise.config.serverbeans.SecurityService; - /** * Utility contact to copy the security related config files from the passed non-embedded instanceDir to the embedded server * instance's config. This is implemented by the EmbeddedSecurityUtil class diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/GUILoginDialog.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/GUILoginDialog.java index 1b51d450192..8e5a14c1521 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/GUILoginDialog.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/GUILoginDialog.java @@ -16,6 +16,9 @@ package com.sun.enterprise.security; +import com.sun.enterprise.security.ssl.SSLUtils; +import com.sun.enterprise.util.LocalStringManagerImpl; + import java.awt.CardLayout; import java.awt.FlowLayout; import java.awt.GridBagConstraints; @@ -44,9 +47,6 @@ import org.glassfish.internal.api.Globals; -import com.sun.enterprise.security.ssl.SSLUtils; -import com.sun.enterprise.util.LocalStringManagerImpl; - /** * An implementation of a LoginDialog that presents a swing based GUI for querying username and password. * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/LoginContext.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/LoginContext.java index 1141dbcb90b..d317ae65396 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/LoginContext.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/LoginContext.java @@ -16,15 +16,15 @@ package com.sun.enterprise.security; -import java.security.PrivilegedAction; -import java.util.logging.Logger; - import com.sun.enterprise.security.auth.login.ClientPasswordLoginModule; import com.sun.enterprise.security.auth.login.LoginContextDriver; import com.sun.enterprise.security.auth.login.common.LoginException; import com.sun.enterprise.security.common.AppservAccessController; import com.sun.enterprise.security.common.SecurityConstants; +import java.security.PrivilegedAction; +import java.util.logging.Logger; + /** * This class is kept for CTS. Ideally we should move away from it. The login can be done via the following call: * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/PolicyLoader.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/PolicyLoader.java index 9ebfa37c472..5993d04bbba 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/PolicyLoader.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/PolicyLoader.java @@ -17,18 +17,14 @@ package com.sun.enterprise.security; -import static com.sun.enterprise.security.SecurityLoggerInfo.policyConfigFactoryNotDefined; -import static com.sun.enterprise.security.SecurityLoggerInfo.policyFactoryOverride; -import static com.sun.enterprise.security.SecurityLoggerInfo.policyInstallError; -import static com.sun.enterprise.security.SecurityLoggerInfo.policyLoading; -import static com.sun.enterprise.security.SecurityLoggerInfo.policyNoSuchName; -import static com.sun.enterprise.security.SecurityLoggerInfo.policyNotLoadingWarning; -import static com.sun.enterprise.security.SecurityLoggerInfo.policyProviderConfigOverrideMsg; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.INFO; -import static java.util.logging.Level.SEVERE; -import static java.util.logging.Level.WARNING; -import static javassist.Modifier.PUBLIC; +//V3:Commented import com.sun.enterprise.server.ApplicationServer; +import com.sun.enterprise.config.serverbeans.JaccProvider; +import com.sun.enterprise.config.serverbeans.SecurityService; +import com.sun.enterprise.util.i18n.StringManager; + +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import java.lang.reflect.Method; import java.security.Permission; @@ -45,20 +41,25 @@ import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.types.Property; -//V3:Commented import com.sun.enterprise.server.ApplicationServer; -import com.sun.enterprise.config.serverbeans.JaccProvider; -import com.sun.enterprise.config.serverbeans.SecurityService; -import com.sun.enterprise.util.i18n.StringManager; - -import jakarta.inject.Inject; -import jakarta.inject.Named; -import jakarta.inject.Singleton; import javassist.ClassPool; import javassist.CtClass; import javassist.util.proxy.MethodHandler; import javassist.util.proxy.ProxyFactory; import javassist.util.proxy.ProxyObject; +import static com.sun.enterprise.security.SecurityLoggerInfo.policyConfigFactoryNotDefined; +import static com.sun.enterprise.security.SecurityLoggerInfo.policyFactoryOverride; +import static com.sun.enterprise.security.SecurityLoggerInfo.policyInstallError; +import static com.sun.enterprise.security.SecurityLoggerInfo.policyLoading; +import static com.sun.enterprise.security.SecurityLoggerInfo.policyNoSuchName; +import static com.sun.enterprise.security.SecurityLoggerInfo.policyNotLoadingWarning; +import static com.sun.enterprise.security.SecurityLoggerInfo.policyProviderConfigOverrideMsg; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.INFO; +import static java.util.logging.Level.SEVERE; +import static java.util.logging.Level.WARNING; +import static javassist.Modifier.PUBLIC; + /** * Loads the Default Policy File into the system. * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityConfigListener.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityConfigListener.java index 58e457a91cf..ed08ee8b394 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityConfigListener.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityConfigListener.java @@ -17,6 +17,21 @@ package com.sun.enterprise.security; +import com.sun.enterprise.config.serverbeans.AuditModule; +import com.sun.enterprise.config.serverbeans.AuthRealm; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.JaccProvider; +import com.sun.enterprise.config.serverbeans.MessageSecurityConfig; +import com.sun.enterprise.config.serverbeans.SecurityService; +import com.sun.enterprise.security.audit.BaseAuditManager; +import com.sun.enterprise.security.auth.realm.Realm; +import com.sun.enterprise.security.auth.realm.RealmsManager; +import com.sun.enterprise.security.auth.realm.exceptions.NoSuchRealmException; + +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; + import java.beans.PropertyChangeEvent; import java.util.List; import java.util.Properties; @@ -35,20 +50,6 @@ import org.jvnet.hk2.config.UnprocessedChangeEvents; import org.jvnet.hk2.config.types.Property; -import com.sun.enterprise.config.serverbeans.AuditModule; -import com.sun.enterprise.config.serverbeans.AuthRealm; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.JaccProvider; -import com.sun.enterprise.config.serverbeans.MessageSecurityConfig; -import com.sun.enterprise.config.serverbeans.SecurityService; -import com.sun.enterprise.security.audit.BaseAuditManager; -import com.sun.enterprise.security.auth.realm.Realm; -import com.sun.enterprise.security.auth.realm.RealmsManager; -import com.sun.enterprise.security.auth.realm.exceptions.NoSuchRealmException; -import jakarta.inject.Inject; -import jakarta.inject.Named; -import jakarta.inject.Singleton; - /** * * @author kumar.jayanti diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityContext.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityContext.java index 2f7effe7953..439ae956908 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityContext.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityContext.java @@ -23,10 +23,6 @@ import com.sun.enterprise.security.common.AppservAccessController; import com.sun.enterprise.security.integration.AppServSecurityContext; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.FINER; -import static java.util.logging.Level.SEVERE; - import java.security.AccessController; import java.security.Principal; import java.security.PrivilegedAction; @@ -44,6 +40,10 @@ import org.glassfish.security.common.UserNameAndPassword; import org.jvnet.hk2.annotations.Service; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.FINER; +import static java.util.logging.Level.SEVERE; + /** * This class that extends AbstractSecurityContext that gets stored in Thread Local Storage. If the current thread * creates child threads, the SecurityContext stored in the current thread is automatically propagated to the child diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityLifecycle.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityLifecycle.java index f809f3935c8..d553f0e6108 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityLifecycle.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityLifecycle.java @@ -16,9 +16,13 @@ package com.sun.enterprise.security; -import static com.sun.enterprise.security.common.Util.writeConfigFileToTempDir; -import static java.util.logging.Level.INFO; -import static org.glassfish.api.event.EventTypes.SERVER_SHUTDOWN; +import com.sun.enterprise.security.audit.AuditManager; +import com.sun.enterprise.security.auth.realm.RealmsManager; +import com.sun.enterprise.security.common.Util; +import com.sun.enterprise.security.ssl.SSLUtils; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.util.logging.Level; import java.util.logging.Logger; @@ -32,13 +36,9 @@ import org.jvnet.hk2.annotations.Optional; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.security.audit.AuditManager; -import com.sun.enterprise.security.auth.realm.RealmsManager; -import com.sun.enterprise.security.common.Util; -import com.sun.enterprise.security.ssl.SSLUtils; - -import jakarta.inject.Inject; -import jakarta.inject.Singleton; +import static com.sun.enterprise.security.common.Util.writeConfigFileToTempDir; +import static java.util.logging.Level.INFO; +import static org.glassfish.api.event.EventTypes.SERVER_SHUTDOWN; /** * This class extends default implementation of ServerLifecycle interface. It provides security initialization and setup diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityServicesUtil.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityServicesUtil.java index c11c21bbc3f..e7d1c9f087e 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityServicesUtil.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityServicesUtil.java @@ -20,6 +20,11 @@ */ package com.sun.enterprise.security; +import com.sun.enterprise.security.audit.AuditManager; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import javax.security.auth.callback.CallbackHandler; import org.glassfish.api.admin.ProcessEnvironment; @@ -29,10 +34,6 @@ import org.glassfish.internal.api.Globals; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.security.audit.AuditManager; -import jakarta.inject.Inject; -import jakarta.inject.Singleton; - @Service @Singleton public class SecurityServicesUtil { diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityUpgradeService.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityUpgradeService.java index 4735c21d2c5..582981526b9 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityUpgradeService.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityUpgradeService.java @@ -16,6 +16,14 @@ package com.sun.enterprise.security; +import com.sun.enterprise.config.serverbeans.AuthRealm; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Configs; +import com.sun.enterprise.config.serverbeans.JaccProvider; +import com.sun.enterprise.config.serverbeans.SecurityService; + +import jakarta.inject.Inject; + import java.beans.PropertyVetoException; import java.io.File; import java.util.List; @@ -31,14 +39,6 @@ import org.jvnet.hk2.config.TransactionFailure; import org.jvnet.hk2.config.types.Property; -import com.sun.enterprise.config.serverbeans.AuthRealm; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Configs; -import com.sun.enterprise.config.serverbeans.JaccProvider; -import com.sun.enterprise.config.serverbeans.SecurityService; - -import jakarta.inject.Inject; - /** * The only thing that needs to added Extra for SecurityService migration is the addition of the new JACC provider. This would be * required when migrating from V2, for V3-Prelude it is already present. diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/TextLoginDialog.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/TextLoginDialog.java index 7b8f2acf182..2b18ace83f8 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/TextLoginDialog.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/TextLoginDialog.java @@ -16,6 +16,9 @@ package com.sun.enterprise.security; +import com.sun.enterprise.security.ssl.SSLUtils; +import com.sun.enterprise.util.LocalStringManagerImpl; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -34,9 +37,6 @@ import org.glassfish.internal.api.Globals; -import com.sun.enterprise.security.ssl.SSLUtils; -import com.sun.enterprise.util.LocalStringManagerImpl; - /** * This implementation of LoginDialog If these are not set, then it queries the user in the command window. * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/UsernamePasswordStore.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/UsernamePasswordStore.java index cb3c8a872ee..49821e6f39a 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/UsernamePasswordStore.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/UsernamePasswordStore.java @@ -16,9 +16,10 @@ package com.sun.enterprise.security; -import java.util.Arrays; import com.sun.enterprise.security.common.ClientSecurityContext; +import java.util.Arrays; + /** * This class is used to share information between either of the following scenarios 1. Different points of execution of a single * thread 2. Different threads that wish to share the username and password information diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/DisableSecureAdminCommand.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/DisableSecureAdminCommand.java index 1873d43e51e..6e06944a8d0 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/DisableSecureAdminCommand.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/DisableSecureAdminCommand.java @@ -16,6 +16,9 @@ package com.sun.enterprise.security.admin.cli; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.security.SecurityLoggerInfo; + import java.util.Iterator; import org.glassfish.api.I18n; @@ -27,9 +30,6 @@ import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.security.SecurityLoggerInfo; - /** * Adjusts the DAS configuration to turn off secure admin, as if by executing these commands: * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminHelperImpl.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminHelperImpl.java index 4791dab4f75..d3c5235772e 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminHelperImpl.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminHelperImpl.java @@ -16,19 +16,6 @@ package com.sun.enterprise.security.admin.cli; -import java.io.IOException; -import java.security.KeyStore; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.security.cert.Certificate; -import java.security.cert.CertificateException; -import java.security.cert.X509Certificate; -import java.util.Enumeration; - -import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.hk2.api.PerLookup; -import org.jvnet.hk2.annotations.Service; - import com.sun.enterprise.config.serverbeans.AdminService; import com.sun.enterprise.config.serverbeans.AuthRealm; import com.sun.enterprise.config.serverbeans.SecureAdminHelper; @@ -43,6 +30,19 @@ import jakarta.inject.Inject; import jakarta.inject.Named; +import java.io.IOException; +import java.security.KeyStore; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.cert.Certificate; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.Enumeration; + +import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; + /** * Various utility methods which support secure admin operations. * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminUpgradeHelper.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminUpgradeHelper.java index 3affb1149d1..915fc11f767 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminUpgradeHelper.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/admin/cli/SecureAdminUpgradeHelper.java @@ -16,6 +16,19 @@ package com.sun.enterprise.security.admin.cli; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.SecureAdmin; +import com.sun.enterprise.config.serverbeans.SecureAdminHelper; +import com.sun.enterprise.config.serverbeans.SecureAdminPrincipal; +import com.sun.enterprise.module.bootstrap.StartupContext; +import com.sun.enterprise.security.admin.cli.SecureAdminCommand.ConfigLevelContext; +import com.sun.enterprise.security.admin.cli.SecureAdminCommand.TopLevelContext; +import com.sun.enterprise.security.admin.cli.SecureAdminCommand.Work; +import com.sun.enterprise.security.ssl.SSLUtils; + +import jakarta.inject.Inject; + import java.io.IOException; import java.security.KeyStoreException; import java.util.Iterator; @@ -31,19 +44,6 @@ import org.jvnet.hk2.config.Transaction; import org.jvnet.hk2.config.TransactionFailure; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.SecureAdmin; -import com.sun.enterprise.config.serverbeans.SecureAdminHelper; -import com.sun.enterprise.config.serverbeans.SecureAdminPrincipal; -import com.sun.enterprise.module.bootstrap.StartupContext; -import com.sun.enterprise.security.admin.cli.SecureAdminCommand.ConfigLevelContext; -import com.sun.enterprise.security.admin.cli.SecureAdminCommand.TopLevelContext; -import com.sun.enterprise.security.admin.cli.SecureAdminCommand.Work; -import com.sun.enterprise.security.ssl.SSLUtils; - -import jakarta.inject.Inject; - /** * Common logic for formal upgrade (i.e., start-domain --upgrade) and silent upgrade (starting a newer version of GlassFish using * an older version's domain.xml). diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/audit/BaseAuditManager.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/audit/BaseAuditManager.java index e9dd4962b78..a20fb2c7fb3 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/audit/BaseAuditManager.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/audit/BaseAuditManager.java @@ -22,6 +22,14 @@ package com.sun.enterprise.security.audit; +import com.sun.enterprise.config.serverbeans.SecurityService; +import com.sun.enterprise.security.BaseAuditModule; +import com.sun.enterprise.security.SecurityLoggerInfo; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -42,14 +50,6 @@ import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.types.Property; -import com.sun.enterprise.config.serverbeans.SecurityService; -import com.sun.enterprise.security.BaseAuditModule; -import com.sun.enterprise.security.SecurityLoggerInfo; -import com.sun.enterprise.util.LocalStringManagerImpl; - -import jakarta.inject.Inject; -import jakarta.inject.Singleton; - /** * Basic implementation of audit manager. *

diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/ClientCertificateLoginModule.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/ClientCertificateLoginModule.java index 42b6713d1e9..2b268b4bfc5 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/ClientCertificateLoginModule.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/ClientCertificateLoginModule.java @@ -17,7 +17,11 @@ package com.sun.enterprise.security.auth.login; -import static java.util.logging.Level.FINE; +import com.sun.enterprise.security.SecurityLoggerInfo; +import com.sun.enterprise.security.auth.login.common.X509CertificateCredential; +import com.sun.enterprise.security.integration.AppClientSSL; +import com.sun.enterprise.security.ssl.SSLUtils; +import com.sun.enterprise.util.LocalStringManagerImpl; import java.security.KeyStore; import java.security.cert.X509Certificate; @@ -37,11 +41,7 @@ import org.glassfish.security.common.UserNameAndPassword; import org.glassfish.security.common.UserPrincipal; -import com.sun.enterprise.security.SecurityLoggerInfo; -import com.sun.enterprise.security.auth.login.common.X509CertificateCredential; -import com.sun.enterprise.security.integration.AppClientSSL; -import com.sun.enterprise.security.ssl.SSLUtils; -import com.sun.enterprise.util.LocalStringManagerImpl; +import static java.util.logging.Level.FINE; /** *

diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/ClientPasswordLoginModule.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/ClientPasswordLoginModule.java index 44ba2422017..d1e413ae9a8 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/ClientPasswordLoginModule.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/ClientPasswordLoginModule.java @@ -17,6 +17,11 @@ package com.sun.enterprise.security.auth.login; +import com.sun.enterprise.security.SecurityLoggerInfo; +import com.sun.enterprise.security.UsernamePasswordStore; +import com.sun.enterprise.security.auth.login.common.PasswordCredential; +import com.sun.enterprise.util.LocalStringManagerImpl; + import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; @@ -34,11 +39,6 @@ import org.glassfish.security.common.UserNameAndPassword; import org.glassfish.security.common.UserPrincipal; -import com.sun.enterprise.security.SecurityLoggerInfo; -import com.sun.enterprise.security.UsernamePasswordStore; -import com.sun.enterprise.security.auth.login.common.PasswordCredential; -import com.sun.enterprise.util.LocalStringManagerImpl; - /** * This sample LoginModule authenticates users with a password. *

diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/FileLoginModule.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/FileLoginModule.java index 91dfd8cbbc2..663a2105567 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/FileLoginModule.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/FileLoginModule.java @@ -17,12 +17,13 @@ package com.sun.enterprise.security.auth.login; -import static java.util.logging.Level.FINE; - import com.sun.enterprise.security.BasePasswordLoginModule; import com.sun.enterprise.security.auth.realm.file.FileRealm; + import javax.security.auth.login.LoginException; +import static java.util.logging.Level.FINE; + /** * File realm login module. * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/LDAPLoginModule.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/LDAPLoginModule.java index 0fc4d4f9b52..a1ef9a25f36 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/LDAPLoginModule.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/LDAPLoginModule.java @@ -17,14 +17,15 @@ package com.sun.enterprise.security.auth.login; +import com.sun.enterprise.security.BasePasswordLoginModule; +import com.sun.enterprise.security.auth.realm.ldap.LDAPRealm; + +import javax.security.auth.login.LoginException; + import static com.sun.enterprise.security.auth.realm.ldap.LDAPRealm.MODE_FIND_BIND; import static com.sun.enterprise.security.auth.realm.ldap.LDAPRealm.PARAM_MODE; import static com.sun.enterprise.util.Utility.isEmpty; -import javax.security.auth.login.LoginException; -import com.sun.enterprise.security.BasePasswordLoginModule; -import com.sun.enterprise.security.auth.realm.ldap.LDAPRealm; - /** * GlassFish JAAS LoginModule for an LDAP Realm. * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/LoginCallbackHandler.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/LoginCallbackHandler.java index c7075d4ee55..43c0d005ef8 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/LoginCallbackHandler.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/LoginCallbackHandler.java @@ -16,6 +16,10 @@ package com.sun.enterprise.security.auth.login; +import com.sun.enterprise.security.GUILoginDialog; +import com.sun.enterprise.security.TextLoginDialog; +import com.sun.enterprise.util.LocalStringManagerImpl; + import java.io.IOException; import javax.security.auth.callback.Callback; @@ -23,10 +27,6 @@ import javax.security.auth.callback.NameCallback; import javax.security.auth.callback.UnsupportedCallbackException; -import com.sun.enterprise.security.GUILoginDialog; -import com.sun.enterprise.security.TextLoginDialog; -import com.sun.enterprise.util.LocalStringManagerImpl; - /** * This is the default callback handler provided by the application client container. The container tries to use the application * specified callback handler (if provided). If there is no callback handler or if the handler cannot be instantiated then this diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/SolarisLoginModule.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/SolarisLoginModule.java index 59d23efb486..c03dab580f5 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/SolarisLoginModule.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/SolarisLoginModule.java @@ -17,13 +17,15 @@ package com.sun.enterprise.security.auth.login; -import static com.sun.enterprise.util.Utility.isEmpty; - import com.sun.enterprise.security.BasePasswordLoginModule; import com.sun.enterprise.security.auth.realm.solaris.SolarisRealm; + import java.util.logging.Level; + import javax.security.auth.login.LoginException; +import static com.sun.enterprise.util.Utility.isEmpty; + /** * Solaris realm login module. * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/common/ServerLoginCallbackHandler.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/common/ServerLoginCallbackHandler.java index c78e2be13c5..8839f4944d3 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/common/ServerLoginCallbackHandler.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/login/common/ServerLoginCallbackHandler.java @@ -16,6 +16,8 @@ package com.sun.enterprise.security.auth.login.common; +import com.sun.enterprise.security.auth.realm.certificate.CertificateRealm; + import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -26,8 +28,6 @@ import javax.security.auth.callback.PasswordCallback; import javax.security.auth.callback.UnsupportedCallbackException; -import com.sun.enterprise.security.auth.realm.certificate.CertificateRealm; - /** * This is the default callback handler provided by the application client container. The container tries to use the application * specified callback handler (if provided). If there is no callback handler or if the handler cannot be instantiated then this diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/AbstractGlassFishRealmState.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/AbstractGlassFishRealmState.java index 7d30662c6a5..69d930bd7f6 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/AbstractGlassFishRealmState.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/AbstractGlassFishRealmState.java @@ -18,6 +18,7 @@ import com.sun.enterprise.security.auth.realm.exceptions.BadRealmException; import com.sun.enterprise.security.auth.realm.exceptions.NoSuchRealmException; + import java.util.ArrayList; import java.util.List; import java.util.Properties; diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/GlassFishUserStore.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/GlassFishUserStore.java index 0c56b748a91..3600536d6df 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/GlassFishUserStore.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/GlassFishUserStore.java @@ -21,6 +21,7 @@ import com.sun.enterprise.security.auth.realm.exceptions.InvalidOperationException; import com.sun.enterprise.security.auth.realm.exceptions.NoSuchUserException; import com.sun.enterprise.security.auth.realm.exceptions.UnsupportedRealmException; + import java.util.Enumeration; /** diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/GroupMapper.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/GroupMapper.java index 37c635d9f4f..0688ec57cd9 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/GroupMapper.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/GroupMapper.java @@ -17,14 +17,14 @@ package com.sun.enterprise.security.auth.realm; -import static com.sun.enterprise.util.Utility.isEmpty; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.StringTokenizer; +import static com.sun.enterprise.util.Utility.isEmpty; + /** * * @author Kumar diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/Realm.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/Realm.java index 47431edb231..f5881d4ff71 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/Realm.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/Realm.java @@ -17,18 +17,15 @@ package com.sun.enterprise.security.auth.realm; -import static com.sun.enterprise.security.SecurityLoggerInfo.realmCreated; -import static com.sun.enterprise.security.auth.realm.RealmsManagerHolder.getNonNullRealmsManager; -import static com.sun.enterprise.security.auth.realm.RealmsManagerHolder.getRealmsManager; -import static java.util.logging.Level.INFO; - import com.sun.enterprise.security.SecurityLoggerInfo; import com.sun.enterprise.security.auth.realm.exceptions.BadRealmException; import com.sun.enterprise.security.auth.realm.exceptions.NoSuchRealmException; + import java.text.MessageFormat; import java.util.Enumeration; import java.util.Properties; import java.util.logging.Logger; + import org.glassfish.external.probe.provider.PluginPoint; import org.glassfish.external.probe.provider.StatsProviderManager; import org.glassfish.hk2.api.ServiceLocator; @@ -36,6 +33,11 @@ import org.glassfish.internal.api.Globals; import org.jvnet.hk2.annotations.Contract; +import static com.sun.enterprise.security.SecurityLoggerInfo.realmCreated; +import static com.sun.enterprise.security.auth.realm.RealmsManagerHolder.getNonNullRealmsManager; +import static com.sun.enterprise.security.auth.realm.RealmsManagerHolder.getRealmsManager; +import static java.util.logging.Level.INFO; + /** * javadoc * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmConfig.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmConfig.java index 425cc1c98f6..482ae22996e 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmConfig.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmConfig.java @@ -17,11 +17,8 @@ package com.sun.enterprise.security.auth.realm; -import static com.sun.enterprise.security.SecurityLoggerInfo.noRealmsError; -import static com.sun.enterprise.security.SecurityLoggerInfo.realmConfigDisabledError; -import static com.sun.enterprise.security.SecurityLoggerInfo.securityExceptionError; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.WARNING; +import com.sun.enterprise.config.serverbeans.AuthRealm; +import com.sun.enterprise.security.SecurityLoggerInfo; import java.util.List; import java.util.Properties; @@ -29,8 +26,11 @@ import org.jvnet.hk2.config.types.Property; -import com.sun.enterprise.config.serverbeans.AuthRealm; -import com.sun.enterprise.security.SecurityLoggerInfo; +import static com.sun.enterprise.security.SecurityLoggerInfo.noRealmsError; +import static com.sun.enterprise.security.SecurityLoggerInfo.realmConfigDisabledError; +import static com.sun.enterprise.security.SecurityLoggerInfo.securityExceptionError; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.WARNING; /** * RealmConfig usable by standalone : Admin CLI for creating Realms It has a subset of functionality defined in diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmsManager.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmsManager.java index fa3e32d35dc..c1faf6a5b25 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmsManager.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmsManager.java @@ -17,7 +17,14 @@ package com.sun.enterprise.security.auth.realm; -import static java.util.Collections.synchronizedMap; +import com.sun.enterprise.config.serverbeans.AuthRealm; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.SecurityService; +import com.sun.enterprise.security.SecurityLoggerInfo; + +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import java.util.ArrayList; import java.util.Enumeration; @@ -37,14 +44,7 @@ import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.types.Property; -import com.sun.enterprise.config.serverbeans.AuthRealm; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.SecurityService; -import com.sun.enterprise.security.SecurityLoggerInfo; - -import jakarta.inject.Inject; -import jakarta.inject.Named; -import jakarta.inject.Singleton; +import static java.util.Collections.synchronizedMap; /** * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/User.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/User.java index d7af47b0174..7f53ab213e6 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/User.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/User.java @@ -18,6 +18,7 @@ package com.sun.enterprise.security.auth.realm; import com.sun.enterprise.security.auth.realm.exceptions.NoSuchRealmException; + import java.security.Principal; import java.util.Enumeration; diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/file/FileRealm.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/file/FileRealm.java index 01cb4f958f2..718d945f439 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/file/FileRealm.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/file/FileRealm.java @@ -17,12 +17,6 @@ package com.sun.enterprise.security.auth.realm.file; -import static com.sun.enterprise.security.common.Util.isEmbeddedServer; -import static com.sun.enterprise.security.common.Util.writeConfigFileToTempDir; -import static java.util.Arrays.asList; -import static java.util.Collections.enumeration; -import static java.util.logging.Level.FINE; - import com.sun.enterprise.config.serverbeans.AuthRealm; import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.security.auth.realm.Realm; @@ -32,16 +26,24 @@ import com.sun.enterprise.security.auth.realm.exceptions.NoSuchRealmException; import com.sun.enterprise.security.auth.realm.exceptions.NoSuchUserException; import com.sun.enterprise.security.util.IASSecurityException; + import java.io.IOException; import java.text.MessageFormat; import java.util.ArrayList; import java.util.Enumeration; import java.util.List; import java.util.Properties; + import org.glassfish.internal.api.RelativePathResolver; import org.glassfish.security.common.FileRealmHelper; import org.jvnet.hk2.annotations.Service; +import static com.sun.enterprise.security.common.Util.isEmbeddedServer; +import static com.sun.enterprise.security.common.Util.writeConfigFileToTempDir; +import static java.util.Arrays.asList; +import static java.util.Collections.enumeration; +import static java.util.logging.Level.FINE; + /** * Realm implementation for supporting file password authentication. * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/file/FileRealmUser.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/file/FileRealmUser.java index 4be4901d1d7..fcb1f5656e3 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/file/FileRealmUser.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/file/FileRealmUser.java @@ -17,13 +17,14 @@ package com.sun.enterprise.security.auth.realm.file; +import com.sun.enterprise.security.auth.realm.Realm; +import com.sun.enterprise.security.auth.realm.User; +import com.sun.enterprise.security.auth.realm.exceptions.NoSuchRealmException; + import java.util.Enumeration; import java.util.Hashtable; import org.glassfish.security.common.FileRealmHelper; -import com.sun.enterprise.security.auth.realm.Realm; -import com.sun.enterprise.security.auth.realm.User; -import com.sun.enterprise.security.auth.realm.exceptions.NoSuchRealmException; /** * Represents a FileRealm user. diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/ldap/CustomSocketFactory.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/ldap/CustomSocketFactory.java index fc0ddb91b86..e11c8ab255c 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/ldap/CustomSocketFactory.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/ldap/CustomSocketFactory.java @@ -17,8 +17,9 @@ package com.sun.enterprise.security.auth.realm.ldap; -import static com.sun.enterprise.security.SecurityLoggerInfo.securityExceptionError; -import static java.util.logging.Level.WARNING; +import com.sun.enterprise.security.SecurityLoggerInfo; +import com.sun.enterprise.security.ssl.SSLUtils; +import com.sun.enterprise.util.i18n.StringManager; import java.io.IOException; import java.net.InetAddress; @@ -33,9 +34,8 @@ import org.glassfish.internal.api.Globals; import org.glassfish.internal.api.SharedSecureRandom; -import com.sun.enterprise.security.SecurityLoggerInfo; -import com.sun.enterprise.security.ssl.SSLUtils; -import com.sun.enterprise.util.i18n.StringManager; +import static com.sun.enterprise.security.SecurityLoggerInfo.securityExceptionError; +import static java.util.logging.Level.WARNING; /** * Custom socket factory for ldaps (SSL). diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/ldap/LDAPRealm.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/ldap/LDAPRealm.java index 0fd51e4f726..fb9a8384687 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/ldap/LDAPRealm.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/ldap/LDAPRealm.java @@ -17,21 +17,12 @@ package com.sun.enterprise.security.auth.realm.ldap; -import static com.sun.enterprise.util.Utility.isAnyNull; -import static java.util.Collections.enumeration; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.FINEST; -import static java.util.logging.Level.SEVERE; -import static java.util.logging.Level.WARNING; -import static javax.naming.Context.SECURITY_CREDENTIALS; -import static javax.naming.Context.SECURITY_PRINCIPAL; -import static javax.naming.directory.SearchControls.SUBTREE_SCOPE; - import com.sun.enterprise.security.auth.realm.Realm; import com.sun.enterprise.security.auth.realm.exceptions.BadRealmException; import com.sun.enterprise.security.auth.realm.exceptions.InvalidOperationException; import com.sun.enterprise.security.auth.realm.exceptions.NoSuchRealmException; import com.sun.enterprise.security.auth.realm.exceptions.NoSuchUserException; + import java.text.MessageFormat; import java.util.ArrayList; import java.util.Enumeration; @@ -41,6 +32,7 @@ import java.util.Set; import java.util.Vector; import java.util.regex.Matcher; + import javax.naming.CompositeName; import javax.naming.Context; import javax.naming.InvalidNameException; @@ -54,9 +46,20 @@ import javax.naming.ldap.LdapName; import javax.naming.ldap.Rdn; import javax.security.auth.login.LoginException; + import org.glassfish.internal.api.RelativePathResolver; import org.jvnet.hk2.annotations.Service; +import static com.sun.enterprise.util.Utility.isAnyNull; +import static java.util.Collections.enumeration; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.FINEST; +import static java.util.logging.Level.SEVERE; +import static java.util.logging.Level.WARNING; +import static javax.naming.Context.SECURITY_CREDENTIALS; +import static javax.naming.Context.SECURITY_PRINCIPAL; +import static javax.naming.directory.SearchControls.SUBTREE_SCOPE; + /** * Realm wrapper for supporting LDAP authentication. * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/solaris/SolarisRealm.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/solaris/SolarisRealm.java index 71895775815..a855e30a5e8 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/solaris/SolarisRealm.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/solaris/SolarisRealm.java @@ -17,20 +17,22 @@ package com.sun.enterprise.security.auth.realm.solaris; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.WARNING; - import com.sun.enterprise.security.auth.realm.Realm; import com.sun.enterprise.security.auth.realm.exceptions.BadRealmException; import com.sun.enterprise.security.auth.realm.exceptions.InvalidOperationException; import com.sun.enterprise.security.auth.realm.exceptions.NoSuchRealmException; import com.sun.enterprise.security.auth.realm.exceptions.NoSuchUserException; + import java.util.Enumeration; import java.util.HashMap; import java.util.Properties; import java.util.Vector; + import org.jvnet.hk2.annotations.Service; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.WARNING; + /** * Realm wrapper for supporting Solaris authentication. * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CLIUtil.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CLIUtil.java index 542e5840ee2..7de662c1927 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CLIUtil.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CLIUtil.java @@ -16,10 +16,6 @@ package com.sun.enterprise.security.cli; -import java.util.List; - -import org.glassfish.api.ActionReport; - import com.sun.enterprise.config.serverbeans.AuthRealm; import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; @@ -29,6 +25,10 @@ import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.util.LocalStringManagerImpl; +import java.util.List; + +import org.glassfish.api.ActionReport; + /** * * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateAuditModule.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateAuditModule.java index ed0e6a70690..82222cd9bbc 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateAuditModule.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateAuditModule.java @@ -16,6 +16,17 @@ package com.sun.enterprise.security.cli; +import com.sun.enterprise.config.serverbeans.AuditModule; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.SecurityService; +import com.sun.enterprise.security.SecurityConfigListener; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.beans.PropertyVetoException; import java.util.List; @@ -38,17 +49,6 @@ import org.jvnet.hk2.config.TransactionFailure; import org.jvnet.hk2.config.types.Property; -import com.sun.enterprise.config.serverbeans.AuditModule; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.SecurityService; -import com.sun.enterprise.security.SecurityConfigListener; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; - -import jakarta.inject.Inject; -import jakarta.inject.Named; - /** * Create Audit Module Command * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateAuthRealm.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateAuthRealm.java index 8316334673f..96f39baddae 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateAuthRealm.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateAuthRealm.java @@ -16,6 +16,19 @@ package com.sun.enterprise.security.cli; +import com.sun.enterprise.config.serverbeans.AuthRealm; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Configs; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.SecurityService; +import com.sun.enterprise.security.SecurityConfigListener; +import com.sun.enterprise.security.common.Util; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.beans.PropertyVetoException; import java.util.Properties; @@ -38,19 +51,6 @@ import org.jvnet.hk2.config.TransactionFailure; import org.jvnet.hk2.config.types.Property; -import com.sun.enterprise.config.serverbeans.AuthRealm; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Configs; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.SecurityService; -import com.sun.enterprise.security.SecurityConfigListener; -import com.sun.enterprise.security.common.Util; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; - -import jakarta.inject.Inject; -import jakarta.inject.Named; - /** * CLI command to create JACC Provider * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateFileUser.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateFileUser.java index 7a5e9ad7688..9551dd89974 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateFileUser.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateFileUser.java @@ -29,11 +29,11 @@ import com.sun.enterprise.security.auth.realm.file.FileRealm; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; -import java.beans.PropertyVetoException; import jakarta.inject.Inject; import jakarta.inject.Named; +import java.beans.PropertyVetoException; import java.io.File; import java.util.ArrayList; import java.util.List; diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateJACCProvider.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateJACCProvider.java index ce2f628ef0d..c627db647f8 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateJACCProvider.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateJACCProvider.java @@ -16,6 +16,16 @@ package com.sun.enterprise.security.cli; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.JaccProvider; +import com.sun.enterprise.config.serverbeans.SecurityService; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.beans.PropertyVetoException; import java.util.Properties; @@ -37,16 +47,6 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.JaccProvider; -import com.sun.enterprise.config.serverbeans.SecurityService; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; - -import jakarta.inject.Inject; -import jakarta.inject.Named; - /** * Create Jacc Provider Command * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateMessageSecurityProvider.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateMessageSecurityProvider.java index dbbb695d853..412726deb7c 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateMessageSecurityProvider.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreateMessageSecurityProvider.java @@ -16,9 +16,18 @@ package com.sun.enterprise.security.cli; -import static org.glassfish.api.ActionReport.ExitCode.FAILURE; -import static org.glassfish.api.ActionReport.ExitCode.SUCCESS; -import static org.glassfish.api.admin.ServerEnvironment.DEFAULT_INSTANCE_NAME; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.MessageSecurityConfig; +import com.sun.enterprise.config.serverbeans.ProviderConfig; +import com.sun.enterprise.config.serverbeans.RequestPolicy; +import com.sun.enterprise.config.serverbeans.ResponsePolicy; +import com.sun.enterprise.config.serverbeans.SecurityService; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; import java.beans.PropertyVetoException; import java.util.List; @@ -42,18 +51,9 @@ import org.jvnet.hk2.config.TransactionFailure; import org.jvnet.hk2.config.types.Property; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.MessageSecurityConfig; -import com.sun.enterprise.config.serverbeans.ProviderConfig; -import com.sun.enterprise.config.serverbeans.RequestPolicy; -import com.sun.enterprise.config.serverbeans.ResponsePolicy; -import com.sun.enterprise.config.serverbeans.SecurityService; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; - -import jakarta.inject.Inject; -import jakarta.inject.Named; +import static org.glassfish.api.ActionReport.ExitCode.FAILURE; +import static org.glassfish.api.ActionReport.ExitCode.SUCCESS; +import static org.glassfish.api.admin.ServerEnvironment.DEFAULT_INSTANCE_NAME; /** * Create Message Security Provider Command diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreatePasswordAlias.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreatePasswordAlias.java index 6e63617ed3a..6d9a184efc8 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreatePasswordAlias.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/CreatePasswordAlias.java @@ -16,6 +16,12 @@ package com.sun.enterprise.security.cli; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.security.store.DomainScopedPasswordAliasStore; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -31,12 +37,6 @@ import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.security.store.DomainScopedPasswordAliasStore; -import com.sun.enterprise.util.LocalStringManagerImpl; - -import jakarta.inject.Inject; - /** * Create Password Alias Command * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteAuditModule.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteAuditModule.java index 9f23b201adb..a7709f3bc1f 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteAuditModule.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteAuditModule.java @@ -16,6 +16,17 @@ package com.sun.enterprise.security.cli; +import com.sun.enterprise.config.serverbeans.AuditModule; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.SecurityService; +import com.sun.enterprise.security.SecurityConfigListener; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.beans.PropertyVetoException; import org.glassfish.api.ActionReport; @@ -36,17 +47,6 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import com.sun.enterprise.config.serverbeans.AuditModule; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.SecurityService; -import com.sun.enterprise.security.SecurityConfigListener; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; - -import jakarta.inject.Inject; -import jakarta.inject.Named; - /** * Delete Audit Module Command * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteAuthRealm.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteAuthRealm.java index e5b2b7544ed..495be652ab0 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteAuthRealm.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteAuthRealm.java @@ -16,6 +16,17 @@ package com.sun.enterprise.security.cli; +import com.sun.enterprise.config.serverbeans.AuthRealm; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.SecurityService; +import com.sun.enterprise.security.SecurityConfigListener; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.beans.PropertyVetoException; import org.glassfish.api.ActionReport; @@ -36,17 +47,6 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import com.sun.enterprise.config.serverbeans.AuthRealm; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.SecurityService; -import com.sun.enterprise.security.SecurityConfigListener; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; - -import jakarta.inject.Inject; -import jakarta.inject.Named; - /** * Delete Auth Realm Command * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteFileUser.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteFileUser.java index c1762c61c6a..d33588ff8cd 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteFileUser.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteFileUser.java @@ -17,6 +17,20 @@ package com.sun.enterprise.security.cli; +import com.sun.enterprise.config.serverbeans.AuthRealm; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.SecurityService; +import com.sun.enterprise.security.auth.realm.RealmsManager; +import com.sun.enterprise.security.auth.realm.exceptions.BadRealmException; +import com.sun.enterprise.security.auth.realm.exceptions.NoSuchUserException; +import com.sun.enterprise.security.auth.realm.file.FileRealm; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.beans.PropertyVetoException; import java.io.File; @@ -42,20 +56,6 @@ import org.jvnet.hk2.config.TransactionFailure; import org.jvnet.hk2.config.types.Property; -import com.sun.enterprise.config.serverbeans.AuthRealm; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.SecurityService; -import com.sun.enterprise.security.auth.realm.RealmsManager; -import com.sun.enterprise.security.auth.realm.exceptions.BadRealmException; -import com.sun.enterprise.security.auth.realm.exceptions.NoSuchUserException; -import com.sun.enterprise.security.auth.realm.file.FileRealm; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; - -import jakarta.inject.Inject; -import jakarta.inject.Named; - /** * Delete File User Command Usage: delete-file-user [--terse=false] [--echo=false] [--interactive=true] [--host localhost] * [--port 4848|4849] [--secure | -s] [--user admin_user] [--passwordfile file_name] [--authrealmname authrealm_name] [--target diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteJaccProvider.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteJaccProvider.java index 26116cd0237..21c02888df5 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteJaccProvider.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteJaccProvider.java @@ -16,6 +16,16 @@ package com.sun.enterprise.security.cli; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.JaccProvider; +import com.sun.enterprise.config.serverbeans.SecurityService; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.beans.PropertyVetoException; import java.util.List; @@ -37,16 +47,6 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.JaccProvider; -import com.sun.enterprise.config.serverbeans.SecurityService; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; - -import jakarta.inject.Inject; -import jakarta.inject.Named; - /** * Usage: delete-jacc-provider [--help] [--user admin_user] [--passwordfile file_name] [ --target target_name] jacc_provider_name * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteMessageSecurityProvider.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteMessageSecurityProvider.java index e2161e8ed05..6127b1ba5d6 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteMessageSecurityProvider.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeleteMessageSecurityProvider.java @@ -16,6 +16,17 @@ package com.sun.enterprise.security.cli; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.MessageSecurityConfig; +import com.sun.enterprise.config.serverbeans.ProviderConfig; +import com.sun.enterprise.config.serverbeans.SecurityService; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.beans.PropertyVetoException; import java.util.List; @@ -37,17 +48,6 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.MessageSecurityConfig; -import com.sun.enterprise.config.serverbeans.ProviderConfig; -import com.sun.enterprise.config.serverbeans.SecurityService; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; - -import jakarta.inject.Inject; -import jakarta.inject.Named; - /** * Delete Message Security Provider Command * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeletePasswordAlias.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeletePasswordAlias.java index 091bcf96729..af2734a189e 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeletePasswordAlias.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/DeletePasswordAlias.java @@ -16,6 +16,12 @@ package com.sun.enterprise.security.cli; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.security.store.DomainScopedPasswordAliasStore; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -32,12 +38,6 @@ import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.security.store.DomainScopedPasswordAliasStore; -import com.sun.enterprise.util.LocalStringManagerImpl; - -import jakarta.inject.Inject; - /** * Delete Password Alias Command * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListAuditModule.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListAuditModule.java index 978565ea3ef..13984b0a9c9 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListAuditModule.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListAuditModule.java @@ -16,6 +16,16 @@ package com.sun.enterprise.security.cli; +import com.sun.enterprise.config.serverbeans.AuditModule; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.SecurityService; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -34,16 +44,6 @@ import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.AuditModule; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.SecurityService; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; - -import jakarta.inject.Inject; -import jakarta.inject.Named; - /** * List Audit Modules Command Usage: list-audit-modules [--terse=false] [--echo=false] [--interactive=true] [--host localhost] * [--port 4848|4849] [--secure | -s] [--user admin_user] [--passwordfile file_name] [target(Default server)] diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListAuthRealm.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListAuthRealm.java index 651a56876e4..ec4d31cbae5 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListAuthRealm.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListAuthRealm.java @@ -16,6 +16,17 @@ package com.sun.enterprise.security.cli; +import com.sun.enterprise.config.serverbeans.AuthRealm; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.SecurityService; +import com.sun.enterprise.security.auth.realm.RealmsManager; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -34,17 +45,6 @@ import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.AuthRealm; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.SecurityService; -import com.sun.enterprise.security.auth.realm.RealmsManager; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; - -import jakarta.inject.Inject; -import jakarta.inject.Named; - /** * List Auth Realms Command Usage: list-auth-realms [--terse=false] [--echo=false] [--interactive=true] [--host localhost] * [--port 4848|4849] [--secure | -s] [--user admin_user] [--passwordfile file_name] [target(Default server)] diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListFileGroup.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListFileGroup.java index e16587f2874..54bc82261a7 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListFileGroup.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListFileGroup.java @@ -17,6 +17,22 @@ package com.sun.enterprise.security.cli; +import com.sun.enterprise.config.serverbeans.AuthRealm; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Configs; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.SecurityService; +import com.sun.enterprise.security.auth.realm.RealmsManager; +import com.sun.enterprise.security.auth.realm.exceptions.BadRealmException; +import com.sun.enterprise.security.auth.realm.exceptions.NoSuchRealmException; +import com.sun.enterprise.security.auth.realm.exceptions.NoSuchUserException; +import com.sun.enterprise.security.auth.realm.file.FileRealm; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.util.Enumeration; import org.glassfish.api.ActionReport; @@ -38,22 +54,6 @@ import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.types.Property; -import com.sun.enterprise.config.serverbeans.AuthRealm; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Configs; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.SecurityService; -import com.sun.enterprise.security.auth.realm.RealmsManager; -import com.sun.enterprise.security.auth.realm.exceptions.BadRealmException; -import com.sun.enterprise.security.auth.realm.exceptions.NoSuchRealmException; -import com.sun.enterprise.security.auth.realm.exceptions.NoSuchUserException; -import com.sun.enterprise.security.auth.realm.file.FileRealm; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; - -import jakarta.inject.Inject; -import jakarta.inject.Named; - /** * List File GroupsCommand Usage: list-file-groups [--terse={true|false}][ --echo={true|false} ] [ --interactive={true|false} ] * [--host host] [--port port] [--secure| -s ] [--user admin_user] [--passwordfile filename] [--help] [--name username] diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListFileUser.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListFileUser.java index ca737b97e0f..2374187c00b 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListFileUser.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListFileUser.java @@ -17,6 +17,21 @@ package com.sun.enterprise.security.cli; +import com.sun.enterprise.config.serverbeans.AuthRealm; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.SecurityService; +import com.sun.enterprise.security.auth.realm.RealmsManager; +import com.sun.enterprise.security.auth.realm.exceptions.BadRealmException; +import com.sun.enterprise.security.auth.realm.exceptions.NoSuchRealmException; +import com.sun.enterprise.security.auth.realm.exceptions.NoSuchUserException; +import com.sun.enterprise.security.auth.realm.file.FileRealm; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.io.File; import java.util.ArrayList; import java.util.Collections; @@ -46,21 +61,6 @@ import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.types.Property; -import com.sun.enterprise.config.serverbeans.AuthRealm; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.SecurityService; -import com.sun.enterprise.security.auth.realm.RealmsManager; -import com.sun.enterprise.security.auth.realm.exceptions.BadRealmException; -import com.sun.enterprise.security.auth.realm.exceptions.NoSuchRealmException; -import com.sun.enterprise.security.auth.realm.exceptions.NoSuchUserException; -import com.sun.enterprise.security.auth.realm.file.FileRealm; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; - -import jakarta.inject.Inject; -import jakarta.inject.Named; - /** * List File Users Command Usage: list-file-users [--terse=false] [--echo=false] [--interactive=true] [--host localhost] [--port * 4848|4849] [--secure | -s] [--user admin_user] [--passwordfile file_name] [--authrealmname authrealm_name] [target(Default diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListJaccProviders.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListJaccProviders.java index f1ea92367ef..6dcc0b23bd6 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListJaccProviders.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListJaccProviders.java @@ -16,6 +16,17 @@ package com.sun.enterprise.security.cli; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Configs; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.JaccProvider; +import com.sun.enterprise.config.serverbeans.SecurityService; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.util.List; import org.glassfish.api.ActionReport; @@ -36,17 +47,6 @@ import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Configs; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.JaccProvider; -import com.sun.enterprise.config.serverbeans.SecurityService; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; - -import jakarta.inject.Inject; -import jakarta.inject.Named; - /** * Usage: list-jacc-providers [--help] [--user admin_user] [--passwordfile file_name] [target(Default server)] * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListMessageSecurityProvider.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListMessageSecurityProvider.java index eb1cd0040e0..595b89dd172 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListMessageSecurityProvider.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListMessageSecurityProvider.java @@ -16,6 +16,17 @@ package com.sun.enterprise.security.cli; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.MessageSecurityConfig; +import com.sun.enterprise.config.serverbeans.ProviderConfig; +import com.sun.enterprise.config.serverbeans.SecurityService; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -34,17 +45,6 @@ import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.MessageSecurityConfig; -import com.sun.enterprise.config.serverbeans.ProviderConfig; -import com.sun.enterprise.config.serverbeans.SecurityService; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; - -import jakarta.inject.Inject; -import jakarta.inject.Named; - /** * List Message Security Providers Command * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListPasswordAlias.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListPasswordAlias.java index 8980eaa736b..cc3a6081857 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListPasswordAlias.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListPasswordAlias.java @@ -16,6 +16,12 @@ package com.sun.enterprise.security.cli; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.security.store.DomainScopedPasswordAliasStore; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + import java.util.Iterator; import org.glassfish.api.ActionReport; @@ -33,12 +39,6 @@ import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.security.store.DomainScopedPasswordAliasStore; -import com.sun.enterprise.util.LocalStringManagerImpl; - -import jakarta.inject.Inject; - /** * List Password Aliases Command * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListSupportedCipherSuites.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListSupportedCipherSuites.java index b202e4d42da..21dcfd3336a 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListSupportedCipherSuites.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/ListSupportedCipherSuites.java @@ -16,6 +16,13 @@ package com.sun.enterprise.security.cli; +import com.sun.enterprise.config.serverbeans.SecurityService; +import com.sun.enterprise.security.ssl.SSLUtils; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -32,13 +39,6 @@ import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.SecurityService; -import com.sun.enterprise.security.ssl.SSLUtils; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; - -import jakarta.inject.Inject; - /** * author - Nithya Subramanian * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/UpdatePasswordAlias.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/UpdatePasswordAlias.java index af05d87396b..30e35424e19 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/UpdatePasswordAlias.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/cli/UpdatePasswordAlias.java @@ -16,6 +16,12 @@ package com.sun.enterprise.security.cli; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.security.store.DomainScopedPasswordAliasStore; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -31,12 +37,6 @@ import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.security.store.DomainScopedPasswordAliasStore; -import com.sun.enterprise.util.LocalStringManagerImpl; - -import jakarta.inject.Inject; - /** * Update Password Alias Command * diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/AbstractSecurityContext.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/AbstractSecurityContext.java index c576a83bb1a..3aa7bd656bd 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/AbstractSecurityContext.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/common/AbstractSecurityContext.java @@ -16,13 +16,13 @@ package com.sun.enterprise.security.common; +import com.sun.enterprise.security.integration.AppServSecurityContext; + import java.io.Serializable; import java.security.Principal; import javax.security.auth.Subject; -import com.sun.enterprise.security.integration.AppServSecurityContext; - /** * This base class defines the methods that Security Context should exhibit. There are two places where a derived class * are used. They are on the appclient side and ejb side. The derived classes can use thread local storage to store the diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/api/authentication/AbstractInternalSystemAdministrator.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/api/authentication/AbstractInternalSystemAdministrator.java index d1c04e8a0d6..1b0ba589bbe 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/api/authentication/AbstractInternalSystemAdministrator.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/api/authentication/AbstractInternalSystemAdministrator.java @@ -17,8 +17,10 @@ package org.glassfish.security.services.api.authentication; import jakarta.inject.Inject; + import javax.security.auth.Subject; import javax.security.auth.login.LoginException; + import org.glassfish.hk2.api.PostConstruct; import org.glassfish.internal.api.InternalSystemAdministrator; diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/api/authentication/AuthenticationService.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/api/authentication/AuthenticationService.java index fb75bda4771..4e8051206a0 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/api/authentication/AuthenticationService.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/api/authentication/AuthenticationService.java @@ -20,9 +20,8 @@ import javax.security.auth.callback.CallbackHandler; import javax.security.auth.login.LoginException; -import org.jvnet.hk2.annotations.Contract; - import org.glassfish.security.services.api.SecurityService; +import org.jvnet.hk2.annotations.Contract; /** * The AuthenticationService provides basic authentication functions. diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/api/authorization/AuthorizationService.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/api/authorization/AuthorizationService.java index b8fbfcecde3..3c9a93489b8 100755 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/api/authorization/AuthorizationService.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/api/authorization/AuthorizationService.java @@ -20,6 +20,7 @@ import java.net.URI; import java.security.Permission; import java.util.List; + import javax.security.auth.Subject; import org.glassfish.security.services.api.SecurityService; diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/api/authorization/RoleMappingService.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/api/authorization/RoleMappingService.java index 50176b81474..2d6c39fd140 100755 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/api/authorization/RoleMappingService.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/api/authorization/RoleMappingService.java @@ -17,6 +17,7 @@ package org.glassfish.security.services.api.authorization; import java.net.URI; + import javax.security.auth.Subject; import org.glassfish.security.services.api.SecurityService; diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/api/context/SecurityContextService.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/api/context/SecurityContextService.java index 951b0ad88bf..1445a7375bf 100755 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/api/context/SecurityContextService.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/api/context/SecurityContextService.java @@ -18,7 +18,6 @@ import org.glassfish.security.services.api.common.Attributes; - import org.jvnet.hk2.annotations.Contract; /** diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CLIUtil.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CLIUtil.java index 5470efe83ff..6b6586cabdb 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CLIUtil.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CLIUtil.java @@ -17,6 +17,7 @@ package org.glassfish.security.services.commands; import com.sun.enterprise.config.serverbeans.Domain; + import org.glassfish.api.ActionReport; import org.glassfish.security.services.config.SecurityConfiguration; import org.glassfish.security.services.config.SecurityConfigurations; diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CreateLoginModuleConfig.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CreateLoginModuleConfig.java index 3fea6ce3236..3bddde31015 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CreateLoginModuleConfig.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CreateLoginModuleConfig.java @@ -16,33 +16,31 @@ package org.glassfish.security.services.commands; -import java.beans.PropertyVetoException; -import java.util.Properties; +import com.sun.enterprise.config.serverbeans.Domain; import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.config.ConfigSupport; -import org.jvnet.hk2.config.SingleConfigCode; -import org.jvnet.hk2.config.TransactionFailure; -import org.jvnet.hk2.config.types.Property; +import java.beans.PropertyVetoException; +import java.util.Properties; import org.glassfish.api.ActionReport; import org.glassfish.api.Param; +import org.glassfish.api.admin.AccessRequired; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.AdminCommandSecurity; import org.glassfish.api.admin.ExecuteOn; import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; - import org.glassfish.security.services.config.LoginModuleConfig; import org.glassfish.security.services.config.SecurityProvider; - -import com.sun.enterprise.config.serverbeans.Domain; -import org.glassfish.api.admin.AccessRequired; -import org.glassfish.api.admin.AdminCommandSecurity; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.ConfigSupport; +import org.jvnet.hk2.config.SingleConfigCode; +import org.jvnet.hk2.config.TransactionFailure; +import org.jvnet.hk2.config.types.Property; /** * General create LoginModule config command. diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CreateSecurityProvider.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CreateSecurityProvider.java index 15f8f405788..9566368090f 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CreateSecurityProvider.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CreateSecurityProvider.java @@ -16,32 +16,29 @@ package org.glassfish.security.services.commands; -import java.beans.PropertyVetoException; +import com.sun.enterprise.config.serverbeans.Domain; import jakarta.inject.Inject; -import org.glassfish.security.services.config.SecurityConfiguration; - -import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.config.ConfigSupport; -import org.jvnet.hk2.config.SingleConfigCode; -import org.jvnet.hk2.config.TransactionFailure; +import java.beans.PropertyVetoException; import org.glassfish.api.ActionReport; import org.glassfish.api.Param; +import org.glassfish.api.admin.AccessRequired; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.AdminCommandSecurity; import org.glassfish.api.admin.ExecuteOn; import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; - +import org.glassfish.security.services.config.SecurityConfiguration; import org.glassfish.security.services.config.SecurityProvider; - -import com.sun.enterprise.config.serverbeans.Domain; -import org.glassfish.api.admin.AccessRequired; -import org.glassfish.api.admin.AdminCommandSecurity; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.ConfigSupport; +import org.jvnet.hk2.config.SingleConfigCode; +import org.jvnet.hk2.config.TransactionFailure; /** * General create security provider command. diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CreateSecurityService.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CreateSecurityService.java index 6459ac79531..92eb6f14e71 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CreateSecurityService.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/CreateSecurityService.java @@ -16,34 +16,31 @@ package org.glassfish.security.services.commands; -import java.beans.PropertyVetoException; -import java.util.Properties; +import com.sun.enterprise.config.serverbeans.Domain; import jakarta.inject.Inject; -import org.glassfish.security.services.config.SecurityConfiguration; - -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; -import org.jvnet.hk2.config.ConfigSupport; -import org.jvnet.hk2.config.SingleConfigCode; -import org.jvnet.hk2.config.TransactionFailure; +import java.beans.PropertyVetoException; +import java.util.Properties; import org.glassfish.api.ActionReport; import org.glassfish.api.Param; +import org.glassfish.api.admin.AccessRequired; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.AdminCommandSecurity; import org.glassfish.api.admin.ExecuteOn; import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; - +import org.glassfish.hk2.api.PerLookup; import org.glassfish.security.services.config.AuthenticationService; +import org.glassfish.security.services.config.SecurityConfiguration; import org.glassfish.security.services.config.SecurityConfigurations; - -import com.sun.enterprise.config.serverbeans.Domain; -import org.glassfish.api.admin.AccessRequired; -import org.glassfish.api.admin.AdminCommandSecurity; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.ConfigSupport; +import org.jvnet.hk2.config.SingleConfigCode; +import org.jvnet.hk2.config.TransactionFailure; /** * General create security service command. diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/LDAPAdminAccessConfigurator.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/LDAPAdminAccessConfigurator.java index 1b26ee9519f..85f310276fc 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/LDAPAdminAccessConfigurator.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/LDAPAdminAccessConfigurator.java @@ -17,44 +17,57 @@ package org.glassfish.security.services.commands; //import com.sun.enterprise.config.serverbeans.*; -import com.sun.enterprise.config.serverbeans.*; +import com.sun.enterprise.config.serverbeans.AdminService; +import com.sun.enterprise.config.serverbeans.AuthRealm; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.ConfigBeansUtilities; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.SecurityService; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.security.auth.login.LDAPLoginModule; import com.sun.enterprise.security.auth.realm.Realm; import com.sun.enterprise.security.auth.realm.ldap.LDAPRealm; -import com.sun.enterprise.util.i18n.StringManager; import com.sun.enterprise.util.StringUtils; import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.security.services.impl.ServiceLogging; -import org.glassfish.api.ActionReport; -import org.glassfish.api.Param; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.internal.api.Target; +import com.sun.enterprise.util.i18n.StringManager; + import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.config.TransactionFailure; -import org.jvnet.hk2.config.types.Property; -import javax.naming.Context; -import javax.naming.InitialContext; import java.beans.PropertyVetoException; import java.util.List; import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; + import javax.naming.AuthenticationNotSupportedException; -import org.glassfish.api.admin.*; +import javax.naming.Context; +import javax.naming.InitialContext; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AccessRequired; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.AdminCommandSecurity; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; - import org.glassfish.hk2.api.PerLookup; +import org.glassfish.internal.api.Target; import org.glassfish.security.services.config.AuthenticationService; import org.glassfish.security.services.config.LoginModuleConfig; import org.glassfish.security.services.config.SecurityConfigurations; import org.glassfish.security.services.config.SecurityProvider; import org.glassfish.security.services.config.SecurityProviderConfig; -import com.sun.enterprise.security.auth.login.LDAPLoginModule; +import org.glassfish.security.services.impl.ServiceLogging; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.RetryableException; import org.jvnet.hk2.config.Transaction; +import org.jvnet.hk2.config.TransactionFailure; +import org.jvnet.hk2.config.types.Property; /** A convenience command to configure LDAP for administration. There are several properties and attributes that * user needs to remember and that's rather user unfriendly. That's why this command is being developed. diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/common/Secure.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/common/Secure.java index 104bea3579f..d834be0de2c 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/common/Secure.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/common/Secure.java @@ -16,15 +16,17 @@ package org.glassfish.security.services.common; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; +import jakarta.inject.Qualifier; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import jakarta.inject.Qualifier; import org.glassfish.hk2.api.Metadata; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + /** * Qualifier used to enable a security check at the point of service injection or lookup. * Security Services, which are to protected against unqualified injection/look-up, should be annotated as something below diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecureServiceAccessPermission.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecureServiceAccessPermission.java index 04406dafc96..b978178ce91 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecureServiceAccessPermission.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecureServiceAccessPermission.java @@ -16,6 +16,8 @@ package org.glassfish.security.services.common; +import com.sun.enterprise.util.LocalStringManagerImpl; + import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; @@ -31,8 +33,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.util.LocalStringManagerImpl; - public class SecureServiceAccessPermission extends BasicPermission { diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityAccessValidationService.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityAccessValidationService.java index d724208f393..2d94712efe2 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityAccessValidationService.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityAccessValidationService.java @@ -16,10 +16,10 @@ package org.glassfish.security.services.common; -import java.util.logging.Logger; - import jakarta.inject.Singleton; +import java.util.logging.Logger; + import org.glassfish.hk2.api.Filter; import org.glassfish.hk2.api.ValidationService; import org.glassfish.hk2.api.Validator; diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityAccessValidator.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityAccessValidator.java index f4c60f31c82..9e4c072362e 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityAccessValidator.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityAccessValidator.java @@ -16,25 +16,25 @@ package org.glassfish.security.services.common; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.Iterator; +import com.sun.enterprise.util.LocalStringManagerImpl; + import java.security.AccessControlException; import java.security.AccessController; import java.security.Permission; import java.security.PrivilegedAction; import java.security.ProtectionDomain; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; -import org.glassfish.hk2.api.ValidationInformation; -import org.glassfish.hk2.api.Validator; import org.glassfish.hk2.api.ActiveDescriptor; -import org.glassfish.hk2.api.Injectee; import org.glassfish.hk2.api.Descriptor; - -import com.sun.enterprise.util.LocalStringManagerImpl; +import org.glassfish.hk2.api.Injectee; +import org.glassfish.hk2.api.ValidationInformation; +import org.glassfish.hk2.api.Validator; public class SecurityAccessValidator implements Validator { diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityScope.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityScope.java index 3d696802340..b8a5a69f09e 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityScope.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityScope.java @@ -16,12 +16,14 @@ package org.glassfish.security.services.common; +import jakarta.inject.Scope; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; -import jakarta.inject.Scope; /** * Scope used by security services that enables a flexible binding to service instances. diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityScopeContext.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityScopeContext.java index a151254a431..185c8505ba9 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityScopeContext.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityScopeContext.java @@ -16,12 +16,12 @@ package org.glassfish.security.services.common; -import java.lang.annotation.Annotation; -import java.util.HashMap; - import jakarta.inject.Inject; import jakarta.inject.Singleton; +import java.lang.annotation.Annotation; +import java.util.HashMap; + import org.glassfish.hk2.api.ActiveDescriptor; import org.glassfish.hk2.api.Context; import org.glassfish.hk2.api.ServiceHandle; diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/config/SecurityConfigUpgradeService.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/config/SecurityConfigUpgradeService.java index deb617fbfa5..9ada8995063 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/config/SecurityConfigUpgradeService.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/config/SecurityConfigUpgradeService.java @@ -18,6 +18,13 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.security.auth.login.FileLoginModule; + +import jakarta.inject.Inject; + +import java.beans.PropertyVetoException; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.admin.config.ConfigurationUpgrade; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.PostConstruct; @@ -27,11 +34,6 @@ import org.jvnet.hk2.config.TransactionFailure; import org.jvnet.hk2.config.types.Property; -import jakarta.inject.Inject; -import java.beans.PropertyVetoException; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * Upgrades the configuration to use the default file realm and the * login module which handles non-username/password admin authentication. diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/config/SecurityProvider.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/config/SecurityProvider.java index 760c2bc34e4..16aa3bf7433 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/config/SecurityProvider.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/config/SecurityProvider.java @@ -16,14 +16,14 @@ package org.glassfish.security.services.config; -import java.util.List; +import jakarta.validation.constraints.NotNull; import java.beans.PropertyVetoException; -import jakarta.validation.constraints.NotNull; +import java.util.List; import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.Element; /** diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/config/SecurityProviderConfig.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/config/SecurityProviderConfig.java index 2d6e54e84f4..0f98cc1ad01 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/config/SecurityProviderConfig.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/config/SecurityProviderConfig.java @@ -19,8 +19,8 @@ import java.beans.PropertyVetoException; import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Configured; /** * Base interface for all security provider implementation configuration. diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/AuthenticationServiceFactory.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/AuthenticationServiceFactory.java index 5de6c351872..ddfe6fe56e0 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/AuthenticationServiceFactory.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/AuthenticationServiceFactory.java @@ -16,22 +16,20 @@ package org.glassfish.security.services.impl; -import java.security.AccessController; +import com.sun.enterprise.config.serverbeans.Domain; import jakarta.inject.Inject; import jakarta.inject.Singleton; +import java.security.AccessController; + import org.glassfish.hk2.api.Factory; import org.glassfish.hk2.api.ServiceLocator; - +import org.glassfish.security.services.api.authentication.AuthenticationService; import org.glassfish.security.services.common.PrivilegedLookup; import org.glassfish.security.services.common.Secure; -import org.glassfish.security.services.common.StateManager; import org.glassfish.security.services.common.SecurityScope; - -import org.glassfish.security.services.api.authentication.AuthenticationService; - -import com.sun.enterprise.config.serverbeans.Domain; +import org.glassfish.security.services.common.StateManager; /** * The factory of AuthenticationService instances used by the SecurityScopeContext. diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/AuthenticationServiceImpl.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/AuthenticationServiceImpl.java index ed6448d1aa7..300d7af1afe 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/AuthenticationServiceImpl.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/AuthenticationServiceImpl.java @@ -16,14 +16,20 @@ package org.glassfish.security.services.impl; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.security.auth.login.common.PasswordCredential; +import com.sun.enterprise.security.auth.realm.RealmsManager; +import com.sun.enterprise.security.common.AppservAccessController; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import java.io.IOException; import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.List; import java.util.Map; -import jakarta.inject.Inject; -import jakarta.inject.Singleton; import javax.security.auth.Subject; import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; @@ -42,17 +48,12 @@ import org.glassfish.internal.api.ServerContext; import org.glassfish.security.services.api.authentication.AuthenticationService; import org.glassfish.security.services.api.authentication.ImpersonationService; +import org.glassfish.security.services.common.Secure; import org.glassfish.security.services.config.LoginModuleConfig; import org.glassfish.security.services.config.SecurityConfiguration; import org.glassfish.security.services.config.SecurityProvider; import org.glassfish.security.services.config.SecurityProviderConfig; import org.jvnet.hk2.annotations.Service; -import org.glassfish.security.services.common.Secure; - -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.security.auth.login.common.PasswordCredential; -import com.sun.enterprise.security.auth.realm.RealmsManager; -import com.sun.enterprise.security.common.AppservAccessController; /** * The Authentication Service Implementation. diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/JCEKSDomainPasswordAliasStore.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/JCEKSDomainPasswordAliasStore.java index 5d5f2c40d01..4cd324066b6 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/JCEKSDomainPasswordAliasStore.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/JCEKSDomainPasswordAliasStore.java @@ -19,10 +19,13 @@ import com.sun.enterprise.security.store.DomainScopedPasswordAliasStore; import com.sun.enterprise.security.store.IdentityManagement; import com.sun.enterprise.util.SystemPropertyConstants; -import java.io.File; + import jakarta.annotation.PostConstruct; import jakarta.inject.Inject; import jakarta.inject.Named; + +import java.io.File; + import org.glassfish.hk2.api.PerLookup; import org.glassfish.security.services.common.Secure; import org.jvnet.hk2.annotations.Optional; diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/JCEKSPasswordAliasStore.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/JCEKSPasswordAliasStore.java index 215775ca61f..d88798ea655 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/JCEKSPasswordAliasStore.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/JCEKSPasswordAliasStore.java @@ -18,6 +18,7 @@ import com.sun.enterprise.security.store.PasswordAdapter; import com.sun.enterprise.util.Utility; + import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.nio.charset.Charset; @@ -27,7 +28,9 @@ import java.util.Iterator; import java.util.List; import java.util.Map; + import javax.crypto.SecretKey; + import org.glassfish.api.admin.PasswordAliasStore; /** diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/NucleusInternalSystemAdministrator.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/NucleusInternalSystemAdministrator.java index 4dd0b134b03..a628aefe503 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/NucleusInternalSystemAdministrator.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/NucleusInternalSystemAdministrator.java @@ -17,6 +17,7 @@ package org.glassfish.security.services.impl; import jakarta.inject.Singleton; + import org.glassfish.security.services.api.authentication.AbstractInternalSystemAdministrator; import org.glassfish.security.services.api.authorization.AuthorizationAdminConstants; import org.jvnet.hk2.annotations.Service; diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/ServiceFactory.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/ServiceFactory.java index 23cb9c9ec54..56e7d9555f6 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/ServiceFactory.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/ServiceFactory.java @@ -16,12 +16,12 @@ package org.glassfish.security.services.impl; +import com.sun.enterprise.config.serverbeans.Domain; + import java.util.List; -import org.glassfish.security.services.config.SecurityConfigurations; import org.glassfish.security.services.config.SecurityConfiguration; - -import com.sun.enterprise.config.serverbeans.Domain; +import org.glassfish.security.services.config.SecurityConfigurations; /** * The base security service factory class. diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/AuthorizationServiceImpl.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/AuthorizationServiceImpl.java index 65682915fcf..a642664e48e 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/AuthorizationServiceImpl.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/AuthorizationServiceImpl.java @@ -16,49 +16,49 @@ package org.glassfish.security.services.impl.authorization; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import java.net.URI; +import java.security.AccessController; +import java.security.CodeSigner; +import java.security.CodeSource; import java.security.Permission; +import java.security.Policy; +import java.security.Principal; +import java.security.ProtectionDomain; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Set; -import java.security.AccessController; -import java.security.Principal; -import java.security.ProtectionDomain; -import java.security.Policy; -import java.security.CodeSource; -import java.security.CodeSigner; +import java.util.logging.Level; +import java.util.logging.Logger; + import javax.security.auth.Subject; +import org.glassfish.hk2.api.PostConstruct; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.logging.annotation.LogMessageInfo; import org.glassfish.security.services.api.authorization.AuthorizationService; import org.glassfish.security.services.api.authorization.AzAction; +import org.glassfish.security.services.api.authorization.AzAttributeResolver; +import org.glassfish.security.services.api.authorization.AzEnvironment; import org.glassfish.security.services.api.authorization.AzResource; import org.glassfish.security.services.api.authorization.AzResult; import org.glassfish.security.services.api.authorization.AzSubject; +import org.glassfish.security.services.api.common.Attributes; import org.glassfish.security.services.api.context.SecurityContextService; import org.glassfish.security.services.common.PrivilegedLookup; import org.glassfish.security.services.common.Secure; import org.glassfish.security.services.config.SecurityConfiguration; +import org.glassfish.security.services.config.SecurityProvider; import org.glassfish.security.services.impl.ServiceFactory; import org.glassfish.security.services.impl.ServiceLogging; - -import jakarta.inject.Inject; -import jakarta.inject.Singleton; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PostConstruct; -import org.glassfish.hk2.api.ServiceLocator; - -import com.sun.enterprise.config.serverbeans.Domain; - -import java.util.logging.Level; -import java.util.logging.Logger; -import com.sun.enterprise.util.LocalStringManagerImpl; -import org.glassfish.logging.annotation.LogMessageInfo; - -import org.glassfish.security.services.api.authorization.*; -import org.glassfish.security.services.api.common.Attributes; -import org.glassfish.security.services.config.SecurityProvider; import org.glassfish.security.services.spi.authorization.AuthorizationProvider; +import org.jvnet.hk2.annotations.Service; /** * AuthorizationServiceImpl implements diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/AzResourceImpl.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/AzResourceImpl.java index b5737cc33eb..8c50c6a0905 100755 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/AzResourceImpl.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/AzResourceImpl.java @@ -16,17 +16,17 @@ package org.glassfish.security.services.impl.authorization; -import org.glassfish.logging.annotation.LogMessageInfo; -import org.glassfish.security.services.api.authorization.AzResource; -import org.glassfish.security.services.api.common.Attributes; -import org.glassfish.security.services.impl.ServiceLogging; - import java.io.UnsupportedEncodingException; import java.net.URI; import java.net.URLDecoder; import java.util.logging.Level; import java.util.logging.Logger; +import org.glassfish.logging.annotation.LogMessageInfo; +import org.glassfish.security.services.api.authorization.AzResource; +import org.glassfish.security.services.api.common.Attributes; +import org.glassfish.security.services.impl.ServiceLogging; + public final class AzResourceImpl extends AzAttributesImpl implements AzResource { diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/AzResultImpl.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/AzResultImpl.java index 32f2b4967f0..2ad2ebf5899 100755 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/AzResultImpl.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/AzResultImpl.java @@ -16,11 +16,11 @@ package org.glassfish.security.services.impl.authorization; +import java.text.MessageFormat; + import org.glassfish.security.services.api.authorization.AzObligations; import org.glassfish.security.services.api.authorization.AzResult; -import java.text.MessageFormat; - public final class AzResultImpl implements AzResult { private final Decision decision; diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/AzSubjectImpl.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/AzSubjectImpl.java index 0980d4f9c1a..b87aafa62d5 100755 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/AzSubjectImpl.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/AzSubjectImpl.java @@ -16,10 +16,10 @@ package org.glassfish.security.services.impl.authorization; -import org.glassfish.security.services.api.authorization.AzSubject; - import javax.security.auth.Subject; +import org.glassfish.security.services.api.authorization.AzSubject; + public final class AzSubjectImpl extends AzAttributesImpl implements AzSubject { final private Subject subject; diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/RoleMappingServiceImpl.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/RoleMappingServiceImpl.java index 9f50a77df28..3e61678261e 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/RoleMappingServiceImpl.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/authorization/RoleMappingServiceImpl.java @@ -16,21 +16,24 @@ package org.glassfish.security.services.impl.authorization; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import java.net.URI; import java.security.AccessController; import java.util.Collections; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import javax.security.auth.Subject; -import jakarta.inject.Inject; -import jakarta.inject.Singleton; +import javax.security.auth.Subject; -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PostConstruct; import org.glassfish.hk2.api.ServiceLocator; - +import org.glassfish.logging.annotation.LogMessageInfo; import org.glassfish.security.services.api.authorization.AzAttributeResolver; import org.glassfish.security.services.api.authorization.AzResource; import org.glassfish.security.services.api.authorization.AzSubject; @@ -42,11 +45,7 @@ import org.glassfish.security.services.impl.ServiceFactory; import org.glassfish.security.services.impl.ServiceLogging; import org.glassfish.security.services.spi.authorization.RoleMappingProvider; - -import com.sun.enterprise.config.serverbeans.Domain; - -import com.sun.enterprise.util.LocalStringManagerImpl; -import org.glassfish.logging.annotation.LogMessageInfo; +import org.jvnet.hk2.annotations.Service; /** * RoleMappingServiceImpl implements diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/common/AttributeImpl.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/common/AttributeImpl.java index 3b58db5632c..a80103183c3 100755 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/common/AttributeImpl.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/common/AttributeImpl.java @@ -19,8 +19,8 @@ import java.util.Arrays; import java.util.Iterator; -import java.util.TreeSet; import java.util.Set; +import java.util.TreeSet; import org.glassfish.security.services.api.common.Attribute; diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/context/SecurityContextServiceImpl.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/context/SecurityContextServiceImpl.java index 3e1d0737e70..36c66deab8b 100755 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/context/SecurityContextServiceImpl.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/context/SecurityContextServiceImpl.java @@ -17,11 +17,11 @@ package org.glassfish.security.services.impl.context; +import jakarta.inject.Singleton; + import org.glassfish.security.services.api.common.Attributes; import org.glassfish.security.services.api.context.SecurityContextService; import org.glassfish.security.services.impl.common.AttributesImpl; - -import jakarta.inject.Singleton; import org.jvnet.hk2.annotations.Service; @Service diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/provider/authorization/SimpleAuthorizationProviderImpl.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/provider/authorization/SimpleAuthorizationProviderImpl.java index e13b017867b..0ac59f3af30 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/provider/authorization/SimpleAuthorizationProviderImpl.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/provider/authorization/SimpleAuthorizationProviderImpl.java @@ -19,6 +19,9 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.SecureAdmin; import com.sun.enterprise.config.serverbeans.SecureAdminPrincipal; + +import jakarta.inject.Inject; + import java.net.URI; import java.security.Principal; import java.util.HashSet; @@ -26,25 +29,28 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.inject.Inject; + import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.logging.annotation.LogMessageInfo; - -import org.glassfish.security.services.api.authorization.*; +import org.glassfish.security.services.api.authorization.AuthorizationAdminConstants; +import org.glassfish.security.services.api.authorization.AuthorizationService.PolicyDeploymentContext; +import org.glassfish.security.services.api.authorization.AzAction; +import org.glassfish.security.services.api.authorization.AzAttributeResolver; +import org.glassfish.security.services.api.authorization.AzEnvironment; +import org.glassfish.security.services.api.authorization.AzResource; +import org.glassfish.security.services.api.authorization.AzResult; import org.glassfish.security.services.api.authorization.AzResult.Decision; import org.glassfish.security.services.api.authorization.AzResult.Status; -import org.glassfish.security.services.api.authorization.AuthorizationService.PolicyDeploymentContext; -import org.glassfish.security.services.api.authorization.AuthorizationAdminConstants; +import org.glassfish.security.services.api.authorization.AzSubject; import org.glassfish.security.services.common.Secure; import org.glassfish.security.services.config.SecurityProvider; -import org.glassfish.security.services.spi.authorization.AuthorizationProvider; import org.glassfish.security.services.impl.ServiceLogging; -import org.glassfish.security.services.impl.authorization.AzResultImpl; import org.glassfish.security.services.impl.authorization.AzObligationsImpl; - +import org.glassfish.security.services.impl.authorization.AzResultImpl; +import org.glassfish.security.services.spi.authorization.AuthorizationProvider; import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; -import org.glassfish.hk2.api.ServiceLocator; @Service (name="simpleAuthorization") @PerLookup diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/provider/authorization/SimpleRoleMappingProviderImpl.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/provider/authorization/SimpleRoleMappingProviderImpl.java index f2af733da60..14121ceb8af 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/provider/authorization/SimpleRoleMappingProviderImpl.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/provider/authorization/SimpleRoleMappingProviderImpl.java @@ -23,8 +23,7 @@ import java.util.logging.Logger; import org.glassfish.hk2.api.PerLookup; -import org.jvnet.hk2.annotations.Service; - +import org.glassfish.logging.annotation.LogMessageInfo; import org.glassfish.security.services.api.authorization.AuthorizationAdminConstants; import org.glassfish.security.services.api.authorization.AzAttributeResolver; import org.glassfish.security.services.api.authorization.AzEnvironment; @@ -35,8 +34,7 @@ import org.glassfish.security.services.config.SecurityProvider; import org.glassfish.security.services.impl.ServiceLogging; import org.glassfish.security.services.spi.authorization.RoleMappingProvider; - -import org.glassfish.logging.annotation.LogMessageInfo; +import org.jvnet.hk2.annotations.Service; @Service (name="simpleRoleMapping") @Secure(accessPermissionName="security/service/rolemapper/provider/simple") diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/spi/authorization/AuthorizationProvider.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/spi/authorization/AuthorizationProvider.java index bc216b7fc0c..6fd2b478e96 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/spi/authorization/AuthorizationProvider.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/spi/authorization/AuthorizationProvider.java @@ -16,13 +16,18 @@ package org.glassfish.security.services.spi.authorization; -import org.glassfish.security.services.api.authorization.*; -import org.glassfish.security.services.spi.SecurityProvider; +import java.util.List; +import org.glassfish.security.services.api.authorization.AuthorizationService; +import org.glassfish.security.services.api.authorization.AzAction; +import org.glassfish.security.services.api.authorization.AzAttributeResolver; +import org.glassfish.security.services.api.authorization.AzEnvironment; +import org.glassfish.security.services.api.authorization.AzResource; +import org.glassfish.security.services.api.authorization.AzResult; +import org.glassfish.security.services.api.authorization.AzSubject; +import org.glassfish.security.services.spi.SecurityProvider; import org.jvnet.hk2.annotations.Contract; -import java.util.List; - /** * AuthorizationProvider instances are used by a * {@link org.glassfish.security.services.api.authorization.AuthorizationService} diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/spi/authorization/RoleMappingProvider.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/spi/authorization/RoleMappingProvider.java index dfb6c2a47ad..f4a91e86ec1 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/spi/authorization/RoleMappingProvider.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/spi/authorization/RoleMappingProvider.java @@ -24,7 +24,6 @@ import org.glassfish.security.services.api.authorization.AzSubject; import org.glassfish.security.services.api.authorization.RoleMappingService; import org.glassfish.security.services.spi.SecurityProvider; - import org.jvnet.hk2.annotations.Contract; /** diff --git a/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/impl/MasterPasswordImpl.java b/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/impl/MasterPasswordImpl.java index 29e4847766a..14e9537166a 100644 --- a/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/impl/MasterPasswordImpl.java +++ b/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/impl/MasterPasswordImpl.java @@ -19,12 +19,15 @@ import com.sun.enterprise.security.store.IdentityManagement; import com.sun.enterprise.security.store.PasswordAdapter; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import java.io.IOException; import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; import java.security.cert.CertificateException; -import jakarta.inject.Inject; -import jakarta.inject.Singleton; + import org.glassfish.security.common.MasterPassword; import org.jvnet.hk2.annotations.Optional; import org.jvnet.hk2.annotations.Service; diff --git a/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/manager/UnifiedX509KeyManager.java b/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/manager/UnifiedX509KeyManager.java index a78638957cd..16adffef245 100644 --- a/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/manager/UnifiedX509KeyManager.java +++ b/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/manager/UnifiedX509KeyManager.java @@ -17,10 +17,11 @@ package com.sun.enterprise.security.ssl.manager; import java.net.Socket; -import java.util.ArrayList; import java.security.Principal; import java.security.PrivateKey; import java.security.cert.X509Certificate; +import java.util.ArrayList; + import javax.net.ssl.SSLEngine; import javax.net.ssl.X509KeyManager; diff --git a/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/manager/UnifiedX509TrustManager.java b/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/manager/UnifiedX509TrustManager.java index e3b778ac76b..dd6c3efaba0 100644 --- a/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/manager/UnifiedX509TrustManager.java +++ b/nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/manager/UnifiedX509TrustManager.java @@ -16,10 +16,11 @@ package com.sun.enterprise.security.ssl.manager; -import java.util.HashSet; -import java.util.Iterator; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; +import java.util.HashSet; +import java.util.Iterator; + import javax.net.ssl.X509TrustManager; /** From e8be7096d144ef3f2e0f9da16cf236f1655287c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sat, 10 Aug 2024 21:42:09 +0200 Subject: [PATCH 05/40] Imports: grizzly config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../java/org/glassfish/grizzly/config/DefaultProxy.java | 6 +++--- .../org/glassfish/grizzly/config/dom/NetworkAddress.java | 8 +++++--- .../grizzly/config/dom/NetworkAddressValidator.java | 5 +++-- .../main/java/org/glassfish/grizzly/config/dom/Range.java | 8 +++++--- .../grizzly/config/portunif/HttpRedirectFilter.java | 2 ++ .../org/glassfish/grizzly/config/ssl/JSSEKeyManager.java | 1 + 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/DefaultProxy.java b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/DefaultProxy.java index c5af7b703d1..4561943fe24 100644 --- a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/DefaultProxy.java +++ b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/DefaultProxy.java @@ -16,15 +16,15 @@ package org.glassfish.grizzly.config; -import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.ConfigBeanProxy; - import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.HashMap; import java.util.Map; +import org.jvnet.hk2.config.Attribute; +import org.jvnet.hk2.config.ConfigBeanProxy; + public class DefaultProxy implements InvocationHandler { private final Map methods; private final ConfigBeanProxy parent; diff --git a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/dom/NetworkAddress.java b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/dom/NetworkAddress.java index 6823e79cfe4..d5a747111bb 100644 --- a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/dom/NetworkAddress.java +++ b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/dom/NetworkAddress.java @@ -16,14 +16,16 @@ package org.glassfish.grizzly.config.dom; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + +import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import java.lang.annotation.Documented; + import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import jakarta.validation.Constraint; -import jakarta.validation.Payload; @Retention(RUNTIME) @Target({FIELD, METHOD}) diff --git a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/dom/NetworkAddressValidator.java b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/dom/NetworkAddressValidator.java index 5e2cc2bef87..0fadb711470 100644 --- a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/dom/NetworkAddressValidator.java +++ b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/dom/NetworkAddressValidator.java @@ -16,11 +16,12 @@ package org.glassfish.grizzly.config.dom; -import java.net.InetAddress; -import java.net.UnknownHostException; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; +import java.net.InetAddress; +import java.net.UnknownHostException; + public class NetworkAddressValidator implements ConstraintValidator { public void initialize(final NetworkAddress networkAddress) { } diff --git a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/dom/Range.java b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/dom/Range.java index 89663755f0b..24796443079 100644 --- a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/dom/Range.java +++ b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/dom/Range.java @@ -16,14 +16,16 @@ package org.glassfish.grizzly.config.dom; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + +import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import java.lang.annotation.Documented; + import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import jakarta.validation.Constraint; -import jakarta.validation.Payload; /** * Constraint validates the data is within the range of min to max or ${...} or null. diff --git a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/portunif/HttpRedirectFilter.java b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/portunif/HttpRedirectFilter.java index ad335f42e23..32c1d8d9055 100644 --- a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/portunif/HttpRedirectFilter.java +++ b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/portunif/HttpRedirectFilter.java @@ -20,7 +20,9 @@ import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; + import javax.net.ssl.SSLEngine; + import org.glassfish.grizzly.Connection; import org.glassfish.grizzly.config.ConfigAwareElement; import org.glassfish.grizzly.config.dom.HttpRedirect; diff --git a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/ssl/JSSEKeyManager.java b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/ssl/JSSEKeyManager.java index c6213c3173b..064ac356ea1 100644 --- a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/ssl/JSSEKeyManager.java +++ b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/ssl/JSSEKeyManager.java @@ -21,6 +21,7 @@ import java.security.Principal; import java.security.PrivateKey; import java.security.cert.X509Certificate; + import javax.net.ssl.SSLEngine; import javax.net.ssl.X509ExtendedKeyManager; import javax.net.ssl.X509KeyManager; From a0e460b093a33bec50582826b3da51601a16f4f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sat, 10 Aug 2024 21:51:23 +0200 Subject: [PATCH 06/40] Imports: core packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../kernel/javaee/WebContainerStarter.java | 30 +++++------ .../glassfish/bootstrap/AppServer.java | 5 +- .../glassfish/bootstrap/Configurator.java | 4 +- .../glassfish/bootstrap/ConfiguratorImpl.java | 1 + .../glassfish/bootstrap/GlassFishImpl.java | 5 +- .../glassfish/bootstrap/MainHelper.java | 4 +- .../enterprise/glassfish/bootstrap/Rejar.java | 24 +++++++-- .../bootstrap/StartupContextUtil.java | 4 +- .../glassfish/bootstrap/UberMain.java | 6 +-- .../enterprise/glassfish/bootstrap/Util.java | 12 ++++- .../osgi/EmbeddedOSGiGlassFishImpl.java | 10 ++-- .../EmbeddedOSGiGlassFishRuntimeBuilder.java | 1 + .../osgi/MinimalBundleProvisioner.java | 13 +++-- .../bootstrap/osgi/OSGiFrameworkLauncher.java | 10 ++-- .../bootstrap/osgi/OSGiGlassFishImpl.java | 1 + .../bootstrap/osgi/OSGiGlassFishRuntime.java | 1 + .../AccessControlledMapFinderTest.java | 1 + .../internal/EntryTest.java | 1 + .../sun/enterprise/v3/admin/AdminAdapter.java | 34 ++++++------ .../v3/admin/AdminCommandInstanceImpl.java | 6 +-- .../v3/admin/AdminConsoleConfigUpgrade.java | 22 ++++---- .../v3/admin/AdminRESTConfigUpgrade.java | 14 ++--- .../com/sun/enterprise/v3/admin/CLIUtil.java | 6 +-- .../v3/admin/CommandRunnerImpl.java | 54 +++++++++---------- .../v3/admin/CommandRunnerProgressHelper.java | 6 +-- .../enterprise/v3/admin/CreateProfiler.java | 20 +++---- .../v3/admin/CreateSystemProperties.java | 16 +++--- .../enterprise/v3/admin/DeleteProfiler.java | 18 +++---- .../v3/admin/DeleteSystemProperty.java | 20 +++---- .../enterprise/v3/admin/DumpHK2Command.java | 14 ++--- .../v3/admin/DynamicInterceptor.java | 4 +- .../sun/enterprise/v3/admin/GetCommand.java | 18 +++---- .../enterprise/v3/admin/GetHabitatInfo.java | 26 ++++----- .../v3/admin/GetRestartRequiredCommand.java | 8 +-- .../sun/enterprise/v3/admin/IdmService.java | 12 ++--- .../v3/admin/InserverCommandRunnerHelper.java | 10 ++-- .../JobAuthorizationAttributeProcessor.java | 6 +-- .../v3/admin/JobCleanUpService.java | 12 ++--- .../v3/admin/JobCreatorService.java | 4 +- .../enterprise/v3/admin/JobFileScanner.java | 6 +-- .../v3/admin/JobManagerService.java | 34 ++++++------ .../v3/admin/JobPersistenceService.java | 16 +++--- .../sun/enterprise/v3/admin/ListCommand.java | 12 ++--- .../admin/ListCommandDescriptorsCommand.java | 8 +-- .../v3/admin/ListCommandsCommand.java | 10 ++-- .../v3/admin/ListContainersCommand.java | 22 ++++---- .../v3/admin/ListModulesCommand.java | 16 +++--- .../v3/admin/ListSystemProperties.java | 16 +++--- .../v3/admin/LocalPasswordImpl.java | 4 +- .../enterprise/v3/admin/LocationsCommand.java | 12 ++--- .../sun/enterprise/v3/admin/MbeanService.java | 10 ++-- .../v3/admin/MonitoringReporter.java | 28 +++++----- .../v3/admin/RestartDomainCommand.java | 10 ++-- .../enterprise/v3/admin/RestartServer.java | 16 +++--- .../sun/enterprise/v3/admin/SetCommand.java | 18 +++---- .../v3/admin/StopDomainCommand.java | 8 +-- .../SupplementalCommandExecutorImpl.java | 15 +++--- .../enterprise/v3/admin/UptimeCommand.java | 12 ++--- .../v3/admin/V2DottedNameSupport.java | 10 ++-- .../enterprise/v3/admin/VersionCommand.java | 8 +-- .../v3/admin/adapter/InstallerThread.java | 2 +- .../v3/admin/commands/AttachCommand.java | 17 ++++-- .../enterprise/v3/admin/commands/CLIUtil.java | 1 + .../v3/admin/commands/ClassReporter.java | 2 + .../admin/commands/ConfigureManagedJobs.java | 12 +++-- .../v3/admin/commands/CreateThreadpool.java | 31 ++++++----- .../v3/admin/commands/DeleteJvmOptions.java | 7 ++- .../v3/admin/commands/DeleteThreadpool.java | 36 +++++++------ .../commands/GenerateJvmReportCommand.java | 24 ++++++--- .../v3/admin/commands/GetPayloadCommand.java | 9 +++- .../commands/JVMInformationCollector.java | 8 ++- .../v3/admin/commands/ListJvmOptions.java | 16 +++++- .../v3/admin/commands/ListThreadpools.java | 24 +++++---- .../v3/admin/commands/LogReporter.java | 1 + .../v3/admin/commands/MemoryReporter.java | 2 + .../StringBuilderNewLineAppender.java | 3 +- .../v3/admin/commands/SummaryReporter.java | 2 + .../v3/admin/commands/ThreadMonitor.java | 2 + ...binedJavaConfigSystemPropertyListener.java | 5 +- .../v3/bootstrap/DerbyLifecycle.java | 4 +- .../enterprise/v3/common/ActionReporter.java | 4 +- .../v3/common/PlainTextActionReporter.java | 4 +- .../v3/common/PropsFileActionReporter.java | 4 +- .../v3/server/APIClassLoaderServiceImpl.java | 24 ++++----- .../v3/server/AppServerStartup.java | 38 ++++++------- .../v3/server/ApplicationConfigListener.java | 26 ++++----- .../v3/server/ClassLoaderHierarchyImpl.java | 22 ++++---- .../v3/server/CompositeArchive.java | 4 +- .../v3/server/ContainerStarter.java | 10 ++-- .../v3/server/DomainCreationStartup.java | 12 ++--- .../enterprise/v3/server/DomainResolver.java | 4 +- .../v3/server/DomainXmlPersistence.java | 14 ++--- .../v3/server/DynamicReloadService.java | 14 ++--- .../enterprise/v3/server/DynamicReloader.java | 12 ++--- .../v3/server/LifecycleEventContextImpl.java | 4 +- .../v3/server/LifecycleListenerImpl.java | 4 +- .../v3/server/LifecycleModuleService.java | 24 ++++----- .../server/ReadableArchiveScannerAdapter.java | 8 +-- .../v3/server/ServerContextImpl.java | 12 ++--- .../v3/server/ServerLifecycleModule.java | 14 ++--- .../v3/server/SnifferManagerImpl.java | 8 +-- .../enterprise/v3/server/SystemTasksImpl.java | 34 ++++++------ .../v3/services/impl/ADBAwareHttpHandler.java | 1 + .../v3/services/impl/ContainerMapper.java | 10 ++-- .../services/impl/DynamicConfigListener.java | 10 ++-- .../enterprise/v3/services/impl/Endpoint.java | 1 + .../v3/services/impl/EndpointMapper.java | 3 +- .../v3/services/impl/GrizzlyProxy.java | 11 ++-- .../v3/services/impl/GrizzlyService.java | 36 ++++++------- .../services/impl/MapperUpdateListener.java | 1 + .../v3/services/impl/NetworkProxy.java | 5 +- .../impl/ServiceInitializerListener.java | 2 +- .../v3/services/impl/SnifferAdapter.java | 16 +++--- .../impl/monitor/FileCacheMonitor.java | 1 + .../impl/monitor/GrizzlyMonitoring.java | 2 + .../impl/monitor/KeepAliveMonitor.java | 2 + .../impl/monitor/ThreadPoolMonitor.java | 1 + .../stats/ConnectionQueueStatsProvider.java | 1 + .../monitor/stats/FileCacheStatsProvider.java | 1 + .../glassfish/kernel/FileMonitoringImpl.java | 18 ++++--- .../kernel/config/DefaultConfigParser.java | 8 ++- .../kernel/embedded/EmbeddedAdminCtrImpl.java | 22 ++++---- .../embedded/EmbeddedDomainPersistence.java | 4 +- .../kernel/embedded/EmbeddedDomainXml.java | 5 +- .../glassfish/kernel/embedded/PortImpl.java | 25 +++++---- .../glassfish/kernel/embedded/PortsImpl.java | 15 +++--- .../admin/CommandRunnerImplServiceTest.java | 4 +- .../v3/admin/ConfigAttributeSetTest.java | 29 +++++----- .../v3/admin/CreateProfilerTest.java | 4 +- .../v3/server/AppServerStartupTest.java | 8 +-- .../v3/services/impl/GrizzlyProxyTest.java | 18 +++---- .../test/example/AnotherPublicMethod.java | 4 +- .../example/AuthorizationServiceMock.java | 2 +- .../tests/kernel/deployment/EventsTest.java | 3 +- .../server/logging/LoggerInfoMetadata.java | 2 +- .../logging/commands/ListLogAttributes.java | 18 +++---- .../logging/commands/ListLoggerLevels.java | 34 +++++++++--- .../server/logging/commands/ListLoggers.java | 17 +++--- .../commands/LoadDefaultLogAttributes.java | 25 ++++++--- .../commands/LoadDefaultLogLevels.java | 27 +++++++--- .../server/logging/commands/SetLogLevel.java | 14 ++--- .../logging/diagnostics/MessageIdCatalog.java | 2 +- 142 files changed, 930 insertions(+), 744 deletions(-) diff --git a/appserver/core/jakartaee-kernel/src/main/java/org/glassfish/kernel/javaee/WebContainerStarter.java b/appserver/core/jakartaee-kernel/src/main/java/org/glassfish/kernel/javaee/WebContainerStarter.java index f28ce12a113..2817fa5fabc 100644 --- a/appserver/core/jakartaee-kernel/src/main/java/org/glassfish/kernel/javaee/WebContainerStarter.java +++ b/appserver/core/jakartaee-kernel/src/main/java/org/glassfish/kernel/javaee/WebContainerStarter.java @@ -17,11 +17,16 @@ package org.glassfish.kernel.javaee; -import static com.sun.enterprise.config.serverbeans.ConfigBeansUtilities.toBoolean; -import static java.util.logging.Level.INFO; -import static org.jvnet.hk2.config.Changed.TYPE.ADD; -import static org.jvnet.hk2.config.Changed.TYPE.CHANGE; -import static org.jvnet.hk2.config.ConfigSupport.sortAndDispatch; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.HttpService; +import com.sun.enterprise.config.serverbeans.VirtualServer; +import com.sun.enterprise.module.ModulesRegistry; +import com.sun.enterprise.v3.server.ContainerStarter; + +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Provider; import java.beans.PropertyChangeEvent; import java.text.MessageFormat; @@ -54,16 +59,11 @@ import org.jvnet.hk2.config.UnprocessedChangeEvents; import org.jvnet.hk2.config.types.Property; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.HttpService; -import com.sun.enterprise.config.serverbeans.VirtualServer; -import com.sun.enterprise.module.ModulesRegistry; -import com.sun.enterprise.v3.server.ContainerStarter; - -import jakarta.inject.Inject; -import jakarta.inject.Named; -import jakarta.inject.Provider; +import static com.sun.enterprise.config.serverbeans.ConfigBeansUtilities.toBoolean; +import static java.util.logging.Level.INFO; +import static org.jvnet.hk2.config.Changed.TYPE.ADD; +import static org.jvnet.hk2.config.Changed.TYPE.CHANGE; +import static org.jvnet.hk2.config.ConfigSupport.sortAndDispatch; /** * Startup service for the web container. diff --git a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/AppServer.java b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/AppServer.java index f83bb962d5d..990f5be0be6 100644 --- a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/AppServer.java +++ b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/AppServer.java @@ -16,13 +16,14 @@ package com.sun.enterprise.glassfish.bootstrap; -import org.glassfish.hk2.api.Proxiable; - import jakarta.inject.Scope; + import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import org.glassfish.hk2.api.Proxiable; + import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/Configurator.java b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/Configurator.java index a4176693cf8..5bdd2842ea6 100644 --- a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/Configurator.java +++ b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/Configurator.java @@ -16,10 +16,10 @@ package com.sun.enterprise.glassfish.bootstrap; -import org.glassfish.embeddable.GlassFishException; - import java.util.Properties; +import org.glassfish.embeddable.GlassFishException; + /** * @author Sanjeeb.Sahoo@Sun.COM */ diff --git a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/ConfiguratorImpl.java b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/ConfiguratorImpl.java index 5b79a0a51f2..27519a6d9a9 100644 --- a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/ConfiguratorImpl.java +++ b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/ConfiguratorImpl.java @@ -17,6 +17,7 @@ package com.sun.enterprise.glassfish.bootstrap; import java.util.Properties; + import org.glassfish.embeddable.CommandResult; import org.glassfish.embeddable.CommandRunner; import org.glassfish.embeddable.GlassFishException; diff --git a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/GlassFishImpl.java b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/GlassFishImpl.java index c35df8b8cd8..4584f0940b4 100644 --- a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/GlassFishImpl.java +++ b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/GlassFishImpl.java @@ -17,13 +17,14 @@ package com.sun.enterprise.glassfish.bootstrap; import com.sun.enterprise.module.bootstrap.ModuleStartup; + +import java.util.Properties; + import org.glassfish.embeddable.CommandRunner; import org.glassfish.embeddable.Deployer; import org.glassfish.embeddable.GlassFish; import org.glassfish.embeddable.GlassFishException; import org.glassfish.hk2.api.ServiceLocator; - -import java.util.Properties; import org.glassfish.hk2.extras.ExtrasUtilities; /** diff --git a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/MainHelper.java b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/MainHelper.java index ae37e39ab45..4921943a925 100644 --- a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/MainHelper.java +++ b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/MainHelper.java @@ -41,6 +41,8 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; +// WARNING: There must not be any references to java.util.logging.* instances in static initialization except levels. +// They would cause initialization of the JVM logging which we do AFTER this. import static com.sun.enterprise.glassfish.bootstrap.Constants.INSTALL_ROOT_PROP_NAME; import static com.sun.enterprise.glassfish.bootstrap.Constants.INSTALL_ROOT_URI_PROP_NAME; import static com.sun.enterprise.glassfish.bootstrap.Constants.INSTANCE_ROOT_PROP_NAME; @@ -48,8 +50,6 @@ import static com.sun.enterprise.glassfish.bootstrap.Constants.PLATFORM_PROPERTY_KEY; import static com.sun.enterprise.glassfish.bootstrap.LogFacade.BOOTSTRAP_LOGGER; import static com.sun.enterprise.module.bootstrap.ArgumentManager.argsToMap; -// WARNING: There must not be any references to java.util.logging.* instances in static initialization except levels. -// They would cause initialization of the JVM logging which we do AFTER this. import static java.util.logging.Level.FINE; import static java.util.logging.Level.INFO; import static java.util.logging.Level.SEVERE; diff --git a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/Rejar.java b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/Rejar.java index d01c5fb29a6..520a8371e08 100644 --- a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/Rejar.java +++ b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/Rejar.java @@ -16,13 +16,27 @@ package com.sun.enterprise.glassfish.bootstrap; -import java.io.*; -import java.util.*; -import java.util.jar.*; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileFilter; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.nio.ByteBuffer; import java.nio.channels.Channels; -import java.nio.channels.WritableByteChannel; import java.nio.channels.ReadableByteChannel; -import java.nio.ByteBuffer; +import java.nio.channels.WritableByteChannel; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.jar.Attributes; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; +import java.util.jar.JarOutputStream; +import java.util.jar.Manifest; /** * Created by IntelliJ IDEA. diff --git a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/StartupContextUtil.java b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/StartupContextUtil.java index 62a2e6aba28..1e02de57e5a 100644 --- a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/StartupContextUtil.java +++ b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/StartupContextUtil.java @@ -19,10 +19,10 @@ import com.sun.enterprise.module.bootstrap.StartupContext; import java.io.File; +import java.util.ArrayList; +import java.util.List; import java.util.Properties; import java.util.StringTokenizer; -import java.util.List; -import java.util.ArrayList; /** * This encapsulates the behavior of the properties object that's part of diff --git a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/UberMain.java b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/UberMain.java index d8a209c7c4f..696f9baed20 100644 --- a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/UberMain.java +++ b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/UberMain.java @@ -16,15 +16,15 @@ package com.sun.enterprise.glassfish.bootstrap; +import java.io.BufferedReader; +import java.io.InputStreamReader; + import org.glassfish.embeddable.CommandResult; import org.glassfish.embeddable.CommandRunner; import org.glassfish.embeddable.GlassFish; import org.glassfish.embeddable.GlassFishProperties; import org.glassfish.embeddable.GlassFishRuntime; -import java.io.BufferedReader; -import java.io.InputStreamReader; - /** * This is main class for the uber jars viz., glassfish-embedded-all.jar and * glassfish-embedded-web.jar, to be able to do: diff --git a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/Util.java b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/Util.java index 60704aea00e..c0d1b729f5a 100644 --- a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/Util.java +++ b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/Util.java @@ -16,7 +16,12 @@ package com.sun.enterprise.glassfish.bootstrap; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; import java.net.JarURLConnection; import java.net.URI; import java.net.URL; @@ -24,7 +29,10 @@ import java.nio.channels.Channels; import java.nio.channels.FileChannel; import java.nio.channels.ReadableByteChannel; -import java.util.*; +import java.util.Collection; +import java.util.Enumeration; +import java.util.Map; +import java.util.Properties; import java.util.logging.Logger; /** diff --git a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/EmbeddedOSGiGlassFishImpl.java b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/EmbeddedOSGiGlassFishImpl.java index b0d6c5e60a0..78bee5029e1 100644 --- a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/EmbeddedOSGiGlassFishImpl.java +++ b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/EmbeddedOSGiGlassFishImpl.java @@ -17,15 +17,15 @@ package com.sun.enterprise.glassfish.bootstrap.osgi; import com.sun.enterprise.glassfish.bootstrap.GlassFishDecorator; -import org.glassfish.embeddable.GlassFish; -import org.glassfish.embeddable.GlassFishException; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceRegistration; +import com.sun.enterprise.glassfish.bootstrap.LogFacade; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.glassfish.bootstrap.LogFacade; +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishException; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceRegistration; /** * A specialized implementation of GlassFish which takes care of calling diff --git a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/EmbeddedOSGiGlassFishRuntimeBuilder.java b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/EmbeddedOSGiGlassFishRuntimeBuilder.java index 6950e41f754..2d5348d868a 100644 --- a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/EmbeddedOSGiGlassFishRuntimeBuilder.java +++ b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/EmbeddedOSGiGlassFishRuntimeBuilder.java @@ -20,6 +20,7 @@ import com.sun.enterprise.glassfish.bootstrap.Constants; import java.util.Hashtable; + import org.glassfish.embeddable.BootstrapProperties; import org.glassfish.embeddable.GlassFishException; import org.glassfish.embeddable.GlassFishRuntime; diff --git a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/MinimalBundleProvisioner.java b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/MinimalBundleProvisioner.java index 8d3c0b50abf..81c0b5fc9f8 100644 --- a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/MinimalBundleProvisioner.java +++ b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/MinimalBundleProvisioner.java @@ -16,20 +16,25 @@ package com.sun.enterprise.glassfish.bootstrap.osgi; -import org.osgi.framework.*; -import org.osgi.framework.Constants; +import com.sun.enterprise.glassfish.bootstrap.LogFacade; import java.io.File; import java.io.IOException; import java.io.InputStream; import java.net.URI; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Properties; import java.util.jar.JarInputStream; import java.util.jar.Manifest; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.glassfish.bootstrap.LogFacade; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleException; +import org.osgi.framework.Constants; /** * This is a specialized {@link BundleProvisioner} that installs only a minimum set of of bundles. diff --git a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/OSGiFrameworkLauncher.java b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/OSGiFrameworkLauncher.java index 8065b377d0c..e62d634f6a5 100644 --- a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/OSGiFrameworkLauncher.java +++ b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/OSGiFrameworkLauncher.java @@ -17,6 +17,11 @@ package com.sun.enterprise.glassfish.bootstrap.osgi; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; +import java.util.ServiceLoader; + import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; import org.osgi.framework.BundleReference; @@ -24,11 +29,6 @@ import org.osgi.framework.launch.FrameworkFactory; import org.osgi.util.tracker.ServiceTracker; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; -import java.util.ServiceLoader; - /** * Utility class which takes care of launching OSGi framework. * It lauches the framework in a daemon thread, because typically framework spawned threads inherit diff --git a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/OSGiGlassFishImpl.java b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/OSGiGlassFishImpl.java index 0d8ef102eb1..9df1bf394b4 100644 --- a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/OSGiGlassFishImpl.java +++ b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/OSGiGlassFishImpl.java @@ -17,6 +17,7 @@ package com.sun.enterprise.glassfish.bootstrap.osgi; import com.sun.enterprise.glassfish.bootstrap.GlassFishDecorator; + import org.glassfish.embeddable.GlassFish; import org.glassfish.embeddable.GlassFishException; import org.osgi.framework.BundleContext; diff --git a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/OSGiGlassFishRuntime.java b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/OSGiGlassFishRuntime.java index 912d0f53a8f..62707e8ec10 100644 --- a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/OSGiGlassFishRuntime.java +++ b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/OSGiGlassFishRuntime.java @@ -17,6 +17,7 @@ package com.sun.enterprise.glassfish.bootstrap.osgi; import com.sun.enterprise.glassfish.bootstrap.GlassFishRuntimeDecorator; + import org.glassfish.embeddable.GlassFish; import org.glassfish.embeddable.GlassFishException; import org.glassfish.embeddable.GlassFishProperties; diff --git a/nucleus/core/context-propagation/src/test/java/org/glassfish/contextpropagation/internal/AccessControlledMapFinderTest.java b/nucleus/core/context-propagation/src/test/java/org/glassfish/contextpropagation/internal/AccessControlledMapFinderTest.java index 40b5c699d44..d4489fa0391 100644 --- a/nucleus/core/context-propagation/src/test/java/org/glassfish/contextpropagation/internal/AccessControlledMapFinderTest.java +++ b/nucleus/core/context-propagation/src/test/java/org/glassfish/contextpropagation/internal/AccessControlledMapFinderTest.java @@ -23,6 +23,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/nucleus/core/context-propagation/src/test/java/org/glassfish/contextpropagation/internal/EntryTest.java b/nucleus/core/context-propagation/src/test/java/org/glassfish/contextpropagation/internal/EntryTest.java index 657739df83b..752ee64db3e 100644 --- a/nucleus/core/context-propagation/src/test/java/org/glassfish/contextpropagation/internal/EntryTest.java +++ b/nucleus/core/context-propagation/src/test/java/org/glassfish/contextpropagation/internal/EntryTest.java @@ -26,6 +26,7 @@ import org.glassfish.contextpropagation.PropagationMode; import org.glassfish.contextpropagation.internal.Entry.ContextType; import org.junit.jupiter.api.Test; + import static org.glassfish.contextpropagation.internal.Entry.ContextType.ASCII_STRING; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminAdapter.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminAdapter.java index a66010fce23..29ce7099811 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminAdapter.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminAdapter.java @@ -17,6 +17,23 @@ package com.sun.enterprise.v3.admin; +import com.sun.enterprise.admin.remote.RemoteRestAdminCommand; +import com.sun.enterprise.config.serverbeans.AdminService; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.module.ModulesRegistry; +import com.sun.enterprise.module.common_impl.LogHelper; +import com.sun.enterprise.universal.GFBase64Decoder; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; +import com.sun.enterprise.util.uuid.UuidGenerator; +import com.sun.enterprise.util.uuid.UuidGeneratorImpl; +import com.sun.enterprise.v3.admin.adapter.AdminEndpointDecider; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -69,23 +86,6 @@ import org.glassfish.kernel.KernelLoggerInfo; import org.glassfish.server.ServerEnvironmentImpl; -import com.sun.enterprise.admin.remote.RemoteRestAdminCommand; -import com.sun.enterprise.config.serverbeans.AdminService; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.Server; -import com.sun.enterprise.module.ModulesRegistry; -import com.sun.enterprise.module.common_impl.LogHelper; -import com.sun.enterprise.universal.GFBase64Decoder; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; -import com.sun.enterprise.util.uuid.UuidGenerator; -import com.sun.enterprise.util.uuid.UuidGeneratorImpl; -import com.sun.enterprise.v3.admin.adapter.AdminEndpointDecider; - -import jakarta.inject.Inject; -import jakarta.inject.Named; - /** * Listen to admin commands... * @author dochez diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminCommandInstanceImpl.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminCommandInstanceImpl.java index 7504c429242..7dc1d334fb0 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminCommandInstanceImpl.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminCommandInstanceImpl.java @@ -16,6 +16,9 @@ package com.sun.enterprise.v3.admin; +import com.sun.enterprise.admin.event.AdminCommandEventBrokerImpl; +import com.sun.enterprise.admin.remote.AdminCommandStateImpl; + import java.io.File; import java.io.IOException; import java.io.ObjectInputStream; @@ -36,9 +39,6 @@ import org.glassfish.internal.api.Globals; import org.glassfish.security.services.common.SubjectUtil; -import com.sun.enterprise.admin.event.AdminCommandEventBrokerImpl; -import com.sun.enterprise.admin.remote.AdminCommandStateImpl; - /** Represents running (or finished) command instance. * * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminConsoleConfigUpgrade.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminConsoleConfigUpgrade.java index 3da5020981f..eeffa4b5869 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminConsoleConfigUpgrade.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminConsoleConfigUpgrade.java @@ -17,7 +17,16 @@ package com.sun.enterprise.v3.admin; -import static java.util.logging.Level.WARNING; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Configs; +import com.sun.enterprise.config.serverbeans.MessageSecurityConfig; +import com.sun.enterprise.config.serverbeans.ProviderConfig; +import com.sun.enterprise.config.serverbeans.RequestPolicy; +import com.sun.enterprise.config.serverbeans.ResponsePolicy; +import com.sun.enterprise.config.serverbeans.SecurityService; + +import jakarta.inject.Inject; +import jakarta.inject.Named; import java.beans.PropertyVetoException; import java.util.List; @@ -33,16 +42,7 @@ import org.jvnet.hk2.config.TransactionFailure; import org.jvnet.hk2.config.types.Property; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Configs; -import com.sun.enterprise.config.serverbeans.MessageSecurityConfig; -import com.sun.enterprise.config.serverbeans.ProviderConfig; -import com.sun.enterprise.config.serverbeans.RequestPolicy; -import com.sun.enterprise.config.serverbeans.ResponsePolicy; -import com.sun.enterprise.config.serverbeans.SecurityService; - -import jakarta.inject.Inject; -import jakarta.inject.Named; +import static java.util.logging.Level.WARNING; /** * Adds the needed message-security-config information to domain.xml diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminRESTConfigUpgrade.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminRESTConfigUpgrade.java index 40e00acf54c..5a5ed37c3b4 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminRESTConfigUpgrade.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminRESTConfigUpgrade.java @@ -17,8 +17,11 @@ package com.sun.enterprise.v3.admin; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.SEVERE; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Configs; + +import jakarta.inject.Inject; +import jakarta.inject.Named; import java.beans.PropertyVetoException; import java.util.logging.Logger; @@ -34,11 +37,8 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Configs; - -import jakarta.inject.Inject; -import jakarta.inject.Named; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.SEVERE; /** * Adds the needed http.setEncodedSlashEnabled to domain.xml diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CLIUtil.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CLIUtil.java index d4b52455813..0179e9ee4c5 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CLIUtil.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CLIUtil.java @@ -16,13 +16,13 @@ package com.sun.enterprise.v3.admin; -import org.glassfish.internal.api.Target; -import org.jvnet.hk2.config.types.Property; - import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.SystemPropertyBag; +import org.glassfish.internal.api.Target; +import org.jvnet.hk2.config.types.Property; + /** * * @author tjquinn diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CommandRunnerImpl.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CommandRunnerImpl.java index b00a7f2d44b..3cd27bb82ff 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CommandRunnerImpl.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CommandRunnerImpl.java @@ -17,8 +17,29 @@ package com.sun.enterprise.v3.admin; -import static com.sun.enterprise.util.Utility.isEmpty; -import static java.util.logging.Level.SEVERE; +import com.sun.enterprise.admin.event.AdminCommandEventBrokerImpl; +import com.sun.enterprise.admin.util.CachedCommandModel; +import com.sun.enterprise.admin.util.ClusterOperationUtil; +import com.sun.enterprise.admin.util.CommandSecurityChecker; +import com.sun.enterprise.admin.util.InstanceStateService; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.universal.collections.ManifestUtils; +import com.sun.enterprise.universal.glassfish.AdminCommandResponse; +import com.sun.enterprise.util.AnnotationUtil; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.StringUtils; +import com.sun.enterprise.v3.common.XMLContentActionReporter; + +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Scope; +import jakarta.inject.Singleton; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorContext; +import jakarta.validation.ValidatorFactory; import java.io.BufferedReader; import java.io.File; @@ -95,6 +116,8 @@ import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.api.ServerContext; import org.glassfish.internal.api.UndoableCommand; +import org.glassfish.internal.api.events.CommandInvokedEvent; +import org.glassfish.internal.api.events.InvokeEventService; import org.glassfish.internal.deployment.DeploymentTargetResolver; import org.glassfish.kernel.KernelLoggerInfo; import org.jvnet.hk2.annotations.Service; @@ -104,31 +127,8 @@ import org.jvnet.hk2.config.MessageInterpolatorImpl; import org.jvnet.hk2.config.UnsatisfiedDependencyException; -import com.sun.enterprise.admin.event.AdminCommandEventBrokerImpl; -import com.sun.enterprise.admin.util.CachedCommandModel; -import com.sun.enterprise.admin.util.ClusterOperationUtil; -import com.sun.enterprise.admin.util.CommandSecurityChecker; -import com.sun.enterprise.admin.util.InstanceStateService; -import com.sun.enterprise.config.serverbeans.Cluster; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.universal.collections.ManifestUtils; -import com.sun.enterprise.universal.glassfish.AdminCommandResponse; -import com.sun.enterprise.util.AnnotationUtil; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.StringUtils; -import com.sun.enterprise.v3.common.XMLContentActionReporter; - -import jakarta.inject.Inject; -import jakarta.inject.Named; -import jakarta.inject.Scope; -import jakarta.inject.Singleton; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorContext; -import jakarta.validation.ValidatorFactory; -import org.glassfish.internal.api.events.CommandInvokedEvent; -import org.glassfish.internal.api.events.InvokeEventService; +import static com.sun.enterprise.util.Utility.isEmpty; +import static java.util.logging.Level.SEVERE; /** * Encapsulates the logic needed to execute a server-side command (for example, diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CommandRunnerProgressHelper.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CommandRunnerProgressHelper.java index 62f9de1ce6d..23739534ce6 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CommandRunnerProgressHelper.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CommandRunnerProgressHelper.java @@ -16,6 +16,9 @@ package com.sun.enterprise.v3.admin; +import com.sun.enterprise.admin.progress.CommandProgressImpl; +import com.sun.enterprise.admin.progress.ProgressStatusClient; + import java.util.UUID; import org.glassfish.api.admin.AdminCommand; @@ -33,9 +36,6 @@ import org.glassfish.api.admin.progress.ProgressStatusMirroringImpl; import org.glassfish.config.support.GenericCrudCommand; -import com.sun.enterprise.admin.progress.CommandProgressImpl; -import com.sun.enterprise.admin.progress.ProgressStatusClient; - /** Helper class for {@code ProgressStatus} manipulation during * {@code CommandRunner} execution.

* Life cycle:
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CreateProfiler.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CreateProfiler.java index 9479f09050e..479f255b16f 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CreateProfiler.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CreateProfiler.java @@ -16,8 +16,14 @@ package com.sun.enterprise.v3.admin; -import static org.glassfish.api.ActionReport.ExitCode.FAILURE; -import static org.glassfish.api.ActionReport.ExitCode.SUCCESS; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.JavaConfig; +import com.sun.enterprise.config.serverbeans.Profiler; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; import java.beans.PropertyVetoException; import java.util.Map; @@ -45,14 +51,8 @@ import org.jvnet.hk2.config.TransactionFailure; import org.jvnet.hk2.config.types.Property; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.JavaConfig; -import com.sun.enterprise.config.serverbeans.Profiler; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; - -import jakarta.inject.Inject; -import jakarta.inject.Named; +import static org.glassfish.api.ActionReport.ExitCode.FAILURE; +import static org.glassfish.api.ActionReport.ExitCode.SUCCESS; /** * Create Profiler Command diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CreateSystemProperties.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CreateSystemProperties.java index 0fcc71286b3..29b1cc60c65 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CreateSystemProperties.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CreateSystemProperties.java @@ -16,6 +16,14 @@ package com.sun.enterprise.v3.admin; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.SystemProperty; +import com.sun.enterprise.config.serverbeans.SystemPropertyBag; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + import java.beans.PropertyVetoException; import java.util.ArrayList; import java.util.Collection; @@ -40,14 +48,6 @@ import org.jvnet.hk2.config.Transaction; import org.jvnet.hk2.config.TransactionFailure; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.SystemProperty; -import com.sun.enterprise.config.serverbeans.SystemPropertyBag; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; - -import jakarta.inject.Inject; - /** * Create System Properties Command * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DeleteProfiler.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DeleteProfiler.java index 505d8e858d4..adfc9bc7514 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DeleteProfiler.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DeleteProfiler.java @@ -16,6 +16,15 @@ package com.sun.enterprise.v3.admin; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.JavaConfig; +import com.sun.enterprise.config.serverbeans.Profiler; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.beans.PropertyVetoException; import org.glassfish.api.ActionReport; @@ -39,15 +48,6 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.JavaConfig; -import com.sun.enterprise.config.serverbeans.Profiler; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; - -import jakarta.inject.Inject; -import jakarta.inject.Named; - /** * Delete JDBC Resource command * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DeleteSystemProperty.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DeleteSystemProperty.java index 7985c980e53..483e69b1d59 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DeleteSystemProperty.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DeleteSystemProperty.java @@ -16,6 +16,16 @@ package com.sun.enterprise.v3.admin; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.config.serverbeans.SystemPropertyBag; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + import java.beans.PropertyVetoException; import java.util.ArrayList; import java.util.Arrays; @@ -41,16 +51,6 @@ import org.jvnet.hk2.config.TransactionFailure; import org.jvnet.hk2.config.types.Property; -import com.sun.enterprise.config.serverbeans.Cluster; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.Server; -import com.sun.enterprise.config.serverbeans.SystemPropertyBag; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; - -import jakarta.inject.Inject; - /** * Delete System Property Command * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DumpHK2Command.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DumpHK2Command.java index 88635034613..37507107b00 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DumpHK2Command.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DumpHK2Command.java @@ -16,6 +16,13 @@ package com.sun.enterprise.v3.admin; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.module.ModulesRegistry; +import com.sun.enterprise.universal.collections.ManifestUtils; +import com.sun.enterprise.v3.common.PropsFileActionReporter; + +import jakarta.inject.Inject; + import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -29,13 +36,6 @@ import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.module.ModulesRegistry; -import com.sun.enterprise.universal.collections.ManifestUtils; -import com.sun.enterprise.v3.common.PropsFileActionReporter; - -import jakarta.inject.Inject; - /** * Dumps the currently configured HK2 modules and their contents. * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DynamicInterceptor.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DynamicInterceptor.java index fbdf2743ed4..1a35853e615 100755 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DynamicInterceptor.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/DynamicInterceptor.java @@ -16,6 +16,8 @@ package com.sun.enterprise.v3.admin; +import com.sun.enterprise.util.LocalStringManagerImpl; + import java.io.IOException; import java.io.ObjectInputStream; import java.util.ArrayList; @@ -52,8 +54,6 @@ import javax.management.remote.JMXServiceURL; import javax.rmi.ssl.SslRMIClientSocketFactory; -import com.sun.enterprise.util.LocalStringManagerImpl; - /** * This Interceptor wraps the real MBeanServer so that additional interceptor code can be "turned on" at a later point. * However, it must be possible to start the MBeanServer even before the JVM calls main(). Therefore, This class must diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetCommand.java index b9387c3cd0a..c50e92dd446 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetCommand.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetCommand.java @@ -16,9 +16,12 @@ package com.sun.enterprise.v3.admin; -import static java.util.logging.Level.FINE; -import static org.glassfish.api.ActionReport.ExitCode.FAILURE; -import static org.glassfish.api.admin.AccessRequired.Util.resourceNameFromDom; +import com.sun.enterprise.config.modularity.GetSetModularityHelper; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.v3.common.PropsFileActionReporter; + +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.Collection; @@ -51,12 +54,9 @@ import org.jvnet.hk2.config.Dom; import org.jvnet.hk2.config.types.Property; -import com.sun.enterprise.config.modularity.GetSetModularityHelper; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.v3.common.PropsFileActionReporter; - -import jakarta.inject.Inject; +import static java.util.logging.Level.FINE; +import static org.glassfish.api.ActionReport.ExitCode.FAILURE; +import static org.glassfish.api.admin.AccessRequired.Util.resourceNameFromDom; /** * User: Jerome Dochez Date: Jul 10, 2008 Time: 12:17:26 AM diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetHabitatInfo.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetHabitatInfo.java index 8f10aec11f7..4877ea72ac9 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetHabitatInfo.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetHabitatInfo.java @@ -17,8 +17,17 @@ package com.sun.enterprise.v3.admin; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.customvalidators.JavaClassName; +import com.sun.enterprise.module.ModulesRegistry; +import com.sun.enterprise.universal.collections.ManifestUtils; +import com.sun.enterprise.v3.common.PropsFileActionReporter; + +import jakarta.inject.Inject; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; +import jakarta.validation.constraints.Pattern; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -44,17 +53,8 @@ import org.glassfish.hk2.utilities.BuilderHelper; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.customvalidators.JavaClassName; -import com.sun.enterprise.module.ModulesRegistry; -import com.sun.enterprise.universal.collections.ManifestUtils; -import com.sun.enterprise.v3.common.PropsFileActionReporter; - -import jakarta.inject.Inject; -import jakarta.validation.ConstraintValidator; -import jakarta.validation.ConstraintValidatorContext; -import jakarta.validation.Payload; -import jakarta.validation.constraints.Pattern; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; /** * Dumps a sorted list of all registered Contract's in the Habitat diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetRestartRequiredCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetRestartRequiredCommand.java index 349eb6eaf73..fe606475f37 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetRestartRequiredCommand.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetRestartRequiredCommand.java @@ -16,6 +16,10 @@ package com.sun.enterprise.v3.admin; +import com.sun.enterprise.config.serverbeans.Domain; + +import jakarta.inject.Inject; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -37,10 +41,6 @@ import org.jvnet.hk2.config.UnprocessedChangeEvent; import org.jvnet.hk2.config.UnprocessedChangeEvents; -import com.sun.enterprise.config.serverbeans.Domain; - -import jakarta.inject.Inject; - /** * Return the "restart required" flag. * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/IdmService.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/IdmService.java index 5c6e0ce6c78..bece71c5f8b 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/IdmService.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/IdmService.java @@ -16,6 +16,12 @@ package com.sun.enterprise.v3.admin; +import com.sun.enterprise.glassfish.bootstrap.StartupContextUtil; +import com.sun.enterprise.module.bootstrap.StartupContext; +import com.sun.enterprise.security.store.IdentityManagement; + +import jakarta.inject.Inject; + import java.io.BufferedReader; import java.io.File; import java.io.FileReader; @@ -32,12 +38,6 @@ import org.glassfish.server.ServerEnvironmentImpl; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.glassfish.bootstrap.StartupContextUtil; -import com.sun.enterprise.module.bootstrap.StartupContext; -import com.sun.enterprise.security.store.IdentityManagement; - -import jakarta.inject.Inject; - /** * An implementation of the @link {IdentityManagement} that manages the password needs of the server. This * implementation consults the Java KeyStore and assumes that the stores are available in server's configuration area. diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/InserverCommandRunnerHelper.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/InserverCommandRunnerHelper.java index 532c1816ac9..6840643800f 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/InserverCommandRunnerHelper.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/InserverCommandRunnerHelper.java @@ -16,6 +16,11 @@ package com.sun.enterprise.v3.admin; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import java.util.logging.Level; import java.util.logging.Logger; @@ -28,11 +33,6 @@ import org.glassfish.kernel.KernelLoggerInfo; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.util.LocalStringManagerImpl; - -import jakarta.inject.Inject; -import jakarta.inject.Singleton; - /** * * Allows commands executing in the DAS or an instance to invoke other commands in the same server. This will be most diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobAuthorizationAttributeProcessor.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobAuthorizationAttributeProcessor.java index d8d28379873..1a3efc451c0 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobAuthorizationAttributeProcessor.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobAuthorizationAttributeProcessor.java @@ -16,6 +16,9 @@ package com.sun.enterprise.v3.admin; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -28,9 +31,6 @@ import org.glassfish.api.admin.progress.JobInfo; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import jakarta.inject.Singleton; - /** * Attaches a user attribute to job resources for authorization. * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobCleanUpService.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobCleanUpService.java index 62fd1fb842d..4a53d3f295f 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobCleanUpService.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobCleanUpService.java @@ -16,8 +16,10 @@ package com.sun.enterprise.v3.admin; -import static java.util.concurrent.TimeUnit.MILLISECONDS; -import static java.util.logging.Level.FINE; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.ManagedJobConfig; + +import jakarta.inject.Inject; import java.beans.PropertyChangeEvent; import java.io.File; @@ -43,10 +45,8 @@ import org.jvnet.hk2.config.ObservableBean; import org.jvnet.hk2.config.UnprocessedChangeEvents; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.ManagedJobConfig; - -import jakarta.inject.Inject; +import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static java.util.logging.Level.FINE; /** * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobCreatorService.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobCreatorService.java index a6fbe05ac7e..d7d80cccc4e 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobCreatorService.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobCreatorService.java @@ -16,6 +16,8 @@ package com.sun.enterprise.v3.admin; +import jakarta.inject.Inject; + import javax.security.auth.Subject; import org.glassfish.api.admin.Job; @@ -24,8 +26,6 @@ import org.glassfish.api.admin.ServerEnvironment; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; - /** * This service implements the JobCreator and is used for creating Jobs * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobFileScanner.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobFileScanner.java index 26dfac1fe5f..268d57c6e1c 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobFileScanner.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobFileScanner.java @@ -16,6 +16,9 @@ package com.sun.enterprise.v3.admin; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import java.io.File; import java.util.Collection; import java.util.HashSet; @@ -26,9 +29,6 @@ import org.glassfish.hk2.api.ServiceLocator; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import jakarta.inject.Singleton; - /** * This service will scan for all jobs.xml * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobManagerService.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobManagerService.java index 2a123f4a112..b9bc02cc1e6 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobManagerService.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobManagerService.java @@ -17,6 +17,23 @@ package com.sun.enterprise.v3.admin; +import com.sun.enterprise.admin.event.AdminCommandEventBrokerImpl; +import com.sun.enterprise.admin.remote.RestPayloadImpl; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.ManagedJobConfig; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.StringUtils; +import com.sun.enterprise.util.SystemPropertyConstants; +import com.sun.enterprise.v3.admin.CheckpointHelper.CheckpointFilename; +import com.sun.enterprise.v3.server.ExecutorServiceFactory; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; + import java.io.File; import java.io.FilenameFilter; import java.io.IOException; @@ -53,23 +70,6 @@ import org.glassfish.kernel.KernelLoggerInfo; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.admin.event.AdminCommandEventBrokerImpl; -import com.sun.enterprise.admin.remote.RestPayloadImpl; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.ManagedJobConfig; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.StringUtils; -import com.sun.enterprise.util.SystemPropertyConstants; -import com.sun.enterprise.v3.admin.CheckpointHelper.CheckpointFilename; -import com.sun.enterprise.v3.server.ExecutorServiceFactory; - -import jakarta.inject.Inject; -import jakarta.inject.Singleton; -import jakarta.xml.bind.JAXBContext; -import jakarta.xml.bind.JAXBException; -import jakarta.xml.bind.Marshaller; -import jakarta.xml.bind.Unmarshaller; - /** * This is the implementation for the JobManagerService The JobManager is responsible for *

    diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobPersistenceService.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobPersistenceService.java index a94a618001d..feb95376303 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobPersistenceService.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobPersistenceService.java @@ -16,6 +16,14 @@ package com.sun.enterprise.v3.admin; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; + import java.io.File; import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; @@ -26,14 +34,6 @@ import org.glassfish.kernel.KernelLoggerInfo; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.util.LocalStringManagerImpl; - -import jakarta.inject.Inject; -import jakarta.xml.bind.JAXBContext; -import jakarta.xml.bind.JAXBException; -import jakarta.xml.bind.Marshaller; -import jakarta.xml.bind.Unmarshaller; - /** * This service persists information for managed jobs to the file * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListCommand.java index c85e720499d..cdfaac3aea1 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListCommand.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListCommand.java @@ -16,7 +16,11 @@ package com.sun.enterprise.v3.admin; -import static com.sun.enterprise.admin.util.ClusterOperationUtil.replicateCommand; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.v3.common.PropsFileActionReporter; + +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.Collection; @@ -45,11 +49,7 @@ import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.Dom; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.Server; -import com.sun.enterprise.v3.common.PropsFileActionReporter; - -import jakarta.inject.Inject; +import static com.sun.enterprise.admin.util.ClusterOperationUtil.replicateCommand; /** * User: Jerome Dochez Date: Jul 12, 2008 Time: 1:27:53 AM diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListCommandDescriptorsCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListCommandDescriptorsCommand.java index 156fdcc56ef..934df077b74 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListCommandDescriptorsCommand.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListCommandDescriptorsCommand.java @@ -16,6 +16,10 @@ package com.sun.enterprise.v3.admin; +import com.sun.enterprise.universal.collections.ManifestUtils; + +import jakarta.inject.Inject; + import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Collections; @@ -33,10 +37,6 @@ import org.glassfish.hk2.api.ServiceLocator; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.universal.collections.ManifestUtils; - -import jakarta.inject.Inject; - /** * Create data structures that describe the command. * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListCommandsCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListCommandsCommand.java index 3af5447f5c8..48ae85eb709 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListCommandsCommand.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListCommandsCommand.java @@ -16,6 +16,11 @@ package com.sun.enterprise.v3.admin; +import com.sun.enterprise.config.serverbeans.Domain; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -33,11 +38,6 @@ import org.glassfish.hk2.api.ServiceLocator; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.Domain; - -import jakarta.inject.Inject; -import jakarta.inject.Singleton; - /** * Simple admin command to list all existing commands. * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListContainersCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListContainersCommand.java index 040f6c72b2a..269458c11b3 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListContainersCommand.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListContainersCommand.java @@ -16,6 +16,17 @@ package com.sun.enterprise.v3.admin; +import com.sun.enterprise.config.serverbeans.Application; +import com.sun.enterprise.config.serverbeans.Applications; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Engine; +import com.sun.enterprise.module.HK2Module; +import com.sun.enterprise.module.ModulesRegistry; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.admin.AccessRequired; @@ -30,17 +41,6 @@ import org.glassfish.internal.data.EngineInfo; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.Application; -import com.sun.enterprise.config.serverbeans.Applications; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.Engine; -import com.sun.enterprise.module.HK2Module; -import com.sun.enterprise.module.ModulesRegistry; -import com.sun.enterprise.util.LocalStringManagerImpl; - -import jakarta.inject.Inject; -import jakarta.inject.Singleton; - /** * This admin command list the containers currentely running within that Glassfish instance */ diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListModulesCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListModulesCommand.java index cc05030d5bb..3b4f188e094 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListModulesCommand.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListModulesCommand.java @@ -16,6 +16,14 @@ package com.sun.enterprise.v3.admin; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.module.HK2Module; +import com.sun.enterprise.module.ModuleState; +import com.sun.enterprise.module.ModulesRegistry; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.admin.AccessRequired; @@ -26,14 +34,6 @@ import org.glassfish.api.admin.RestEndpoints; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.module.HK2Module; -import com.sun.enterprise.module.ModuleState; -import com.sun.enterprise.module.ModulesRegistry; - -import jakarta.inject.Inject; -import jakarta.inject.Singleton; - /** * List the modules available to this instance and their status */ diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListSystemProperties.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListSystemProperties.java index 30a07d2620c..d35e0849548 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListSystemProperties.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/ListSystemProperties.java @@ -16,6 +16,14 @@ package com.sun.enterprise.v3.admin; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.SystemProperty; +import com.sun.enterprise.config.serverbeans.SystemPropertyBag; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -37,14 +45,6 @@ import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.SystemProperty; -import com.sun.enterprise.config.serverbeans.SystemPropertyBag; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; - -import jakarta.inject.Inject; - /** * List System Properties Command * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/LocalPasswordImpl.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/LocalPasswordImpl.java index c5ee960b2a5..02b883ed554 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/LocalPasswordImpl.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/LocalPasswordImpl.java @@ -16,6 +16,8 @@ package com.sun.enterprise.v3.admin; +import jakarta.inject.Inject; + import java.io.File; import java.io.IOException; import java.io.PrintWriter; @@ -31,8 +33,6 @@ import org.glassfish.kernel.KernelLoggerInfo; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; - /** * Manage a local password, which is a cryptographically secure random number stored in a file with permissions that * only allow the owner to read it. A new local password is generated each time the server starts. The asadmin client diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/LocationsCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/LocationsCommand.java index 4aad0c5953a..66827b77f08 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/LocationsCommand.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/LocationsCommand.java @@ -17,7 +17,11 @@ package com.sun.enterprise.v3.admin; -import static org.glassfish.api.ActionReport.ExitCode.SUCCESS; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.glassfish.bootstrap.StartupContextUtil; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.lang.management.ManagementFactory; import java.lang.management.RuntimeMXBean; @@ -34,11 +38,7 @@ import org.glassfish.server.ServerEnvironmentImpl; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.glassfish.bootstrap.StartupContextUtil; - -import jakarta.inject.Inject; -import jakarta.inject.Singleton; +import static org.glassfish.api.ActionReport.ExitCode.SUCCESS; /** * Locations command to indicate where this server is installed. diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/MbeanService.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/MbeanService.java index ba4775f7fb0..85d69dc77ca 100755 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/MbeanService.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/MbeanService.java @@ -16,6 +16,11 @@ package com.sun.enterprise.v3.admin; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; + +import jakarta.inject.Inject; + import java.util.ArrayList; import java.util.List; @@ -30,11 +35,6 @@ import org.glassfish.internal.api.Target; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.Server; - -import jakarta.inject.Inject; - @Service @RunLevel(mode = RunLevel.RUNLEVEL_MODE_NON_VALIDATING, value = StartupRunLevel.VAL) public class MbeanService { diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/MonitoringReporter.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/MonitoringReporter.java index 7a74be01388..58f919c7105 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/MonitoringReporter.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/MonitoringReporter.java @@ -16,11 +16,15 @@ package com.sun.enterprise.v3.admin; -import static com.sun.enterprise.util.StringUtils.ok; -import static com.sun.enterprise.util.SystemPropertyConstants.MONDOT; -import static com.sun.enterprise.util.SystemPropertyConstants.SLASH; -import static org.glassfish.api.ActionReport.ExitCode.FAILURE; -import static org.glassfish.api.ActionReport.ExitCode.SUCCESS; +import com.sun.enterprise.admin.util.ClusterOperationUtil; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.util.StringUtils; +import com.sun.enterprise.v3.common.ActionReporter; +import com.sun.enterprise.v3.common.PlainTextActionReporter; +import com.sun.enterprise.v3.common.PropsFileActionReporter; + +import jakarta.inject.Inject; import java.io.ByteArrayOutputStream; import java.lang.reflect.Proxy; @@ -54,15 +58,11 @@ import org.jvnet.hk2.annotations.Optional; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.admin.util.ClusterOperationUtil; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.Server; -import com.sun.enterprise.util.StringUtils; -import com.sun.enterprise.v3.common.ActionReporter; -import com.sun.enterprise.v3.common.PlainTextActionReporter; -import com.sun.enterprise.v3.common.PropsFileActionReporter; - -import jakarta.inject.Inject; +import static com.sun.enterprise.util.StringUtils.ok; +import static com.sun.enterprise.util.SystemPropertyConstants.MONDOT; +import static com.sun.enterprise.util.SystemPropertyConstants.SLASH; +import static org.glassfish.api.ActionReport.ExitCode.FAILURE; +import static org.glassfish.api.ActionReport.ExitCode.SUCCESS; /** * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/RestartDomainCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/RestartDomainCommand.java index dbc60179565..ca80180b36f 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/RestartDomainCommand.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/RestartDomainCommand.java @@ -17,6 +17,11 @@ package com.sun.enterprise.v3.admin; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.module.ModulesRegistry; + +import jakarta.inject.Inject; + import org.glassfish.api.Async; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -29,11 +34,6 @@ import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.module.ModulesRegistry; - -import jakarta.inject.Inject; - /** * For non-verbose mode: Stop this server, spawn a new JVM that will wait for this JVM to die. The new JVM then starts * the server again. diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/RestartServer.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/RestartServer.java index 3132d4d1a81..729f540ce70 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/RestartServer.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/RestartServer.java @@ -17,14 +17,6 @@ package com.sun.enterprise.v3.admin; -import java.io.IOException; -import java.util.Properties; -import java.util.logging.Logger; - -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.embeddable.GlassFish; -import org.glassfish.internal.api.Globals; - import com.sun.enterprise.module.ModulesRegistry; import com.sun.enterprise.module.bootstrap.StartupContext; import com.sun.enterprise.universal.i18n.LocalStringsImpl; @@ -34,6 +26,14 @@ import jakarta.inject.Inject; import jakarta.inject.Provider; +import java.io.IOException; +import java.util.Properties; +import java.util.logging.Logger; + +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.embeddable.GlassFish; +import org.glassfish.internal.api.Globals; + /** * For non-verbose mode: Stop this server, spawn a new JVM that will wait for this JVM to die. The new JVM then starts * the server again. diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/SetCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/SetCommand.java index 5e6158c4f6a..a2b83f361ea 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/SetCommand.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/SetCommand.java @@ -17,6 +17,15 @@ package com.sun.enterprise.v3.admin; +import com.sun.enterprise.admin.util.ClusterOperationUtil; +import com.sun.enterprise.config.modularity.ConfigModularityUtils; +import com.sun.enterprise.config.modularity.GetSetModularityHelper; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + import java.beans.PropertyVetoException; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -61,15 +70,6 @@ import org.jvnet.hk2.config.tiger.Types; import org.jvnet.hk2.config.types.Property; -import com.sun.enterprise.admin.util.ClusterOperationUtil; -import com.sun.enterprise.config.modularity.ConfigModularityUtils; -import com.sun.enterprise.config.modularity.GetSetModularityHelper; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.Server; -import com.sun.enterprise.util.LocalStringManagerImpl; - -import jakarta.inject.Inject; - /** * User: Jerome Dochez Date: Jul 11, 2008 Time: 4:39:05 AM */ diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/StopDomainCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/StopDomainCommand.java index aa5ca7033c6..305e5c8dd65 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/StopDomainCommand.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/StopDomainCommand.java @@ -17,6 +17,10 @@ package com.sun.enterprise.v3.admin; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + import org.glassfish.api.Async; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -31,10 +35,6 @@ import org.glassfish.hk2.api.ServiceLocator; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.util.LocalStringManagerImpl; - -import jakarta.inject.Inject; - /** * AdminCommand to stop the domain execution which mean shuting down the application server. * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/SupplementalCommandExecutorImpl.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/SupplementalCommandExecutorImpl.java index 81ad0c102c7..65bdd2c712d 100755 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/SupplementalCommandExecutorImpl.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/SupplementalCommandExecutorImpl.java @@ -16,11 +16,9 @@ package com.sun.enterprise.v3.admin; -import static com.sun.enterprise.util.Utility.isAnyNull; -import static com.sun.enterprise.util.Utility.isEmpty; -import static java.util.Collections.emptyList; -import static org.glassfish.api.admin.RuntimeType.DAS; -import static org.glassfish.api.admin.RuntimeType.INSTANCE; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; import java.io.File; import java.util.ArrayList; @@ -61,8 +59,11 @@ import org.jvnet.hk2.config.InjectionManager; import org.jvnet.hk2.config.InjectionResolver; -import com.sun.enterprise.util.LocalStringManagerImpl; -import jakarta.inject.Inject; +import static com.sun.enterprise.util.Utility.isAnyNull; +import static com.sun.enterprise.util.Utility.isEmpty; +import static java.util.Collections.emptyList; +import static org.glassfish.api.admin.RuntimeType.DAS; +import static org.glassfish.api.admin.RuntimeType.INSTANCE; /** * An executor that executes Supplemental commands means for current command diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/UptimeCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/UptimeCommand.java index 4e1b1af1c1b..1e5cc536f7e 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/UptimeCommand.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/UptimeCommand.java @@ -16,7 +16,11 @@ package com.sun.enterprise.v3.admin; -import static org.glassfish.api.ActionReport.ExitCode.SUCCESS; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.universal.Duration; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; import java.lang.management.ManagementFactory; import java.lang.management.RuntimeMXBean; @@ -33,11 +37,7 @@ import org.glassfish.server.ServerEnvironmentImpl; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.universal.Duration; -import com.sun.enterprise.util.LocalStringManagerImpl; - -import jakarta.inject.Inject; +import static org.glassfish.api.ActionReport.ExitCode.SUCCESS; /** * Uptime command Reports on how long the server has been running. diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/V2DottedNameSupport.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/V2DottedNameSupport.java index bfa43e79b48..43930e54991 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/V2DottedNameSupport.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/V2DottedNameSupport.java @@ -16,6 +16,11 @@ package com.sun.enterprise.v3.admin; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; + import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -32,11 +37,6 @@ import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.Dom; -import com.sun.enterprise.config.serverbeans.Cluster; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.Server; - /** * Utility class for all V2 style related dotted names commands. * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/VersionCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/VersionCommand.java index f9bda0fc9bd..80830986626 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/VersionCommand.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/VersionCommand.java @@ -17,6 +17,10 @@ package com.sun.enterprise.v3.admin; +import com.sun.appserv.server.util.Version; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.util.LocalStringManagerImpl; + import java.util.Properties; import org.glassfish.api.ActionReport; @@ -31,10 +35,6 @@ import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import com.sun.appserv.server.util.Version; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.util.LocalStringManagerImpl; - /** * Return the version and build number * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/adapter/InstallerThread.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/adapter/InstallerThread.java index 8e60b7e9164..e73449ac345 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/adapter/InstallerThread.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/adapter/InstallerThread.java @@ -27,9 +27,9 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.data.ApplicationInfo; import org.glassfish.internal.data.ApplicationRegistry; -import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.kernel.KernelLoggerInfo; import org.glassfish.server.ServerEnvironmentImpl; import org.jvnet.hk2.config.ConfigSupport; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/AttachCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/AttachCommand.java index deddfeb6623..728d393a6d1 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/AttachCommand.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/AttachCommand.java @@ -18,25 +18,32 @@ import com.sun.enterprise.admin.remote.AdminCommandStateImpl; import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.v3.admin.JobManagerService; + import jakarta.inject.Inject; -import com.sun.enterprise.v3.admin.JobManagerService; import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; +import org.glassfish.api.admin.AccessRequired; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.AdminCommandEventBroker; import org.glassfish.api.admin.AdminCommandEventBroker.AdminCommandListener; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.CommandProgress; +import org.glassfish.api.admin.Job; +import org.glassfish.api.admin.ManagedJob; import org.glassfish.api.admin.progress.JobInfo; import org.glassfish.hk2.api.PerLookup; - import org.glassfish.security.services.common.SubjectUtil; import org.jvnet.hk2.annotations.Service; +import static org.glassfish.api.admin.AdminCommandState.State.COMPLETED; import static org.glassfish.api.admin.AdminCommandState.State.PREPARED; +import static org.glassfish.api.admin.AdminCommandState.State.REVERTED; import static org.glassfish.api.admin.AdminCommandState.State.RUNNING; import static org.glassfish.api.admin.AdminCommandState.State.RUNNING_RETRYABLE; -import static org.glassfish.api.admin.AdminCommandState.State.COMPLETED; -import static org.glassfish.api.admin.AdminCommandState.State.REVERTED; /** diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/CLIUtil.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/CLIUtil.java index 3bdf0cd2065..ce3cb9989bb 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/CLIUtil.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/CLIUtil.java @@ -17,6 +17,7 @@ package com.sun.enterprise.v3.admin.commands; import com.sun.enterprise.config.serverbeans.Config; + import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.api.Target; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ClassReporter.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ClassReporter.java index 826a8841d62..bb65916e084 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ClassReporter.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ClassReporter.java @@ -17,9 +17,11 @@ package com.sun.enterprise.v3.admin.commands; import com.sun.enterprise.util.i18n.StringManager; + import java.lang.management.ClassLoadingMXBean; import java.lang.management.CompilationMXBean; import java.lang.management.ManagementFactory; + import javax.management.MBeanServerConnection; /** diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ConfigureManagedJobs.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ConfigureManagedJobs.java index 724d64fa93e..5fbe332b8fd 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ConfigureManagedJobs.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ConfigureManagedJobs.java @@ -18,6 +18,12 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.ManagedJobConfig; + +import jakarta.inject.Inject; + +import java.beans.PropertyVetoException; +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.Param; import org.glassfish.api.admin.AccessRequired; @@ -25,16 +31,12 @@ import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandLock; import org.glassfish.hk2.api.PerLookup; +import org.glassfish.kernel.KernelLoggerInfo; import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; -import java.beans.PropertyVetoException; -import java.util.logging.Logger; -import org.glassfish.kernel.KernelLoggerInfo; - /** diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/CreateThreadpool.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/CreateThreadpool.java index b67c23d205a..fce2a81d1f7 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/CreateThreadpool.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/CreateThreadpool.java @@ -16,31 +16,36 @@ package com.sun.enterprise.v3.admin.commands; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.ThreadPools; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.beans.PropertyVetoException; -import com.sun.enterprise.config.serverbeans.*; -import org.glassfish.api.admin.*; +import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.ActionReport; - +import org.glassfish.api.admin.AccessRequired; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.AdminCommandSecurity; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; -import org.jvnet.hk2.annotations.Service; - -import jakarta.inject.Inject; -import jakarta.inject.Named; - +import org.glassfish.grizzly.config.dom.ThreadPool; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import org.glassfish.grizzly.config.dom.ThreadPool; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; - /** * Create Thread Pool Command diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/DeleteJvmOptions.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/DeleteJvmOptions.java index 1dff29474ca..a92490e931a 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/DeleteJvmOptions.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/DeleteJvmOptions.java @@ -21,11 +21,14 @@ import com.sun.enterprise.config.serverbeans.JvmOptionBag; import com.sun.enterprise.util.SystemPropertyConstants; import com.sun.enterprise.util.i18n.StringManager; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.beans.PropertyVetoException; import java.util.ArrayList; import java.util.List; -import jakarta.inject.Inject; -import jakarta.inject.Named; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/DeleteThreadpool.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/DeleteThreadpool.java index 950ef729956..4f8241216b0 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/DeleteThreadpool.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/DeleteThreadpool.java @@ -16,34 +16,40 @@ package com.sun.enterprise.v3.admin.commands; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Configs; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.ThreadPools; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.beans.PropertyVetoException; import java.util.List; -import com.sun.enterprise.config.serverbeans.*; -import org.glassfish.api.admin.*; +import org.glassfish.api.ActionReport; +import org.glassfish.api.ActionReport.ExitCode; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.ActionReport; - +import org.glassfish.api.admin.AccessRequired; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.AdminCommandSecurity; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; -import org.jvnet.hk2.annotations.Service; - -import jakarta.inject.Inject; -import jakarta.inject.Named; - +import org.glassfish.grizzly.config.dom.NetworkListener; +import org.glassfish.grizzly.config.dom.ThreadPool; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import org.glassfish.grizzly.config.dom.ThreadPool; -import org.glassfish.grizzly.config.dom.NetworkListener; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.api.ActionReport.ExitCode; - @Service(name="delete-threadpool") @PerLookup @I18n("delete.threadpool") diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/GenerateJvmReportCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/GenerateJvmReportCommand.java index 20f2d2870d9..3cef509655e 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/GenerateJvmReportCommand.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/GenerateJvmReportCommand.java @@ -19,19 +19,29 @@ import com.sun.enterprise.config.serverbeans.Cluster; import com.sun.enterprise.config.serverbeans.JavaConfig; import com.sun.enterprise.config.serverbeans.Server; + +import java.lang.management.ManagementFactory; + +import javax.management.MBeanServer; + import org.glassfish.api.ActionReport; import org.glassfish.api.ActionReport.ExitCode; import org.glassfish.api.I18n; import org.glassfish.api.Param; - -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; - -import javax.management.MBeanServer; -import java.lang.management.ManagementFactory; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AccessRequired; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.FailurePolicy; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** Implements the front end for generating the JVM report. Sends back a String * to the asadmin console based on server's locale. diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/GetPayloadCommand.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/GetPayloadCommand.java index 9f777b4eb23..f34b96c4d75 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/GetPayloadCommand.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/GetPayloadCommand.java @@ -17,12 +17,19 @@ package com.sun.enterprise.v3.admin.commands; import com.sun.enterprise.util.LocalStringManagerImpl; + import jakarta.inject.Inject; + import org.glassfish.admin.payload.PayloadImpl; import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AccessRequired; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.Job; +import org.glassfish.api.admin.JobManager; import org.glassfish.api.admin.Payload.Outbound; import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/JVMInformationCollector.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/JVMInformationCollector.java index 1e924bda3fe..07ded15740d 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/JVMInformationCollector.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/JVMInformationCollector.java @@ -18,9 +18,15 @@ import com.sun.enterprise.util.SystemPropertyConstants; import com.sun.enterprise.util.i18n.StringManager; + import java.text.NumberFormat; import java.util.Hashtable; -import javax.management.*; + +import javax.management.MBeanServer; +import javax.management.MBeanServerConnection; +import javax.management.NotCompliantMBeanException; +import javax.management.ObjectName; +import javax.management.StandardMBean; /** */ diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ListJvmOptions.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ListJvmOptions.java index 358f7c42616..895c00bfe32 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ListJvmOptions.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ListJvmOptions.java @@ -21,13 +21,25 @@ import com.sun.enterprise.config.serverbeans.JavaConfig; import com.sun.enterprise.util.SystemPropertyConstants; import com.sun.enterprise.util.i18n.StringManager; -import java.util.List; + import jakarta.inject.Inject; import jakarta.inject.Named; + +import java.util.List; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AccessRequired; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.AdminCommandSecurity; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ListThreadpools.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ListThreadpools.java index 3501f5dac69..0313ffc4632 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ListThreadpools.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ListThreadpools.java @@ -17,32 +17,34 @@ package com.sun.enterprise.v3.admin.commands; -import java.util.List; - import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.ThreadPools; +import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import java.util.List; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; +import org.glassfish.api.admin.AccessRequired; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.AdminCommandSecurity; import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; -import jakarta.inject.Inject; -import jakarta.inject.Named; - - -import org.jvnet.hk2.annotations.Service; +import org.glassfish.grizzly.config.dom.ThreadPool; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; - -import org.glassfish.grizzly.config.dom.ThreadPool; -import com.sun.enterprise.util.LocalStringManagerImpl; -import org.glassfish.api.admin.*; +import org.jvnet.hk2.annotations.Service; /** * List Thread Pools command diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/LogReporter.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/LogReporter.java index 99d8d4902c9..1e73dead3f8 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/LogReporter.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/LogReporter.java @@ -17,6 +17,7 @@ package com.sun.enterprise.v3.admin.commands; import com.sun.enterprise.util.i18n.StringManager; + import java.util.Collections; import java.util.List; import java.util.logging.LogManager; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/MemoryReporter.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/MemoryReporter.java index fd3c9a57dc1..a0111e279db 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/MemoryReporter.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/MemoryReporter.java @@ -17,6 +17,7 @@ package com.sun.enterprise.v3.admin.commands; import com.sun.enterprise.util.i18n.StringManager; + import java.lang.management.GarbageCollectorMXBean; import java.lang.management.ManagementFactory; import java.lang.management.MemoryMXBean; @@ -27,6 +28,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; + import javax.management.MBeanServerConnection; import javax.management.ObjectName; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/StringBuilderNewLineAppender.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/StringBuilderNewLineAppender.java index 3d9c515c1ee..7a22b9da15a 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/StringBuilderNewLineAppender.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/StringBuilderNewLineAppender.java @@ -15,7 +15,8 @@ */ package com.sun.enterprise.v3.admin.commands; -import java.io.*; +import java.io.BufferedReader; +import java.io.StringReader; class StringBuilderNewLineAppender { diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/SummaryReporter.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/SummaryReporter.java index 037eead9444..90a554c4c87 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/SummaryReporter.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/SummaryReporter.java @@ -18,12 +18,14 @@ import com.sun.enterprise.util.StringUtils; import com.sun.enterprise.util.i18n.StringManager; + import java.lang.management.ManagementFactory; import java.lang.management.OperatingSystemMXBean; import java.lang.management.RuntimeMXBean; import java.lang.reflect.Method; import java.util.Map; import java.util.TreeMap; + import javax.management.MBeanServerConnection; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ThreadMonitor.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ThreadMonitor.java index 325c7e6897b..a77cad848a8 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ThreadMonitor.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ThreadMonitor.java @@ -23,6 +23,7 @@ package com.sun.enterprise.v3.admin.commands; import com.sun.enterprise.util.i18n.StringManager; + import java.lang.management.ManagementFactory; import java.lang.management.RuntimeMXBean; import java.lang.management.ThreadInfo; @@ -30,6 +31,7 @@ import java.lang.reflect.Method; import java.math.BigInteger; import java.util.Arrays; + import javax.management.MBeanServerConnection; /** diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/listener/CombinedJavaConfigSystemPropertyListener.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/listener/CombinedJavaConfigSystemPropertyListener.java index 4835e3c7323..43eb3a69bd3 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/listener/CombinedJavaConfigSystemPropertyListener.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/listener/CombinedJavaConfigSystemPropertyListener.java @@ -23,6 +23,9 @@ import com.sun.enterprise.config.serverbeans.Profiler; import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.config.serverbeans.SystemProperty; + +import jakarta.inject.Inject; + import java.beans.PropertyChangeEvent; import java.util.ArrayList; import java.util.Collection; @@ -33,7 +36,7 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.inject.Inject; + import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.TranslatedConfigView; import org.glassfish.hk2.api.PostConstruct; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/bootstrap/DerbyLifecycle.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/bootstrap/DerbyLifecycle.java index 2e34724a746..782a28cd4a1 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/bootstrap/DerbyLifecycle.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/bootstrap/DerbyLifecycle.java @@ -25,13 +25,13 @@ package com.sun.enterprise.v3.bootstrap; -import java.util.logging.Level; - import com.sun.enterprise.module.HK2Module; import com.sun.enterprise.module.LifecyclePolicy; import com.sun.enterprise.module.ModuleState; import com.sun.enterprise.module.common_impl.LogHelper; +import java.util.logging.Level; + /** * * @author dochez diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/common/ActionReporter.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/common/ActionReporter.java index 43614cb4c2c..f790281ef93 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/common/ActionReporter.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/common/ActionReporter.java @@ -17,6 +17,8 @@ package com.sun.enterprise.v3.common; +import com.sun.enterprise.util.LocalStringManagerImpl; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -29,8 +31,6 @@ import org.glassfish.api.ActionReport; -import com.sun.enterprise.util.LocalStringManagerImpl; - /** * Superclass for common ActionReport extension. * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/common/PlainTextActionReporter.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/common/PlainTextActionReporter.java index fccdc794389..a90143ab8a6 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/common/PlainTextActionReporter.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/common/PlainTextActionReporter.java @@ -16,7 +16,7 @@ package com.sun.enterprise.v3.common; -import static com.sun.enterprise.util.StringUtils.ok; +import com.sun.enterprise.util.LocalStringManagerImpl; import java.io.IOException; import java.io.OutputStream; @@ -28,7 +28,7 @@ import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.util.LocalStringManagerImpl; +import static com.sun.enterprise.util.StringUtils.ok; /** * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/common/PropsFileActionReporter.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/common/PropsFileActionReporter.java index a3327dd37aa..62bbca21071 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/common/PropsFileActionReporter.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/common/PropsFileActionReporter.java @@ -16,6 +16,8 @@ package com.sun.enterprise.v3.common; +import com.sun.enterprise.util.StringUtils; + import java.io.IOException; import java.io.OutputStream; import java.io.UnsupportedEncodingException; @@ -29,8 +31,6 @@ import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.util.StringUtils; - /** * Action reporter to a manifest file * @author Jerome Dochez diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/APIClassLoaderServiceImpl.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/APIClassLoaderServiceImpl.java index 24e37e16be6..69d91141b03 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/APIClassLoaderServiceImpl.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/APIClassLoaderServiceImpl.java @@ -17,11 +17,13 @@ package com.sun.enterprise.v3.server; -import static com.sun.enterprise.util.FelixPrettyPrinter.prettyPrintExceptionMessage; -import static com.sun.enterprise.util.SystemPropertyConstants.DEBUG_MODE_PROPERTY; -import static java.util.Collections.enumeration; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.SEVERE; +import com.sun.enterprise.module.HK2Module; +import com.sun.enterprise.module.ModuleLifecycleListener; +import com.sun.enterprise.module.ModuleState; +import com.sun.enterprise.module.ModulesRegistry; +import com.sun.enterprise.module.common_impl.CompositeEnumeration; + +import jakarta.inject.Inject; import java.io.IOException; import java.net.URL; @@ -39,13 +41,11 @@ import org.glassfish.kernel.KernelLoggerInfo; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.module.HK2Module; -import com.sun.enterprise.module.ModuleLifecycleListener; -import com.sun.enterprise.module.ModuleState; -import com.sun.enterprise.module.ModulesRegistry; -import com.sun.enterprise.module.common_impl.CompositeEnumeration; - -import jakarta.inject.Inject; +import static com.sun.enterprise.util.FelixPrettyPrinter.prettyPrintExceptionMessage; +import static com.sun.enterprise.util.SystemPropertyConstants.DEBUG_MODE_PROPERTY; +import static java.util.Collections.enumeration; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.SEVERE; /** * This class is responsible for creating a ClassLoader that can load classes exported by the system for public use. We diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/AppServerStartup.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/AppServerStartup.java index 459a9386519..344e46b395b 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/AppServerStartup.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/AppServerStartup.java @@ -17,13 +17,18 @@ package com.sun.enterprise.v3.server; -import static com.sun.enterprise.glassfish.bootstrap.Constants.NO_FORCED_SHUTDOWN; -import static java.util.concurrent.TimeUnit.SECONDS; -import static org.glassfish.api.admin.ProcessEnvironment.ProcessType.Embedded; -import static org.glassfish.api.admin.ProcessEnvironment.ProcessType.Server; -import static org.glassfish.api.admin.ServerEnvironment.Status.stopped; -import static org.glassfish.api.admin.ServerEnvironment.Status.stopping; -import static org.glassfish.api.event.EventTypes.SERVER_SHUTDOWN; +import com.sun.appserv.server.util.Version; +import com.sun.enterprise.module.HK2Module; +import com.sun.enterprise.module.ModuleState; +import com.sun.enterprise.module.ModulesRegistry; +import com.sun.enterprise.module.bootstrap.ModuleStartup; +import com.sun.enterprise.module.bootstrap.StartupContext; +import com.sun.enterprise.util.Result; +import com.sun.enterprise.v3.common.DoNothingActionReporter; + +import jakarta.inject.Inject; +import jakarta.inject.Provider; +import jakarta.inject.Singleton; import java.time.Duration; import java.time.Instant; @@ -73,18 +78,13 @@ import org.glassfish.server.ServerEnvironmentImpl; import org.jvnet.hk2.annotations.Service; -import com.sun.appserv.server.util.Version; -import com.sun.enterprise.module.HK2Module; -import com.sun.enterprise.module.ModuleState; -import com.sun.enterprise.module.ModulesRegistry; -import com.sun.enterprise.module.bootstrap.ModuleStartup; -import com.sun.enterprise.module.bootstrap.StartupContext; -import com.sun.enterprise.util.Result; -import com.sun.enterprise.v3.common.DoNothingActionReporter; - -import jakarta.inject.Inject; -import jakarta.inject.Provider; -import jakarta.inject.Singleton; +import static com.sun.enterprise.glassfish.bootstrap.Constants.NO_FORCED_SHUTDOWN; +import static java.util.concurrent.TimeUnit.SECONDS; +import static org.glassfish.api.admin.ProcessEnvironment.ProcessType.Embedded; +import static org.glassfish.api.admin.ProcessEnvironment.ProcessType.Server; +import static org.glassfish.api.admin.ServerEnvironment.Status.stopped; +import static org.glassfish.api.admin.ServerEnvironment.Status.stopping; +import static org.glassfish.api.event.EventTypes.SERVER_SHUTDOWN; /** * Main class for Glassfish startup This class spawns a non-daemon Thread when the start() is called. Having a diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationConfigListener.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationConfigListener.java index 9a0b0d0973f..1c50a840e28 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationConfigListener.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationConfigListener.java @@ -16,6 +16,19 @@ package com.sun.enterprise.v3.server; +import com.sun.enterprise.config.serverbeans.Application; +import com.sun.enterprise.config.serverbeans.ApplicationRef; +import com.sun.enterprise.config.serverbeans.Applications; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.config.serverbeans.ServerTags; +import com.sun.enterprise.module.bootstrap.StartupContext; +import com.sun.enterprise.v3.common.HTMLActionReporter; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.beans.PropertyChangeEvent; import java.util.Calendar; import java.util.List; @@ -38,19 +51,6 @@ import org.jvnet.hk2.config.Transactions; import org.jvnet.hk2.config.UnprocessedChangeEvents; -import com.sun.enterprise.config.serverbeans.Application; -import com.sun.enterprise.config.serverbeans.ApplicationRef; -import com.sun.enterprise.config.serverbeans.Applications; -import com.sun.enterprise.config.serverbeans.Cluster; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.Server; -import com.sun.enterprise.config.serverbeans.ServerTags; -import com.sun.enterprise.module.bootstrap.StartupContext; -import com.sun.enterprise.v3.common.HTMLActionReporter; - -import jakarta.inject.Inject; -import jakarta.inject.Named; - @Service @RunLevel(PostStartupRunLevel.VAL) public class ApplicationConfigListener implements TransactionListener, PostConstruct { diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ClassLoaderHierarchyImpl.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ClassLoaderHierarchyImpl.java index 5032d1c2a78..fb14528a0cd 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ClassLoaderHierarchyImpl.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ClassLoaderHierarchyImpl.java @@ -16,6 +16,17 @@ package com.sun.enterprise.v3.server; +import com.sun.enterprise.module.HK2Module; +import com.sun.enterprise.module.ManifestConstants; +import com.sun.enterprise.module.ModuleDefinition; +import com.sun.enterprise.module.ModulesRegistry; +import com.sun.enterprise.module.Repository; +import com.sun.enterprise.module.ResolveError; +import com.sun.enterprise.module.common_impl.DirectoryBasedRepository; +import com.sun.enterprise.module.common_impl.Tokenizer; + +import jakarta.inject.Inject; + import java.io.File; import java.io.IOException; import java.net.MalformedURLException; @@ -41,17 +52,6 @@ import org.jvnet.hk2.config.TranslationException; import org.jvnet.hk2.config.VariableResolver; -import com.sun.enterprise.module.HK2Module; -import com.sun.enterprise.module.ManifestConstants; -import com.sun.enterprise.module.ModuleDefinition; -import com.sun.enterprise.module.ModulesRegistry; -import com.sun.enterprise.module.Repository; -import com.sun.enterprise.module.ResolveError; -import com.sun.enterprise.module.common_impl.DirectoryBasedRepository; -import com.sun.enterprise.module.common_impl.Tokenizer; - -import jakarta.inject.Inject; - /** * @author Sanjeeb.Sahoo@Sun.COM diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/CompositeArchive.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/CompositeArchive.java index ec17592c8c2..f04c7d83621 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/CompositeArchive.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/CompositeArchive.java @@ -16,6 +16,8 @@ package com.sun.enterprise.v3.server; +import com.sun.enterprise.deploy.shared.AbstractReadableArchive; + import java.io.IOException; import java.io.InputStream; import java.net.URI; @@ -27,8 +29,6 @@ import org.glassfish.api.deployment.archive.CompositeHandler; import org.glassfish.api.deployment.archive.ReadableArchive; -import com.sun.enterprise.deploy.shared.AbstractReadableArchive; - /** * A composite archive is a readable archive that hides the sub archives. * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ContainerStarter.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ContainerStarter.java index 9503aaf499f..7e9b670de29 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ContainerStarter.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ContainerStarter.java @@ -17,8 +17,9 @@ package com.sun.enterprise.v3.server; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.SEVERE; +import com.sun.enterprise.module.HK2Module; + +import jakarta.inject.Inject; import java.io.FileNotFoundException; import java.io.IOException; @@ -37,9 +38,8 @@ import org.glassfish.server.ServerEnvironmentImpl; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.module.HK2Module; - -import jakarta.inject.Inject; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.SEVERE; /** * This class is responsible for starting containers. diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DomainCreationStartup.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DomainCreationStartup.java index 3bafb836f23..77036a22960 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DomainCreationStartup.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DomainCreationStartup.java @@ -17,8 +17,10 @@ package com.sun.enterprise.v3.server; -import static org.glassfish.api.admin.ServerEnvironment.Status.stopped; -import static org.glassfish.api.event.EventTypes.SERVER_SHUTDOWN; +import com.sun.enterprise.module.bootstrap.ModuleStartup; +import com.sun.enterprise.module.bootstrap.StartupContext; + +import jakarta.inject.Inject; import java.util.logging.Logger; @@ -27,10 +29,8 @@ import org.glassfish.server.ServerEnvironmentImpl; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.module.bootstrap.ModuleStartup; -import com.sun.enterprise.module.bootstrap.StartupContext; - -import jakarta.inject.Inject; +import static org.glassfish.api.admin.ServerEnvironment.Status.stopped; +import static org.glassfish.api.event.EventTypes.SERVER_SHUTDOWN; /** * Created by IntelliJ IDEA. diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DomainResolver.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DomainResolver.java index 7ee185f4513..6c699be0da9 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DomainResolver.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DomainResolver.java @@ -16,6 +16,8 @@ package com.sun.enterprise.v3.server; +import com.sun.enterprise.module.common_impl.LogHelper; + import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; @@ -25,8 +27,6 @@ import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; -import com.sun.enterprise.module.common_impl.LogHelper; - /** * DTD resolver used when parsing the domain.xml and resolve to local DTD copies * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DomainXmlPersistence.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DomainXmlPersistence.java index 88593100224..375776a8159 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DomainXmlPersistence.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DomainXmlPersistence.java @@ -16,6 +16,13 @@ package com.sun.enterprise.v3.server; +import com.sun.enterprise.config.modularity.ConfigModularityUtils; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.io.FileUtils; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import java.io.BufferedOutputStream; import java.io.File; import java.io.FileOutputStream; @@ -41,13 +48,6 @@ import org.jvnet.hk2.config.DomDocument; import org.jvnet.hk2.config.IndentingXMLStreamWriter; -import com.sun.enterprise.config.modularity.ConfigModularityUtils; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.io.FileUtils; - -import jakarta.inject.Inject; -import jakarta.inject.Singleton; - /** * domain.xml persistence. * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DynamicReloadService.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DynamicReloadService.java index a3b1b5f95c5..1b9abef99b8 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DynamicReloadService.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DynamicReloadService.java @@ -16,9 +16,10 @@ package com.sun.enterprise.v3.server; -import static java.util.Arrays.asList; -import static java.util.logging.Level.SEVERE; -import static org.glassfish.kernel.KernelLoggerInfo.exceptionDRS; +import com.sun.enterprise.config.serverbeans.Applications; +import com.sun.enterprise.config.serverbeans.DasConfig; + +import jakarta.inject.Inject; import java.beans.PropertyChangeEvent; import java.util.ArrayList; @@ -39,10 +40,9 @@ import org.jvnet.hk2.config.UnprocessedChangeEvent; import org.jvnet.hk2.config.UnprocessedChangeEvents; -import com.sun.enterprise.config.serverbeans.Applications; -import com.sun.enterprise.config.serverbeans.DasConfig; - -import jakarta.inject.Inject; +import static java.util.Arrays.asList; +import static java.util.logging.Level.SEVERE; +import static org.glassfish.kernel.KernelLoggerInfo.exceptionDRS; /** * A service wrapper around the dynamic reload processor. diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DynamicReloader.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DynamicReloader.java index c60d3159980..2791786bb8f 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DynamicReloader.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DynamicReloader.java @@ -17,6 +17,12 @@ package com.sun.enterprise.v3.server; +import com.sun.enterprise.config.serverbeans.Application; +import com.sun.enterprise.config.serverbeans.Applications; +import com.sun.enterprise.config.serverbeans.ServerTags; +import com.sun.enterprise.v3.admin.CommandRunnerImpl; +import com.sun.enterprise.v3.common.XMLActionReporter; + import java.io.File; import java.io.IOException; import java.net.URI; @@ -39,12 +45,6 @@ import org.glassfish.internal.api.InternalSystemAdministrator; import org.glassfish.kernel.KernelLoggerInfo; -import com.sun.enterprise.config.serverbeans.Application; -import com.sun.enterprise.config.serverbeans.Applications; -import com.sun.enterprise.config.serverbeans.ServerTags; -import com.sun.enterprise.v3.admin.CommandRunnerImpl; -import com.sun.enterprise.v3.common.XMLActionReporter; - /** * Triggers reloads of deployed applications depending on the presence of and * timestamp on a .reload file in the application's top-level directory. diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/LifecycleEventContextImpl.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/LifecycleEventContextImpl.java index 518f9df5ff7..dd99c8d02aa 100755 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/LifecycleEventContextImpl.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/LifecycleEventContextImpl.java @@ -16,6 +16,8 @@ package com.sun.enterprise.v3.server; +import com.sun.appserv.server.LifecycleEventContext; + import java.util.logging.Level; import java.util.logging.Logger; @@ -24,8 +26,6 @@ import org.glassfish.internal.api.ServerContext; import org.glassfish.kernel.KernelLoggerInfo; -import com.sun.appserv.server.LifecycleEventContext; - public class LifecycleEventContextImpl implements LifecycleEventContext { private ServerContext ctx; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/LifecycleListenerImpl.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/LifecycleListenerImpl.java index 8a58de0316b..ad364c4b8ab 100755 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/LifecycleListenerImpl.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/LifecycleListenerImpl.java @@ -16,13 +16,13 @@ package com.sun.enterprise.v3.server; -import java.util.Properties; - import com.sun.appserv.server.LifecycleEvent; import com.sun.appserv.server.LifecycleEventContext; import com.sun.appserv.server.LifecycleListener; import com.sun.appserv.server.ServerLifecycleException; +import java.util.Properties; + /** * LifecycleListenerImpl is a dummy implementation for the LifecycleListener interface. * This implementaion stubs out various lifecycle interface methods. diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/LifecycleModuleService.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/LifecycleModuleService.java index 977f62b6453..f0f65b027f6 100755 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/LifecycleModuleService.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/LifecycleModuleService.java @@ -17,6 +17,18 @@ package com.sun.enterprise.v3.server; +import com.sun.appserv.server.LifecycleListener; +import com.sun.appserv.server.ServerLifecycleException; +import com.sun.enterprise.config.serverbeans.Application; +import com.sun.enterprise.config.serverbeans.Applications; +import com.sun.enterprise.config.serverbeans.ConfigBeansUtilities; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.config.serverbeans.ServerTags; +import com.sun.enterprise.util.Result; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; @@ -39,18 +51,6 @@ import org.glassfish.internal.api.ServerContext; import org.jvnet.hk2.annotations.Service; -import com.sun.appserv.server.LifecycleListener; -import com.sun.appserv.server.ServerLifecycleException; -import com.sun.enterprise.config.serverbeans.Application; -import com.sun.enterprise.config.serverbeans.Applications; -import com.sun.enterprise.config.serverbeans.ConfigBeansUtilities; -import com.sun.enterprise.config.serverbeans.Server; -import com.sun.enterprise.config.serverbeans.ServerTags; -import com.sun.enterprise.util.Result; - -import jakarta.inject.Inject; -import jakarta.inject.Named; - /** * Support class to assist in firing LifecycleEvent notifications to * registered LifecycleListeners. diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ReadableArchiveScannerAdapter.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ReadableArchiveScannerAdapter.java index 920f1493ffb..764d2d5062b 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ReadableArchiveScannerAdapter.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ReadableArchiveScannerAdapter.java @@ -17,10 +17,6 @@ package com.sun.enterprise.v3.server; -import static java.util.logging.Level.SEVERE; -import static org.glassfish.kernel.KernelLoggerInfo.exceptionWhileParsing; -import static org.glassfish.kernel.KernelLoggerInfo.invalidInputStream; - import java.io.IOException; import java.io.InputStream; import java.net.URI; @@ -38,6 +34,10 @@ import org.glassfish.hk2.classmodel.reflect.util.AbstractAdapter; import org.glassfish.kernel.KernelLoggerInfo; +import static java.util.logging.Level.SEVERE; +import static org.glassfish.kernel.KernelLoggerInfo.exceptionWhileParsing; +import static org.glassfish.kernel.KernelLoggerInfo.invalidInputStream; + /** * ArchiveAdapter for DOL readable archive instances * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ServerContextImpl.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ServerContextImpl.java index 001bb49fe73..a1c12b8bc1f 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ServerContextImpl.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ServerContextImpl.java @@ -17,6 +17,12 @@ package com.sun.enterprise.v3.server; +import com.sun.enterprise.glassfish.bootstrap.StartupContextUtil; +import com.sun.enterprise.module.bootstrap.StartupContext; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import java.io.File; import java.util.Map; @@ -31,12 +37,6 @@ import org.glassfish.server.ServerEnvironmentImpl; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.glassfish.bootstrap.StartupContextUtil; -import com.sun.enterprise.module.bootstrap.StartupContext; - -import jakarta.inject.Inject; -import jakarta.inject.Singleton; - /** * This is the Server Context object. * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ServerLifecycleModule.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ServerLifecycleModule.java index 497a64a59aa..4e4d38f9885 100755 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ServerLifecycleModule.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ServerLifecycleModule.java @@ -17,6 +17,12 @@ package com.sun.enterprise.v3.server; +import com.sun.appserv.server.LifecycleEvent; +import com.sun.appserv.server.LifecycleEventContext; +import com.sun.appserv.server.LifecycleListener; +import com.sun.appserv.server.ServerLifecycleException; +import com.sun.enterprise.util.LocalStringManagerImpl; + import java.io.File; import java.net.URL; import java.security.AccessController; @@ -26,18 +32,12 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.glassfish.api.logging.LogHelper; import org.glassfish.common.util.GlassfishUrlClassLoader; import org.glassfish.internal.api.ServerContext; import org.glassfish.kernel.KernelLoggerInfo; import org.glassfish.loader.util.ASClassLoaderUtil; -import com.sun.appserv.server.LifecycleEvent; -import com.sun.appserv.server.LifecycleEventContext; -import com.sun.appserv.server.LifecycleListener; -import com.sun.appserv.server.ServerLifecycleException; -import com.sun.enterprise.util.LocalStringManagerImpl; -import org.glassfish.api.logging.LogHelper; - /** * @author Sridatta Viswanath */ diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/SnifferManagerImpl.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/SnifferManagerImpl.java index 3180f0e7f9d..2a287d2b24e 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/SnifferManagerImpl.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/SnifferManagerImpl.java @@ -17,6 +17,10 @@ package com.sun.enterprise.v3.server; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + import java.net.URI; import java.util.ArrayList; import java.util.Collection; @@ -37,10 +41,6 @@ import org.glassfish.internal.deployment.SnifferManager; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.util.LocalStringManagerImpl; - -import jakarta.inject.Inject; - /** * Provide convenience methods to deal with {@link Sniffer}s in the system. * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/SystemTasksImpl.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/SystemTasksImpl.java index 4a1aa9c5e09..3f73c85ecd5 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/SystemTasksImpl.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/SystemTasksImpl.java @@ -17,23 +17,6 @@ package com.sun.enterprise.v3.server; -import java.io.File; -import java.util.Collections; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.config.support.TranslatedConfigView; -import org.glassfish.hk2.api.PostConstruct; -import org.glassfish.hk2.runlevel.RunLevel; -import org.glassfish.internal.api.InitRunLevel; -import org.glassfish.kernel.KernelLoggerInfo; -import org.jvnet.hk2.annotations.Optional; -import org.jvnet.hk2.annotations.Service; - import com.sun.appserv.server.util.Version; import com.sun.enterprise.config.serverbeans.Cluster; import com.sun.enterprise.config.serverbeans.Config; @@ -51,6 +34,23 @@ import jakarta.inject.Inject; import jakarta.inject.Named; +import java.io.File; +import java.util.Collections; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.config.support.TranslatedConfigView; +import org.glassfish.hk2.api.PostConstruct; +import org.glassfish.hk2.runlevel.RunLevel; +import org.glassfish.internal.api.InitRunLevel; +import org.glassfish.kernel.KernelLoggerInfo; +import org.jvnet.hk2.annotations.Optional; +import org.jvnet.hk2.annotations.Service; + /** * Init run level service to take care of vm related tasks. * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/ADBAwareHttpHandler.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/ADBAwareHttpHandler.java index 80258eb3306..c467d098a3c 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/ADBAwareHttpHandler.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/ADBAwareHttpHandler.java @@ -23,6 +23,7 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; + import org.glassfish.grizzly.Grizzly; import org.glassfish.grizzly.http.Method; import org.glassfish.grizzly.http.server.Request; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/ContainerMapper.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/ContainerMapper.java index 6b5298310ec..226896bd5bd 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/ContainerMapper.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/ContainerMapper.java @@ -17,11 +17,6 @@ package com.sun.enterprise.v3.services.impl; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.WARNING; -import static org.glassfish.kernel.KernelLoggerInfo.exceptionMapper; -import static org.glassfish.kernel.KernelLoggerInfo.exceptionMapper2; - import java.io.CharConversionException; import java.io.IOException; import java.nio.ByteBuffer; @@ -50,6 +45,11 @@ import org.glassfish.internal.grizzly.ContextMapper; import org.glassfish.kernel.KernelLoggerInfo; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.WARNING; +import static org.glassfish.kernel.KernelLoggerInfo.exceptionMapper; +import static org.glassfish.kernel.KernelLoggerInfo.exceptionMapper2; + /** * Container's mapper which maps {@link ByteBuffer} bytes representation to an {@link HttpHandler}, * {@link ApplicationContainer} and ProtocolFilter chain. The mapping result is stored inside {@link MappingData} which diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/DynamicConfigListener.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/DynamicConfigListener.java index 2cb80991de6..2785fb65407 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/DynamicConfigListener.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/DynamicConfigListener.java @@ -16,6 +16,11 @@ package com.sun.enterprise.v3.services.impl; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.SystemProperty; +import com.sun.enterprise.config.serverbeans.VirtualServer; +import com.sun.enterprise.util.Result; + import java.beans.PropertyChangeEvent; import java.util.Arrays; import java.util.HashMap; @@ -46,11 +51,6 @@ import org.jvnet.hk2.config.NotProcessed; import org.jvnet.hk2.config.UnprocessedChangeEvents; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.SystemProperty; -import com.sun.enterprise.config.serverbeans.VirtualServer; -import com.sun.enterprise.util.Result; - /** * Grizzly dynamic configuration handler * diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/Endpoint.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/Endpoint.java index 79dce85f92b..5fdb33c15db 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/Endpoint.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/Endpoint.java @@ -18,6 +18,7 @@ import java.net.InetAddress; import java.util.Collection; + import org.glassfish.api.container.Adapter; import org.glassfish.api.deployment.ApplicationContainer; import org.glassfish.grizzly.http.server.HttpHandler; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/EndpointMapper.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/EndpointMapper.java index de28a16fb38..b5ca6f6b191 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/EndpointMapper.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/EndpointMapper.java @@ -17,8 +17,9 @@ package com.sun.enterprise.v3.services.impl; import java.util.Collection; -import org.glassfish.api.deployment.ApplicationContainer; + import org.glassfish.api.container.EndpointRegistrationException; +import org.glassfish.api.deployment.ApplicationContainer; /** * registration interface to use with the Mapper classes. diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/GrizzlyProxy.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/GrizzlyProxy.java index 80abf94c7fa..9a5d6013f18 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/GrizzlyProxy.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/GrizzlyProxy.java @@ -16,9 +16,7 @@ package com.sun.enterprise.v3.services.impl; -import org.glassfish.grizzly.config.dom.NetworkListener; -import org.glassfish.api.container.EndpointRegistrationException; -import org.glassfish.api.deployment.ApplicationContainer; +import com.sun.enterprise.util.Result; import java.io.IOException; import java.net.InetAddress; @@ -26,15 +24,18 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.concurrent.Callable; import java.util.concurrent.Future; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.util.Result; -import java.util.concurrent.Callable; + +import org.glassfish.api.container.EndpointRegistrationException; +import org.glassfish.api.deployment.ApplicationContainer; import org.glassfish.api.logging.LogHelper; import org.glassfish.grizzly.Grizzly; import org.glassfish.grizzly.config.GenericGrizzlyListener; import org.glassfish.grizzly.config.GrizzlyListener; +import org.glassfish.grizzly.config.dom.NetworkListener; import org.glassfish.grizzly.http.server.HttpHandler; import org.glassfish.grizzly.impl.FutureImpl; import org.glassfish.grizzly.utils.Futures; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/GrizzlyService.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/GrizzlyService.java index ff461b45312..d4e52c5e4f2 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/GrizzlyService.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/GrizzlyService.java @@ -17,14 +17,16 @@ package com.sun.enterprise.v3.services.impl; -import static java.util.Collections.newSetFromMap; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.INFO; -import static java.util.logging.Level.SEVERE; -import static java.util.logging.Level.WARNING; -import static org.glassfish.api.admin.ServerEnvironment.DEFAULT_INSTANCE_NAME; -import static org.glassfish.api.event.EventTypes.SERVER_READY; -import static org.glassfish.common.util.Constants.IMPORTANT_RUN_LEVEL_SERVICE; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.HttpService; +import com.sun.enterprise.config.serverbeans.SystemProperty; +import com.sun.enterprise.config.serverbeans.VirtualServer; +import com.sun.enterprise.util.Result; +import com.sun.enterprise.util.StringUtils; +import com.sun.enterprise.v3.services.impl.monitor.GrizzlyMonitoring; + +import jakarta.inject.Inject; +import jakarta.inject.Named; import java.io.IOException; import java.lang.reflect.InvocationHandler; @@ -82,16 +84,14 @@ import org.jvnet.hk2.config.ObservableBean; import org.jvnet.hk2.config.Transactions; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.HttpService; -import com.sun.enterprise.config.serverbeans.SystemProperty; -import com.sun.enterprise.config.serverbeans.VirtualServer; -import com.sun.enterprise.util.Result; -import com.sun.enterprise.util.StringUtils; -import com.sun.enterprise.v3.services.impl.monitor.GrizzlyMonitoring; - -import jakarta.inject.Inject; -import jakarta.inject.Named; +import static java.util.Collections.newSetFromMap; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.INFO; +import static java.util.logging.Level.SEVERE; +import static java.util.logging.Level.WARNING; +import static org.glassfish.api.admin.ServerEnvironment.DEFAULT_INSTANCE_NAME; +import static org.glassfish.api.event.EventTypes.SERVER_READY; +import static org.glassfish.common.util.Constants.IMPORTANT_RUN_LEVEL_SERVICE; /** * The Network Service is responsible for starting grizzly and register the top level proxy. It is also providing a diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/MapperUpdateListener.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/MapperUpdateListener.java index 1f69450e9d3..426fa1ad7ab 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/MapperUpdateListener.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/MapperUpdateListener.java @@ -17,6 +17,7 @@ package com.sun.enterprise.v3.services.impl; import com.sun.enterprise.config.serverbeans.HttpService; + import org.glassfish.grizzly.config.dom.NetworkListener; import org.glassfish.grizzly.http.server.util.Mapper; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/NetworkProxy.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/NetworkProxy.java index 23ee284f76d..b31d525e817 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/NetworkProxy.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/NetworkProxy.java @@ -17,12 +17,13 @@ package com.sun.enterprise.v3.services.impl; import com.sun.enterprise.util.Result; -import java.io.IOException; -import org.glassfish.grizzly.http.server.HttpHandler; +import java.io.IOException; import java.net.InetAddress; import java.util.concurrent.Future; +import org.glassfish.grizzly.http.server.HttpHandler; + /** * Generic interface used by the GrizzlyService to start the tcp/udp/tcl stack. * By default, we are starting Grizzly, but we might allow other framework to diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/ServiceInitializerListener.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/ServiceInitializerListener.java index 5a552f9eeac..044581a62a8 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/ServiceInitializerListener.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/ServiceInitializerListener.java @@ -17,8 +17,8 @@ package com.sun.enterprise.v3.services.impl; import java.util.logging.Logger; -import org.glassfish.grizzly.config.dom.NetworkListener; +import org.glassfish.grizzly.config.dom.NetworkListener; import org.glassfish.grizzly.config.dom.Protocol; import org.glassfish.grizzly.config.dom.ThreadPool; import org.glassfish.grizzly.config.dom.Transport; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/SnifferAdapter.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/SnifferAdapter.java index 7410bd6714f..f0e173b9d88 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/SnifferAdapter.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/SnifferAdapter.java @@ -17,10 +17,10 @@ package com.sun.enterprise.v3.services.impl; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.INFO; -import static java.util.logging.Level.SEVERE; -import static org.glassfish.kernel.KernelLoggerInfo.snifferAdapterContainerStarted; +import com.sun.enterprise.module.ModulesRegistry; +import com.sun.enterprise.v3.server.ContainerStarter; + +import jakarta.inject.Inject; import java.util.Collection; import java.util.logging.Logger; @@ -37,10 +37,10 @@ import org.glassfish.kernel.KernelLoggerInfo; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.module.ModulesRegistry; -import com.sun.enterprise.v3.server.ContainerStarter; - -import jakarta.inject.Inject; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.INFO; +import static java.util.logging.Level.SEVERE; +import static org.glassfish.kernel.KernelLoggerInfo.snifferAdapterContainerStarted; /** * These adapters are temporarily registered to the mapper to handle static pages request that a container would like to diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/FileCacheMonitor.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/FileCacheMonitor.java index 5826093b834..e4a7b122811 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/FileCacheMonitor.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/FileCacheMonitor.java @@ -17,6 +17,7 @@ package com.sun.enterprise.v3.services.impl.monitor; import com.sun.enterprise.v3.services.impl.monitor.stats.FileCacheStatsProvider; + import org.glassfish.grizzly.http.server.filecache.FileCache; import org.glassfish.grizzly.http.server.filecache.FileCacheEntry; import org.glassfish.grizzly.http.server.filecache.FileCacheProbe; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/GrizzlyMonitoring.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/GrizzlyMonitoring.java index 08760dad7e3..e735a8fb4a6 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/GrizzlyMonitoring.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/GrizzlyMonitoring.java @@ -28,8 +28,10 @@ import com.sun.enterprise.v3.services.impl.monitor.stats.KeepAliveStatsProviderGlobal; import com.sun.enterprise.v3.services.impl.monitor.stats.ThreadPoolStatsProvider; import com.sun.enterprise.v3.services.impl.monitor.stats.ThreadPoolStatsProviderGlobal; + import java.util.Map; import java.util.concurrent.ConcurrentHashMap; + import org.glassfish.external.probe.provider.PluginPoint; import org.glassfish.external.probe.provider.StatsProviderManager; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/KeepAliveMonitor.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/KeepAliveMonitor.java index b63b9c34343..68b6dc342f6 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/KeepAliveMonitor.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/KeepAliveMonitor.java @@ -17,7 +17,9 @@ package com.sun.enterprise.v3.services.impl.monitor; import com.sun.enterprise.v3.services.impl.monitor.stats.KeepAliveStatsProvider; + import java.io.IOException; + import org.glassfish.grizzly.Connection; import org.glassfish.grizzly.http.KeepAlive; import org.glassfish.grizzly.http.KeepAliveProbe; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/ThreadPoolMonitor.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/ThreadPoolMonitor.java index 02157784b7e..d6f911f298b 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/ThreadPoolMonitor.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/ThreadPoolMonitor.java @@ -18,6 +18,7 @@ import com.sun.enterprise.v3.services.impl.monitor.stats.ConnectionQueueStatsProvider; import com.sun.enterprise.v3.services.impl.monitor.stats.ThreadPoolStatsProvider; + import org.glassfish.grizzly.threadpool.AbstractThreadPool; import org.glassfish.grizzly.threadpool.ThreadPoolConfig; import org.glassfish.grizzly.threadpool.ThreadPoolProbe; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/stats/ConnectionQueueStatsProvider.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/stats/ConnectionQueueStatsProvider.java index a9234bbe47c..855c0860006 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/stats/ConnectionQueueStatsProvider.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/stats/ConnectionQueueStatsProvider.java @@ -19,6 +19,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; + import org.glassfish.external.probe.provider.annotations.ProbeListener; import org.glassfish.external.probe.provider.annotations.ProbeParam; import org.glassfish.external.statistics.CountStatistic; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/stats/FileCacheStatsProvider.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/stats/FileCacheStatsProvider.java index efe3f7b99f9..cfeb625d125 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/stats/FileCacheStatsProvider.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/stats/FileCacheStatsProvider.java @@ -17,6 +17,7 @@ package com.sun.enterprise.v3.services.impl.monitor.stats; import java.util.concurrent.atomic.AtomicLong; + import org.glassfish.external.probe.provider.annotations.ProbeListener; import org.glassfish.external.probe.provider.annotations.ProbeParam; import org.glassfish.external.statistics.CountStatistic; diff --git a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/FileMonitoringImpl.java b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/FileMonitoringImpl.java index 7300fabc5e3..fce3dcdadcf 100644 --- a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/FileMonitoringImpl.java +++ b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/FileMonitoringImpl.java @@ -17,20 +17,26 @@ package org.glassfish.kernel; -import org.glassfish.api.event.EventTypes; -import org.glassfish.api.event.Events; -import org.jvnet.hk2.annotations.Service; import jakarta.inject.Inject; -import org.glassfish.hk2.api.PostConstruct; -import org.glassfish.api.admin.FileMonitoring; import java.io.File; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; +import org.glassfish.api.admin.FileMonitoring; +import org.glassfish.api.event.EventTypes; +import org.glassfish.api.event.Events; +import org.glassfish.hk2.api.PostConstruct; +import org.jvnet.hk2.annotations.Service; + /** * @author Jerome Dochez */ diff --git a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/config/DefaultConfigParser.java b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/config/DefaultConfigParser.java index 091052338aa..d7022725b1d 100644 --- a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/config/DefaultConfigParser.java +++ b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/config/DefaultConfigParser.java @@ -17,14 +17,18 @@ package org.glassfish.kernel.config; import com.sun.enterprise.config.serverbeans.Config; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.beans.PropertyVetoException; import java.io.IOException; import java.net.URL; import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.inject.Inject; -import jakarta.inject.Named; + import javax.xml.stream.XMLStreamReader; + import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.api.admin.config.ConfigParser; import org.glassfish.api.admin.config.Container; diff --git a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedAdminCtrImpl.java b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedAdminCtrImpl.java index 8535e22e78f..477c96ea850 100644 --- a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedAdminCtrImpl.java +++ b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedAdminCtrImpl.java @@ -16,22 +16,24 @@ package org.glassfish.kernel.embedded; -import org.jvnet.hk2.annotations.Service; +import com.sun.enterprise.v3.common.PlainTextActionReporter; + import jakarta.inject.Inject; + +import java.util.ArrayList; +import java.util.List; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.admin.CommandRunner; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.container.Sniffer; +import org.glassfish.internal.api.InternalSystemAdministrator; import org.glassfish.internal.embedded.LifecycleException; import org.glassfish.internal.embedded.Port; import org.glassfish.internal.embedded.admin.CommandExecution; import org.glassfish.internal.embedded.admin.CommandParameters; import org.glassfish.internal.embedded.admin.EmbeddedAdminContainer; -import org.glassfish.api.container.Sniffer; -import org.glassfish.api.admin.CommandRunner; -import org.glassfish.api.admin.ParameterMap; -import org.glassfish.api.ActionReport; - -import java.util.List; -import java.util.ArrayList; -import com.sun.enterprise.v3.common.PlainTextActionReporter; -import org.glassfish.internal.api.InternalSystemAdministrator; +import org.jvnet.hk2.annotations.Service; /** * Implementation of the embedded command execution diff --git a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedDomainPersistence.java b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedDomainPersistence.java index 3d78becf593..2e1f7f89b9d 100644 --- a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedDomainPersistence.java +++ b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedDomainPersistence.java @@ -19,8 +19,8 @@ import com.sun.enterprise.module.bootstrap.StartupContext; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.v3.server.DomainXmlPersistence; + import jakarta.inject.Inject; -import org.jvnet.hk2.config.DomDocument; import java.io.File; import java.io.IOException; @@ -28,6 +28,8 @@ import java.net.URISyntaxException; import java.util.logging.Level; +import org.jvnet.hk2.config.DomDocument; + /** * Configuration file persistence handler for embedded * diff --git a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedDomainXml.java b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedDomainXml.java index 657a9e53d91..96a863f919e 100644 --- a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedDomainXml.java +++ b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedDomainXml.java @@ -20,8 +20,6 @@ import com.sun.enterprise.module.bootstrap.StartupContext; import com.sun.enterprise.v3.server.GFDomainXml; -import org.glassfish.embeddable.GlassFishProperties; -import org.glassfish.server.ServerEnvironmentImpl; import jakarta.inject.Inject; import java.io.File; @@ -29,6 +27,9 @@ import java.net.URI; import java.net.URL; +import org.glassfish.embeddable.GlassFishProperties; +import org.glassfish.server.ServerEnvironmentImpl; + /** * Embedded domain.xml, can use externally pointed domain.xml * diff --git a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/PortImpl.java b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/PortImpl.java index a52d5934347..374feb0ee3a 100644 --- a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/PortImpl.java +++ b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/PortImpl.java @@ -16,27 +16,30 @@ package org.glassfish.kernel.embedded; +import com.sun.enterprise.config.serverbeans.HttpService; +import com.sun.enterprise.config.serverbeans.VirtualServer; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.beans.PropertyVetoException; import java.util.List; -import com.sun.enterprise.config.serverbeans.HttpService; -import com.sun.enterprise.config.serverbeans.VirtualServer; +import org.glassfish.api.ActionReport; +import org.glassfish.api.admin.CommandRunner; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.grizzly.config.dom.NetworkConfig; import org.glassfish.grizzly.config.dom.NetworkListener; import org.glassfish.grizzly.config.dom.NetworkListeners; import org.glassfish.grizzly.config.dom.Protocol; import org.glassfish.grizzly.config.dom.Protocols; -import org.glassfish.api.ActionReport; -import org.glassfish.api.admin.CommandRunner; -import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.hk2.api.PerLookup; import org.glassfish.internal.embedded.Port; -import jakarta.inject.Inject; -import jakarta.inject.Named; - - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; -import org.jvnet.hk2.config.*; +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.ConfigCode; +import org.jvnet.hk2.config.ConfigSupport; +import org.jvnet.hk2.config.TransactionFailure; /** * Abstract to port creation and destruction diff --git a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/PortsImpl.java b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/PortsImpl.java index 82a0691d9b4..f33762147ea 100644 --- a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/PortsImpl.java +++ b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/PortsImpl.java @@ -16,20 +16,21 @@ package org.glassfish.kernel.embedded; -import org.jvnet.hk2.annotations.Service; import jakarta.inject.Inject; import jakarta.inject.Named; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.internal.embedded.Port; -import org.glassfish.internal.embedded.Ports; - import java.io.IOException; -import java.util.*; -import org.glassfish.api.admin.ServerEnvironment; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.grizzly.config.dom.NetworkConfig; import org.glassfish.grizzly.config.dom.NetworkListener; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.embedded.Port; +import org.glassfish.internal.embedded.Ports; +import org.jvnet.hk2.annotations.Service; /** * @author Jerome Dochez diff --git a/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/admin/CommandRunnerImplServiceTest.java b/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/admin/CommandRunnerImplServiceTest.java index 3c7e0ee83e3..7f44f44b4c4 100644 --- a/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/admin/CommandRunnerImplServiceTest.java +++ b/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/admin/CommandRunnerImplServiceTest.java @@ -17,6 +17,8 @@ package com.sun.enterprise.v3.admin; +import jakarta.inject.Inject; + import org.glassfish.api.ActionReport; import org.glassfish.api.ActionReport.ExitCode; import org.glassfish.api.admin.CommandRunner.CommandInvocation; @@ -28,8 +30,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import jakarta.inject.Inject; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.junit.jupiter.api.Assertions.assertAll; diff --git a/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/admin/ConfigAttributeSetTest.java b/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/admin/ConfigAttributeSetTest.java index ead5c33a831..334beb88084 100644 --- a/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/admin/ConfigAttributeSetTest.java +++ b/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/admin/ConfigAttributeSetTest.java @@ -18,7 +18,16 @@ import com.sun.enterprise.v3.common.PlainTextActionReporter; +import jakarta.inject.Inject; + import java.beans.PropertyChangeEvent; +import java.util.Arrays; +import java.util.List; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.stream.Collectors; import javax.security.auth.Subject; @@ -27,36 +36,28 @@ import org.glassfish.api.admin.ParameterMap; import org.glassfish.grizzly.config.dom.NetworkListener; import org.glassfish.grizzly.config.dom.NetworkListeners; +import org.glassfish.grizzly.config.dom.Protocol; +import org.glassfish.grizzly.config.dom.Protocols; +import org.glassfish.grizzly.config.dom.Ssl; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.main.core.kernel.test.KernelJUnitExtension; import org.glassfish.tests.utils.mock.MockGenerator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; import org.jvnet.hk2.config.ConfigListener; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.ObservableBean; import org.jvnet.hk2.config.Transactions; import org.jvnet.hk2.config.UnprocessedChangeEvents; -import jakarta.inject.Inject; -import java.util.Arrays; -import java.util.List; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; -import java.util.stream.Collectors; -import org.glassfish.grizzly.config.dom.Protocol; -import org.glassfish.grizzly.config.dom.Protocols; -import org.glassfish.grizzly.config.dom.Ssl; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.arrayWithSize; +import static org.hamcrest.Matchers.hasSize; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.CsvSource; /** * test the set command diff --git a/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/admin/CreateProfilerTest.java b/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/admin/CreateProfilerTest.java index cccf2ac05d9..c9e938d1f89 100644 --- a/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/admin/CreateProfilerTest.java +++ b/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/admin/CreateProfilerTest.java @@ -23,6 +23,8 @@ import com.sun.enterprise.v3.common.PlainTextActionReporter; import com.sun.logging.LogDomains; +import jakarta.inject.Inject; + import java.util.Map; import java.util.Map.Entry; import java.util.logging.Logger; @@ -44,8 +46,6 @@ import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; - import static org.glassfish.api.admin.ServerEnvironment.DEFAULT_INSTANCE_NAME; import static org.glassfish.hk2.utilities.BuilderHelper.createConstantDescriptor; import static org.glassfish.hk2.utilities.ServiceLocatorUtilities.addOneDescriptor; diff --git a/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/server/AppServerStartupTest.java b/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/server/AppServerStartupTest.java index 60eac83fe7a..4c44df38561 100644 --- a/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/server/AppServerStartupTest.java +++ b/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/server/AppServerStartupTest.java @@ -23,6 +23,10 @@ import com.sun.enterprise.module.single.StaticModulesRegistry; import com.sun.enterprise.util.Result; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; + import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -63,10 +67,6 @@ import org.junit.jupiter.api.Test; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import jakarta.inject.Named; -import jakarta.inject.Singleton; - import static java.util.Collections.singletonList; import static org.glassfish.api.admin.ServerEnvironment.Status.starting; import static org.glassfish.api.event.EventTypes.PREPARE_SHUTDOWN; diff --git a/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/services/impl/GrizzlyProxyTest.java b/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/services/impl/GrizzlyProxyTest.java index 152f1211c1d..8c19131cb23 100644 --- a/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/services/impl/GrizzlyProxyTest.java +++ b/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/services/impl/GrizzlyProxyTest.java @@ -16,15 +16,6 @@ package com.sun.enterprise.v3.services.impl; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.stringContainsInOrder; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertThrows; - import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; @@ -41,6 +32,15 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.stringContainsInOrder; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class GrizzlyProxyTest { private static final String LINE_SEP = System.getProperty("line.separator"); private static final String FILE_SEP = System.getProperty("file.separator"); diff --git a/nucleus/core/kernel/src/test/java/org/glassfish/main/core/kernel/test/example/AnotherPublicMethod.java b/nucleus/core/kernel/src/test/java/org/glassfish/main/core/kernel/test/example/AnotherPublicMethod.java index bd86cb92611..352eaaca76a 100644 --- a/nucleus/core/kernel/src/test/java/org/glassfish/main/core/kernel/test/example/AnotherPublicMethod.java +++ b/nucleus/core/kernel/src/test/java/org/glassfish/main/core/kernel/test/example/AnotherPublicMethod.java @@ -17,10 +17,10 @@ package org.glassfish.main.core.kernel.test.example; -import org.jvnet.hk2.annotations.Service; +import org.glassfish.api.ActionReport; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.ActionReport; +import org.jvnet.hk2.annotations.Service; /** * public command with no visibility annotation diff --git a/nucleus/core/kernel/src/test/java/org/glassfish/main/core/kernel/test/example/AuthorizationServiceMock.java b/nucleus/core/kernel/src/test/java/org/glassfish/main/core/kernel/test/example/AuthorizationServiceMock.java index ffad49944cf..5b144c8b433 100644 --- a/nucleus/core/kernel/src/test/java/org/glassfish/main/core/kernel/test/example/AuthorizationServiceMock.java +++ b/nucleus/core/kernel/src/test/java/org/glassfish/main/core/kernel/test/example/AuthorizationServiceMock.java @@ -28,9 +28,9 @@ import org.glassfish.security.services.api.authorization.AzAttributeResolver; import org.glassfish.security.services.api.authorization.AzResource; import org.glassfish.security.services.api.authorization.AzResult; -import org.glassfish.security.services.api.authorization.AzSubject; import org.glassfish.security.services.api.authorization.AzResult.Decision; import org.glassfish.security.services.api.authorization.AzResult.Status; +import org.glassfish.security.services.api.authorization.AzSubject; import org.glassfish.security.services.config.SecurityConfiguration; import org.glassfish.security.services.impl.authorization.AuthorizationServiceImpl; import org.glassfish.security.services.impl.authorization.AzActionImpl; diff --git a/nucleus/core/kernel/src/test/java/org/glassfish/tests/kernel/deployment/EventsTest.java b/nucleus/core/kernel/src/test/java/org/glassfish/tests/kernel/deployment/EventsTest.java index 4cf8a3fc2d1..e7354030591 100644 --- a/nucleus/core/kernel/src/test/java/org/glassfish/tests/kernel/deployment/EventsTest.java +++ b/nucleus/core/kernel/src/test/java/org/glassfish/tests/kernel/deployment/EventsTest.java @@ -19,6 +19,8 @@ import com.sun.enterprise.config.serverbeans.Server; +import jakarta.inject.Inject; + import java.io.File; import java.util.ArrayList; import java.util.List; @@ -45,7 +47,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.ExtendWith; -import jakarta.inject.Inject; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; diff --git a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/LoggerInfoMetadata.java b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/LoggerInfoMetadata.java index c3466ee27a4..bdb2aa6c8ed 100644 --- a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/LoggerInfoMetadata.java +++ b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/LoggerInfoMetadata.java @@ -16,8 +16,8 @@ package com.sun.enterprise.server.logging; -import java.util.Set; import java.util.Locale; +import java.util.Set; import org.jvnet.hk2.annotations.Contract; diff --git a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLogAttributes.java b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLogAttributes.java index 0fd0a44daec..058ba9c811c 100644 --- a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLogAttributes.java +++ b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLogAttributes.java @@ -16,6 +16,15 @@ package com.sun.enterprise.server.logging.commands; +import com.sun.common.util.logging.LoggingConfigImpl; +import com.sun.enterprise.config.serverbeans.Clusters; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Servers; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + import java.io.IOException; import java.util.ArrayList; import java.util.Collections; @@ -25,8 +34,6 @@ import java.util.Map; import java.util.Properties; -import jakarta.inject.Inject; - import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -41,13 +48,6 @@ import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import com.sun.common.util.logging.LoggingConfigImpl; -import com.sun.enterprise.config.serverbeans.Clusters; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.Servers; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; - /** * Created by IntelliJ IDEA. * User: cmott, naman mehta diff --git a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLoggerLevels.java b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLoggerLevels.java index a135efeab78..34de1563023 100644 --- a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLoggerLevels.java +++ b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLoggerLevels.java @@ -17,22 +17,40 @@ package com.sun.enterprise.server.logging.commands; import com.sun.common.util.logging.LoggingConfigImpl; -import com.sun.enterprise.config.serverbeans.*; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Clusters; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.config.serverbeans.Servers; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; -import jakarta.inject.Inject; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; - -import java.io.IOException; -import java.util.*; +import org.jvnet.hk2.annotations.Service; /** * Created by IntelliJ IDEA. diff --git a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLoggers.java b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLoggers.java index aac1d8c306c..a7b11229576 100644 --- a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLoggers.java +++ b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLoggers.java @@ -16,19 +16,24 @@ package com.sun.enterprise.server.logging.commands; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.server.logging.LoggerInfoMetadata; +import com.sun.enterprise.util.ColumnFormatter; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.util.ArrayList; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Properties; import java.util.Set; -import java.util.Locale; import java.util.TreeMap; import java.util.TreeSet; -import jakarta.inject.Inject; - import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -40,14 +45,8 @@ import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.RuntimeType; import org.glassfish.hk2.api.PerLookup; - -import com.sun.enterprise.server.logging.LoggerInfoMetadata; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.util.ColumnFormatter; -import com.sun.enterprise.util.LocalStringManagerImpl; - @ExecuteOn({RuntimeType.DAS}) @Service(name = "list-loggers") @PerLookup diff --git a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/LoadDefaultLogAttributes.java b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/LoadDefaultLogAttributes.java index 5e824636f96..1b3e0399da5 100644 --- a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/LoadDefaultLogAttributes.java +++ b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/LoadDefaultLogAttributes.java @@ -19,16 +19,27 @@ import com.sun.common.util.logging.LoggingConfigImpl; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.util.LocalStringManagerImpl; -import org.glassfish.api.ActionReport; -import org.glassfish.api.I18n; -import org.glassfish.api.admin.*; -import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; +import jakarta.inject.Inject; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.I18n; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; @Service(name = "_load-default-log-attributes") @PerLookup diff --git a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/LoadDefaultLogLevels.java b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/LoadDefaultLogLevels.java index be27cc3fa0e..e1651645770 100644 --- a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/LoadDefaultLogLevels.java +++ b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/LoadDefaultLogLevels.java @@ -19,17 +19,30 @@ import com.sun.common.util.logging.LoggingConfigImpl; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.util.LocalStringManagerImpl; -import org.glassfish.api.ActionReport; -import org.glassfish.api.I18n; -import org.glassfish.api.admin.*; -import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; +import jakarta.inject.Inject; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.I18n; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoint.OpType; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; @ExecuteOn({RuntimeType.DAS}) @Service(name = "_load-default-log-levels") diff --git a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/SetLogLevel.java b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/SetLogLevel.java index 0c908da702e..bfcdc1e8520 100644 --- a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/SetLogLevel.java +++ b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/SetLogLevel.java @@ -16,13 +16,18 @@ package com.sun.enterprise.server.logging.commands; +import com.sun.common.util.logging.LoggingConfigImpl; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + import java.io.IOException; import java.util.HashMap; import java.util.Map; import java.util.Properties; -import jakarta.inject.Inject; - import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -38,11 +43,6 @@ import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import com.sun.common.util.logging.LoggingConfigImpl; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; - /** * Created by IntelliJ IDEA. * User: cmott, naman mehta diff --git a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/diagnostics/MessageIdCatalog.java b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/diagnostics/MessageIdCatalog.java index 197c3117fcd..9a012f8b867 100644 --- a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/diagnostics/MessageIdCatalog.java +++ b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/diagnostics/MessageIdCatalog.java @@ -17,8 +17,8 @@ package com.sun.enterprise.server.logging.diagnostics; import java.util.ArrayList; -import java.util.ResourceBundle; import java.util.MissingResourceException; +import java.util.ResourceBundle; /** * Simple catalog class to locate Diagnostic Information based on From b4bcf881ad78a63a46a9f8467931b09d38817300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sat, 10 Aug 2024 22:35:24 +0200 Subject: [PATCH 07/40] Imports: admin modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../sun/enterprise/admin/AdminContext.java | 6 +- .../sun/enterprise/admin/UpgradeService.java | 27 ++++--- .../enterprise/admin/tests/UpgradeTest.java | 3 +- .../backup/BackupFilenameManager.java | 4 +- .../sun/enterprise/backup/BackupManager.java | 5 +- .../sun/enterprise/backup/BackupRequest.java | 4 +- .../backup/BackupRestoreManager.java | 3 +- .../enterprise/backup/DirectoryFilter.java | 3 +- .../sun/enterprise/backup/ListManager.java | 12 ++- .../sun/enterprise/backup/LoggerHelper.java | 5 +- .../sun/enterprise/backup/RestoreManager.java | 4 +- .../sun/enterprise/backup/StringHelper.java | 2 +- .../enterprise/backup/ZipFilenameFilter.java | 3 +- .../com/sun/enterprise/backup/ZipStorage.java | 8 +- .../enterprise/backup/util/BackupUtils.java | 2 +- .../admin/cli/optional/BackupCommands.java | 12 +-- .../cli/optional/BackupDomainCommand.java | 14 ++-- .../admin/cli/optional/DatabaseCommand.java | 14 ++-- .../admin/cli/optional/DerbyControl.java | 6 +- .../cli/optional/ListBackupsCommand.java | 12 +-- .../cli/optional/StartDatabaseCommand.java | 16 ++-- .../cli/optional/StopDatabaseCommand.java | 20 ++--- .../admin/cli/ArgumentTokenizer.java | 3 +- .../enterprise/admin/cli/CLIContainer.java | 5 +- .../com/sun/enterprise/admin/cli/CLIUtil.java | 30 ++++++- .../admin/cli/ClassPathBuilder.java | 2 +- .../enterprise/admin/cli/ExportCommand.java | 13 +-- .../sun/enterprise/admin/cli/HelpCommand.java | 19 +++-- .../admin/cli/ListCommandsCommand.java | 18 +++-- .../enterprise/admin/cli/LoginCommand.java | 9 ++- .../com/sun/enterprise/admin/cli/More.java | 8 +- .../admin/cli/MultimodeCommand.java | 29 ++++--- .../enterprise/admin/cli/UnsetCommand.java | 12 +-- .../cli/embeddable/CommandExecutorImpl.java | 14 ++-- .../admin/cli/remote/ClientCookieStore.java | 5 +- .../admin/cli/remote/DetachListener.java | 2 + .../cli/remote/ProgressStatusPrinter.java | 2 + .../admin/cli/remote/RemoteCLICommand.java | 1 + .../admin/cli/schemadoc/ClassDef.java | 8 +- .../admin/cli/schemadoc/Context.java | 4 +- .../cli/schemadoc/GenerateDomainSchema.java | 19 +++-- .../modularity/ConfigBeanInstaller.java | 12 +-- ...ModularityJustInTimeInjectionResolver.java | 7 +- .../ExtensionPatternInvocationImpl.java | 12 +-- .../modularity/GetSetModularityHelper.java | 6 +- .../annotation/CustomConfiguration.java | 1 + .../annotation/HasCustomizationTokens.java | 1 + .../AbstractConfigModularityCommand.java | 12 +-- .../command/CreateModuleConfigCommand.java | 28 ++++--- .../command/DeleteModuleConfigCommand.java | 27 ++++--- .../command/GetActiveConfigCommand.java | 27 ++++--- .../customization/ConfigBeanDefaultValue.java | 12 +-- .../parser/ConfigurationParser.java | 18 +++-- .../parser/ConfigurationPopulator.java | 17 ++-- .../parser/ModuleConfigurationLoader.java | 10 +-- .../config/serverbeans/AccessLog.java | 4 +- .../config/serverbeans/Application.java | 12 +-- .../config/serverbeans/ApplicationRef.java | 4 +- .../serverbeans/AvailabilityService.java | 2 +- .../config/serverbeans/Clusters.java | 2 +- .../serverbeans/ConfigBeansUtilities.java | 4 +- .../config/serverbeans/CopyConfig.java | 14 ++-- .../config/serverbeans/DasConfig.java | 4 +- .../config/serverbeans/DiagnosticService.java | 4 +- .../serverbeans/DomainExtensionResolver.java | 1 + .../enterprise/config/serverbeans/Engine.java | 2 +- .../config/serverbeans/FailureDetection.java | 2 +- .../config/serverbeans/HttpAccessLog.java | 2 +- .../config/serverbeans/JavaConfig.java | 4 +- .../config/serverbeans/JmxConnector.java | 2 +- .../config/serverbeans/ListenerConfig.java | 14 ++-- .../config/serverbeans/LogService.java | 4 +- .../config/serverbeans/ManagedJobConfig.java | 10 +-- .../enterprise/config/serverbeans/Mbean.java | 16 ++-- .../config/serverbeans/ModuleLogLevels.java | 2 +- .../config/serverbeans/MonitoringService.java | 2 +- .../enterprise/config/serverbeans/Node.java | 6 +- .../enterprise/config/serverbeans/Nodes.java | 8 +- .../config/serverbeans/ResourcePool.java | 2 +- .../serverbeans/ResourcePoolReference.java | 5 +- .../config/serverbeans/SecurityService.java | 2 +- .../config/serverbeans/Servers.java | 2 +- .../config/serverbeans/SshAuth.java | 2 +- .../config/serverbeans/SslClientConfig.java | 4 +- .../customvalidators/ConfigRefConstraint.java | 1 + .../customvalidators/ConfigRefValidator.java | 6 +- .../customvalidators/ContextRootCheck.java | 9 ++- .../ContextRootCheckValidator.java | 11 ++- .../FileRealmPropertyCheck.java | 12 +-- .../FileRealmPropertyCheckValidator.java | 2 + .../JDBCRealmPropertyCheck.java | 12 +-- .../JDBCRealmPropertyCheckValidator.java | 7 +- .../customvalidators/JavaClassName.java | 8 +- .../LDAPRealmPropertyCheck.java | 12 +-- .../LDAPRealmPropertyCheckValidator.java | 2 + .../NotDuplicateTargetName.java | 9 ++- .../NotDuplicateTargetNameValidator.java | 6 +- .../customvalidators/NotTargetKeyword.java | 9 ++- .../NotTargetKeywordValidator.java | 1 + .../customvalidators/ReferenceConstraint.java | 11 +-- .../customvalidators/ReferenceValidator.java | 8 +- .../ResourceNameConstraint.java | 1 + .../SolarisRealmPropertyCheck.java | 12 +-- .../SolarisRealmPropertyCheckValidator.java | 2 + .../config/util/ConfigApiLoggerInfo.java | 6 +- ...anceRegisterInstanceCommandParameters.java | 1 + .../config/util/PortBaseHelper.java | 29 ++++++- .../enterprise/config/util/PortConstants.java | 3 +- .../enterprise/config/util/PortManager.java | 2 +- .../sun/enterprise/config/util/PortUtils.java | 9 ++- .../enterprise/config/util/ServerHelper.java | 4 +- .../enterprise/config/util/ServerPorts.java | 6 +- .../BaseLegacyConfigurationUpgrade.java | 3 +- .../support/ConfigConfigBeanListener.java | 14 ++-- .../config/support/ConfigurationAccess.java | 4 +- .../support/ConfigurationPersistence.java | 7 +- .../org/glassfish/config/support/Create.java | 10 +-- .../config/support/CreationDecorator.java | 7 +- .../config/support/CrudResolver.java | 10 +-- .../config/support/DasReaderFilter.java | 3 +- .../config/support/DefaultConfigUpgrade.java | 62 +++++++++++++- .../org/glassfish/config/support/Delete.java | 8 +- .../config/support/DeletionDecorator.java | 7 +- .../glassfish/config/support/DomainXml.java | 5 +- .../config/support/DomainXmlPreParser.java | 20 ++++- .../config/support/GenericCreateCommand.java | 26 +++--- .../config/support/GenericDeleteCommand.java | 28 ++++--- .../support/GrizzlyConfigSchemaMigrator.java | 22 ++--- .../support/HttpServicePropertiesUpgrade.java | 12 +-- .../config/support/InstanceReaderFilter.java | 11 ++- .../config/support/IntrospectionUtils.java | 4 +- .../org/glassfish/config/support/Listing.java | 8 +- .../config/support/PropertyResolver.java | 4 +- .../config/support/ServerReaderFilter.java | 9 ++- .../config/support/SystemPropertyUpgrade.java | 26 ++++-- .../config/support/TargetBasedResolver.java | 10 ++- .../glassfish/config/support/TargetType.java | 6 +- .../config/support/TranslatedConfigView.java | 4 +- .../config/support/TypeAndNameResolver.java | 5 +- .../config/support/TypeResolver.java | 14 +++- .../modularity/tests/BasicModularityTest.java | 4 +- .../modularity/tests/ConfigExtensionOne.java | 4 +- .../tests/ConfigExtensionThree.java | 1 + .../modularity/tests/ConfigExtensionTwo.java | 4 +- .../modularity/tests/RankedConfigBean.java | 1 + .../RankedConfigBeanNewConfigBringer.java | 1 + .../tests/SimpleConfigExtension.java | 4 +- .../tests/SimpleExtensionTypeOne.java | 7 +- .../tests/SimpleExtensionTypeTwo.java | 7 +- .../configapi/tests/AddPropertyTest.java | 4 +- .../configapi/tests/ApplicationsTest.java | 4 +- .../configapi/tests/AttributeRemovalTest.java | 4 +- .../tests/CollectionsAccessTest.java | 4 +- .../configapi/tests/ConfigListenerTest.java | 4 +- .../configapi/tests/ConfigPersistence.java | 4 +- .../configapi/tests/DeepCopyTest.java | 4 +- .../configapi/tests/DefaultValueTest.java | 4 +- .../configapi/tests/DirectAccessTest.java | 7 +- .../configapi/tests/DomainTest.java | 4 +- .../tests/DuplicateKeyedElementTest.java | 4 +- .../configapi/tests/EnabledTest.java | 4 +- .../tests/GetElementTypeByNameTest.java | 4 +- .../configapi/tests/HttpListenerTest.java | 4 +- .../configapi/tests/HttpServiceTest.java | 4 +- .../configapi/tests/ModulesTest.java | 4 +- .../tests/ParentConfigListenerTest.java | 4 +- .../configapi/tests/ParentTest.java | 4 +- .../tests/PropertyChangeListenerTest.java | 4 +- .../configapi/tests/RawValueTest.java | 4 +- .../configapi/tests/Ssl2EnabledTest.java | 4 +- .../configapi/tests/SubTypesTest.java | 4 +- .../tests/TransactionListenerTest.java | 4 +- .../configapi/tests/TranslatedValuesTest.java | 5 +- .../tests/TranslatedViewCreationTest.java | 4 +- .../tests/UnprocessedEventsTest.java | 4 +- .../tests/VetoableChangeListenerTest.java | 4 +- .../concurrent/ConcurrentAccessTest.java | 4 +- .../tests/dvt/AccessLogAllDefaultsTest.java | 5 +- .../dvt/SecurityServiceDefaultsTest.java | 5 +- .../tests/example/HttpListenerContainer.java | 6 +- .../extensibility/ContainerExtensionTest.java | 4 +- .../typedlistener/TypedListenerTest.java | 4 +- .../validation/FieldsValidationTest.java | 6 +- .../ReferenceConstrainClusterTest.java | 7 +- .../validation/ReferenceConstrainTest.java | 7 +- .../admin/launcher/GFDomainLauncher.java | 6 +- .../admin/launcher/GFEmbeddedLauncher.java | 8 +- .../admin/launcher/GFInstanceLauncher.java | 4 +- .../admin/launcher/GFLauncherFactory.java | 4 +- .../admin/launcher/GFLauncherInfo.java | 14 ++-- .../launcher/GFLauncherNativeHelper.java | 12 +-- .../enterprise/admin/launcher/JavaConfig.java | 12 +-- .../enterprise/admin/launcher/JvmOptions.java | 6 +- .../enterprise/admin/launcher/Profiler.java | 10 +-- .../monitor/jndi/JndiNameLookupHelper.java | 18 +++-- .../management/support/SystemInfoData.java | 4 +- .../admin/monitor/FutureStatsProviders.java | 6 +- .../org/glassfish/admin/monitor/MLogger.java | 5 +- .../admin/monitor/MonitoringBootstrap.java | 81 ++++++++++--------- .../StatsProviderManagerDelegateImpl.java | 72 ++++++++++------- .../admin/monitor/StatsProviderRegistry.java | 12 ++- .../admin/monitor/StatsProviderUtil.java | 4 +- .../admin/monitor/cli/ListJndiEntries.java | 33 ++++---- .../glassfish/admin/monitor/cli/Monitor.java | 18 ++--- .../jvm/JVMClassLoadingStatsProvider.java | 1 + .../jvm/JVMCompilationStatsProvider.java | 5 +- .../admin/monitor/jvm/JVMGCStatsProvider.java | 3 +- .../monitor/jvm/JVMMemoryStatsProvider.java | 1 + .../admin/monitor/jvm/JVMOSStatsProvider.java | 3 +- .../monitor/jvm/JVMRuntimeStatsProvider.java | 3 +- .../jvm/JVMStatsProviderBootstrap.java | 5 +- .../jvm/JVMThreadInfoStatsProvider.java | 1 + .../jvm/JVMThreadSystemStatsProvider.java | 1 + .../jvm/ServerRuntimeStatsProvider.java | 1 + .../monitor/jvm/statistics/JVMStatsImpl.java | 29 +++---- .../datatree/factory/TreeNodeFactory.java | 3 +- .../datatree/impl/AbstractTreeNode.java | 21 +++-- .../datatree/impl/MethodInvokerImpl.java | 4 +- .../MonitoringRuntimeDataRegistryImpl.java | 7 +- .../flashlight/statistics/Average.java | 2 +- .../statistics/factory/AverageFactory.java | 2 +- .../statistics/factory/CounterFactory.java | 2 +- .../statistics/impl/AverageImpl.java | 4 +- .../statistics/impl/CounterImpl.java | 6 +- .../impl/TimeStatsAbstractImpl.java | 7 +- .../statistics/impl/TimeStatsMillisImpl.java | 3 +- .../statistics/impl/TimeStatsNanosImpl.java | 3 +- .../AbstractProxyRestAdapter.java | 7 +- .../admin/restconnector/Logging.java | 1 + .../ProxyRestCommandAdapter.java | 4 +- .../ProxyRestManagementAdapter.java | 9 ++- .../ProxyRestMonitoringAdapter.java | 9 ++- .../admin/restconnector/RestConfig.java | 1 - .../admin/rest/client/RestClientBase.java | 11 +-- .../admin/rest/client/RestResponse.java | 5 +- .../rest/client/utils/RestClientLogging.java | 1 + .../admin/rest/client/utils/Util.java | 1 + .../admin/rest/RestConfigChangeListener.java | 1 + .../org/glassfish/admin/rest/RestLogging.java | 1 + .../AdminJerseyServiceIteratorProvider.java | 1 + .../admin/rest/adapter/ExceptionFilter.java | 4 +- .../adapter/RestCommandResourceProvider.java | 11 ++- .../RestMonitoringResourceProvider.java | 6 +- .../rest/adapter/RestResourceProvider.java | 4 +- .../admin/rest/cli/GetGroupNamesCommand.java | 21 +++-- .../admin/rest/cli/GetTokensCommand.java | 15 +++- .../cli/IsAnonymousUserEnabledCommand.java | 9 ++- .../PredefinedAuthRealmClassNamesCommand.java | 11 +-- .../admin/rest/cli/SecurityUtil.java | 15 ++-- .../admin/rest/cli/SetRestConfig.java | 5 +- .../cli/SupportsUserManagementCommand.java | 11 +-- .../rest/cli/SynchronizeRealmFromConfig.java | 11 +-- .../composite/LegacyCompositeResource.java | 4 +- .../admin/rest/composite/Primitive.java | 9 ++- .../admin/rest/composite/Property.java | 1 + .../admin/rest/composite/RestCollection.java | 1 + .../rest/composite/RestModelExtension.java | 4 +- .../metadata/AttributeReference.java | 3 +- .../rest/composite/metadata/Confidential.java | 3 +- .../rest/composite/metadata/CreateOnly.java | 3 +- .../rest/composite/metadata/Default.java | 3 +- .../metadata/DefaultBeanReference.java | 3 +- .../rest/composite/metadata/HelpText.java | 3 +- .../rest/composite/metadata/Immutable.java | 3 +- .../rest/composite/metadata/LegalValues.java | 3 +- .../composite/metadata/ParamMetadata.java | 1 + .../rest/composite/metadata/ReadOnly.java | 3 +- .../metadata/RestMethodMetadata.java | 13 +-- .../metadata/RestResourceMetadata.java | 12 +-- .../admin/rest/composite/metadata/Units.java | 3 +- .../admin/rest/generator/ASMClassWriter.java | 26 +++++- .../generator/CommandResourceMetaData.java | 1 + .../admin/rest/generator/TextClassWriter.java | 1 + .../generator/TextResourcesGenerator.java | 2 +- .../generator/client/ClientGenerator.java | 23 +++--- .../client/GenerateClientCommand.java | 9 ++- .../client/JavaClientClassWriter.java | 3 +- .../generator/client/JavaClientGenerator.java | 2 + .../client/PythonClientClassWriter.java | 10 +-- .../client/PythonClientGenerator.java | 10 +-- .../admin/rest/logviewer/CharSpool.java | 4 +- .../logviewer/LineEndNormalizingWriter.java | 2 +- .../rest/logviewer/WriterOutputStream.java | 10 +-- .../rest/model/LegacySseResponseBody.java | 1 + .../admin/rest/model/ResourceLink.java | 1 + .../admin/rest/model/ResponseBody.java | 1 + .../model/RestCollectionResponseBody.java | 4 +- .../admin/rest/model/SseResponseBody.java | 1 + .../rest/provider/AbstractStaxProvider.java | 11 ++- .../provider/ActionReportJson2Provider.java | 2 + .../provider/ActionReportJsonProvider.java | 13 ++- .../ActionReportResultJsonProvider.java | 1 + .../ActionReportResultXmlProvider.java | 2 + .../provider/ActionReportXmlProvider.java | 12 ++- ...dminCommandStateCmdResultJsonProvider.java | 9 ++- .../AdminCommandStateJsonProvider.java | 5 +- .../admin/rest/provider/CollectionWriter.java | 8 +- .../provider/CommandModelStaxProvider.java | 8 +- .../provider/GetResultListXmlProvider.java | 18 +++-- .../rest/provider/JsonStringReaderWriter.java | 12 +-- .../admin/rest/provider/MapWriter.java | 6 +- .../provider/OptionsResultJsonProvider.java | 11 +-- .../provider/OptionsResultXmlProvider.java | 7 +- .../ParamsWithPayloadMultipartWriter.java | 13 +-- .../rest/provider/ResponseBodyWriter.java | 4 +- .../admin/rest/readers/FormReader.java | 11 +-- .../admin/rest/readers/InputObject.java | 1 + .../rest/readers/JsonHashMapProvider.java | 13 +-- .../readers/JsonParameterMapProvider.java | 13 +-- .../readers/MultipartFDPayloadReader.java | 10 ++- .../rest/readers/ParameterMapFormReader.java | 12 +-- .../rest/readers/RestModelListReader.java | 18 ++--- .../admin/rest/readers/RestModelReader.java | 18 ++--- .../rest/readers/XmlHashMapProvider.java | 13 +-- .../rest/readers/XmlPropertyListReader.java | 16 ++-- .../rest/resources/AbstractResource.java | 9 ++- .../admin/rest/resources/CommandResult.java | 1 + .../admin/rest/resources/LeafResource.java | 18 ++--- .../admin/rest/resources/SessionResource.java | 6 +- .../rest/resources/SessionsResource.java | 1 + .../admin/rest/resources/StaticResource.java | 4 +- .../TemplateCommandDeleteResource.java | 9 +-- .../resources/TemplateCommandGetResource.java | 4 +- .../TemplateCommandPostResource.java | 16 ++-- .../rest/resources/admin/CommandResource.java | 33 ++++++-- .../rest/resources/composite/JobResource.java | 9 ++- .../resources/composite/JobsResource.java | 11 ++- .../rest/utils/ConfigModelComparator.java | 4 +- .../rest/utils/DetachedCommandHelper.java | 2 + .../admin/rest/utils/DomConfigurator.java | 4 +- .../admin/rest/utils/JsonFilter.java | 12 +-- .../glassfish/admin/rest/utils/JsonUtil.java | 1 + .../org/glassfish/admin/rest/utils/Proxy.java | 4 +- .../glassfish/admin/rest/utils/ProxyImpl.java | 14 ++-- .../admin/rest/utils/SseCommandHelper.java | 5 +- .../admin/rest/utils/StringUtil.java | 1 + .../org/glassfish/admin/rest/utils/Util.java | 21 ++--- .../rest/utils/xml/RestActionReporter.java | 1 + .../admin/rest/utils/xml/XmlArray.java | 1 + .../admin/rest/utils/xml/XmlMap.java | 1 + .../admin/rest/utils/xml/XmlObject.java | 2 + .../rest/wadl/RestModelSchemaResource.java | 13 +-- .../admin/rest/ActionReportTest.java | 4 +- .../admin/rest/ProgressStatusEventTest.java | 4 +- .../rest/composite/CompositeUtilTest.java | 4 +- .../rest/composite/ModelExtensionTest.java | 13 +-- .../composite/resource/DummiesResource.java | 1 + .../composite/resource/DummyResource.java | 1 + .../rest/composite/resource/DummyUriInfo.java | 12 +-- .../glassfish/admin/rest/model/BaseModel.java | 4 +- .../admin/rest/testing/ArrayValue.java | 7 +- .../glassfish/admin/rest/testing/Common.java | 3 +- .../admin/rest/testing/DataVerifier.java | 10 +-- .../admin/rest/testing/ObjectValue.java | 9 ++- .../admin/rest/testing/ResourceInvoker.java | 7 +- .../admin/rest/testing/Response.java | 4 +- .../admin/rest/testing/ResponseVerifier.java | 3 +- .../admin/servermgmt/DomainConfig.java | 9 +-- .../admin/servermgmt/FileValidator.java | 6 +- .../admin/servermgmt/KeystoreManager.java | 34 ++++---- .../servermgmt/MasterPasswordFileManager.java | 1 + .../admin/servermgmt/PortValidator.java | 1 - .../admin/servermgmt/RepositoryConfig.java | 11 ++- .../admin/servermgmt/RepositoryManager.java | 2 +- .../servermgmt/RepositoryNameValidator.java | 8 +- .../enterprise/admin/servermgmt/SLogger.java | 1 + .../admin/servermgmt/UpgradeFilesystem.java | 6 +- .../admin/servermgmt/V2ToV3ConfigUpgrade.java | 14 +++- .../servermgmt/V2ToV3ConfigUpgradeTester.java | 11 +-- .../cli/ChangeAdminPasswordCommand.java | 13 ++- .../cli/ChangeMasterPasswordCommand.java | 15 ++-- .../servermgmt/cli/CreateDomainCommand.java | 28 ++++++- .../servermgmt/cli/CreateServiceCommand.java | 25 +++--- .../servermgmt/cli/DeleteServiceCommand.java | 25 +++--- .../servermgmt/cli/DomainXmlVerifier.java | 10 +-- .../servermgmt/cli/LocalDomainCommand.java | 6 +- .../admin/servermgmt/cli/MonitorCommand.java | 18 +++-- .../admin/servermgmt/cli/MonitorTask.java | 16 ++-- .../servermgmt/cli/StartDomainCommand.java | 5 +- .../servermgmt/cli/StartServerCommand.java | 2 + .../servermgmt/cli/StartServerHelper.java | 1 + .../servermgmt/domain/DomainInfoManager.java | 20 ++--- .../domain/DomainPortValidator.java | 10 +-- .../servermgmt/domain/DomainSecurity.java | 12 +-- .../servermgmt/logging/UpgradeLogging.java | 15 +++- .../pe/PEDomainConfigValidator.java | 1 + .../admin/servermgmt/pe/PEFileLayout.java | 18 ++--- .../admin/servermgmt/pe/PEScriptsTokens.java | 2 +- .../services/NonSMFServiceAdapter.java | 3 +- .../services/PlatformServicesInfo.java | 4 +- .../admin/servermgmt/services/Service.java | 1 + .../servermgmt/services/ServiceAdapter.java | 28 ++++++- .../servermgmt/services/ServicesUtils.java | 11 ++- .../stringsubs/AttributePreprocessor.java | 3 + .../stringsubs/StringSubstitutionFactory.java | 4 +- .../stringsubs/StringSubstitutor.java | 6 +- .../stringsubs/SubstitutableFactory.java | 4 +- .../stringsubs/impl/ArchiveEntryWrapper.java | 4 +- .../impl/ArchiveEntryWrapperImpl.java | 10 +-- .../stringsubs/impl/ArchiveMember.java | 6 +- .../stringsubs/impl/ArchiveMemberHandler.java | 4 +- .../impl/AttributePreprocessorImpl.java | 4 +- .../stringsubs/impl/FileEntryFactory.java | 10 +-- .../stringsubs/impl/FileLister.java | 6 +- .../impl/FileSubstitutionHandler.java | 8 +- .../stringsubs/impl/ModeProcessor.java | 8 +- .../impl/StringSubstitutionEngine.java | 26 +++--- .../impl/StringSubstitutionParser.java | 19 ++--- .../impl/StringSubstitutionProperties.java | 4 +- .../impl/SubstituableFactoryImpl.java | 10 +-- .../impl/SubstitutionAlgorithmFactory.java | 4 +- .../stringsubs/impl/SubstitutionFileUtil.java | 6 +- .../stringsubs/impl/algorithm/RadixTree.java | 6 +- .../impl/algorithm/RadixTreeNode.java | 6 +- .../algorithm/RadixTreeSubstitutionAlgo.java | 10 +-- .../impl/algorithm/StringReplacementAlgo.java | 8 +- .../template/TemplateInfoHolder.java | 15 ++-- .../servermgmt/util/DomainXmlSAXParser.java | 7 +- .../stringsubs/impl/ModeProcessorTest.java | 4 +- .../impl/StringSubstitutionParserTest.java | 8 +- .../RadixTreeSubstitutionAlgorithmTest.java | 4 +- .../impl/algorithm/RadixTreeTest.java | 4 +- .../StringReplacementAlgorithmTest.java | 4 +- .../enterprise/admin/commands/DeleteSsl.java | 26 +++--- .../commands/ProtocolSslConfigHandler.java | 1 + .../event/AdminCommandEventBrokerImpl.java | 2 + .../admin/progress/CommandProgressImpl.java | 2 + .../admin/progress/ProgressStatusClient.java | 2 + .../admin/remote/AdminCommandStateImpl.java | 1 + .../admin/remote/GeneratedManPageManager.java | 4 +- .../admin/remote/ManifestManager.java | 14 ++-- .../admin/remote/PlainTextManager.java | 2 +- .../admin/remote/RemoteResponseManager.java | 6 +- .../admin/remote/RestPayloadImpl.java | 1 + .../admin/remote/reader/CliActionReport.java | 7 +- ...aramsWithPayloadJsonProprietaryReader.java | 1 + .../GfSseEventReceiverProprietaryReader.java | 1 + .../admin/remote/sse/GfSseInboundEvent.java | 1 + .../writer/MultipartProprietaryWriter.java | 2 + .../ParameterMapFormProprietaryWriter.java | 2 + .../admin/util/AdminCallbackHandler.java | 1 + .../admin/util/AdminIndicatorPrincipal.java | 1 + .../util/AdminLocalPasswordPrincipal.java | 1 + .../admin/util/AdminLoginModule.java | 11 ++- .../admin/util/AsadminTrustManager.java | 2 + .../admin/util/CachedCommandModel.java | 5 +- .../admin/util/ClusterOperationUtil.java | 14 +++- .../admin/util/CommandModelData.java | 1 + .../admin/util/CommandSecurityChecker.java | 23 +++++- .../admin/util/CommandThreadPool.java | 23 +++--- .../admin/util/GenericAdminAuthenticator.java | 26 +++--- .../admin/util/HttpConnectorAddress.java | 10 ++- .../admin/util/InstanceCommandExecutor.java | 8 +- .../util/InstanceRestCommandExecutor.java | 10 ++- .../util/InstanceStateFileProcessor.java | 21 +++-- .../admin/util/InstanceStateService.java | 7 +- .../admin/util/InstanceStateServiceImpl.java | 11 ++- .../admin/util/JvmOptionsHelper.java | 8 +- .../admin/util/LineTokenReplacer.java | 11 ++- .../admin/util/NamedResourceManager.java | 4 +- .../NucleusAuthorizationPreprocessor.java | 2 + .../util/RemoteInstanceCommandHelper.java | 8 +- .../admin/util/ServerDirsSelector.java | 2 + .../admin/util/cache/AdminCacheUtils.java | 1 + .../util/cache/CommandModelDataProvider.java | 10 ++- .../admin/util/cache/DataProvider.java | 1 + .../admin/util/jmx/AttributeListUtils.java | 8 +- .../admin/util/proxy/ProxyClass.java | 2 +- .../util/test/TokenReplacementTester.java | 2 +- .../cli/resources/CreateResourceRef.java | 1 + .../admin/cli/resources/ListResourceRefs.java | 19 ++--- .../cli/resources/ResourceConfigCreator.java | 6 +- .../UniqueResourceNameConstraint.java | 5 +- .../UniqueResourceNameValidator.java | 6 +- 474 files changed, 2327 insertions(+), 1464 deletions(-) diff --git a/appserver/admin/admin-core/src/main/java/com/sun/enterprise/admin/AdminContext.java b/appserver/admin/admin-core/src/main/java/com/sun/enterprise/admin/AdminContext.java index c0cea3be0dc..5a14281f831 100644 --- a/appserver/admin/admin-core/src/main/java/com/sun/enterprise/admin/AdminContext.java +++ b/appserver/admin/admin-core/src/main/java/com/sun/enterprise/admin/AdminContext.java @@ -16,12 +16,12 @@ package com.sun.enterprise.admin; -import java.util.logging.Logger; +import com.sun.enterprise.admin.util.proxy.Interceptor; + import java.net.URL; +import java.util.logging.Logger; import javax.management.MBeanServer; -//import com.sun.enterprise.config.ConfigContext; -import com.sun.enterprise.admin.util.proxy.Interceptor; /** * This interface defines the environment for administration. diff --git a/appserver/admin/admin-core/src/main/java/com/sun/enterprise/admin/UpgradeService.java b/appserver/admin/admin-core/src/main/java/com/sun/enterprise/admin/UpgradeService.java index 17d3f421e5b..6acd249ea1e 100644 --- a/appserver/admin/admin-core/src/main/java/com/sun/enterprise/admin/UpgradeService.java +++ b/appserver/admin/admin-core/src/main/java/com/sun/enterprise/admin/UpgradeService.java @@ -16,28 +16,31 @@ package com.sun.enterprise.admin; -import java.beans.PropertyVetoException; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.List; -import java.util.ArrayList; +import com.sun.enterprise.config.serverbeans.Application; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Engine; +import com.sun.enterprise.config.serverbeans.Module; import jakarta.inject.Inject; import jakarta.inject.Named; -import com.sun.enterprise.config.serverbeans.*; +import java.beans.PropertyVetoException; +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.admin.config.ConfigurationUpgrade; -import org.jvnet.hk2.config.types.Property; +import org.glassfish.hk2.api.PostConstruct; import org.jvnet.hk2.annotations.Optional; import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PostConstruct; -import org.jvnet.hk2.config.ConfigSupport; -import org.jvnet.hk2.config.TransactionFailure; -import org.jvnet.hk2.config.Transaction; import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; +import org.jvnet.hk2.config.Transaction; +import org.jvnet.hk2.config.TransactionFailure; +import org.jvnet.hk2.config.types.Property; import org.jvnet.hk2.config.types.PropertyBag; -import com.sun.enterprise.config.serverbeans.Module; /** diff --git a/appserver/admin/admin-core/src/test/java/com/sun/enterprise/admin/tests/UpgradeTest.java b/appserver/admin/admin-core/src/test/java/com/sun/enterprise/admin/tests/UpgradeTest.java index 6567ae6ed65..6277c2b1b88 100644 --- a/appserver/admin/admin-core/src/test/java/com/sun/enterprise/admin/tests/UpgradeTest.java +++ b/appserver/admin/admin-core/src/test/java/com/sun/enterprise/admin/tests/UpgradeTest.java @@ -25,6 +25,8 @@ import com.sun.enterprise.module.bootstrap.StartupContext; import com.sun.enterprise.util.SystemPropertyConstants; +import jakarta.inject.Inject; + import java.util.List; import java.util.logging.Logger; @@ -38,7 +40,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import jakarta.inject.Inject; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.arrayContaining; diff --git a/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/BackupFilenameManager.java b/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/BackupFilenameManager.java index b378caab10f..67ab2cb4b0d 100644 --- a/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/BackupFilenameManager.java +++ b/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/BackupFilenameManager.java @@ -22,10 +22,10 @@ package com.sun.enterprise.backup; -import java.io.*; -import java.util.Date; +import java.io.File; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.Iterator; import java.util.List; import java.util.SortedMap; diff --git a/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/BackupManager.java b/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/BackupManager.java index 00e64aa339e..30412133dd3 100644 --- a/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/BackupManager.java +++ b/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/BackupManager.java @@ -18,9 +18,10 @@ import com.sun.enterprise.backup.util.BackupUtils; import com.sun.enterprise.util.io.FileUtils; -import java.io.*; -import java.util.List; + +import java.io.File; import java.util.Date; +import java.util.List; /** * diff --git a/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/BackupRequest.java b/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/BackupRequest.java index 4814190ab2d..948ba0207e9 100644 --- a/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/BackupRequest.java +++ b/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/BackupRequest.java @@ -22,11 +22,11 @@ package com.sun.enterprise.backup; -import java.io.*; - import com.sun.enterprise.util.ObjectAnalyzer; import com.sun.enterprise.util.io.FileUtils; +import java.io.File; + /** * This class holds all of the values that the caller needs. * An instance of this class can be used to create a request object. diff --git a/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/BackupRestoreManager.java b/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/BackupRestoreManager.java index 1a4f56b8d29..ce3429c1ae0 100644 --- a/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/BackupRestoreManager.java +++ b/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/BackupRestoreManager.java @@ -17,7 +17,8 @@ package com.sun.enterprise.backup; import com.sun.enterprise.util.io.FileUtils; -import java.io.*; + +import java.io.File; /** * Baseclass for BackupManager and RestoreManager. Common code between diff --git a/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/DirectoryFilter.java b/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/DirectoryFilter.java index b6589c907eb..b7246854366 100644 --- a/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/DirectoryFilter.java +++ b/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/DirectoryFilter.java @@ -16,7 +16,8 @@ package com.sun.enterprise.backup; -import java.io.*; +import java.io.File; +import java.io.FilenameFilter; class DirectoryFilter implements FilenameFilter { public boolean accept(File dir, String name) { diff --git a/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/ListManager.java b/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/ListManager.java index ff90146b248..155f9832bf1 100644 --- a/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/ListManager.java +++ b/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/ListManager.java @@ -22,12 +22,16 @@ package com.sun.enterprise.backup; -import com.sun.enterprise.util.ColumnFormatter; import com.sun.enterprise.universal.i18n.LocalStringsImpl; - +import com.sun.enterprise.util.ColumnFormatter; import com.sun.enterprise.util.io.FileUtils; -import java.io.*; -import java.util.*; + +import java.io.File; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.TreeSet; /** diff --git a/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/LoggerHelper.java b/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/LoggerHelper.java index 5096ff6a807..355838ae7a8 100644 --- a/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/LoggerHelper.java +++ b/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/LoggerHelper.java @@ -16,7 +16,10 @@ package com.sun.enterprise.backup; -import java.util.logging.*; +import java.util.logging.ConsoleHandler; +import java.util.logging.Handler; +import java.util.logging.Level; +import java.util.logging.Logger; // Resource Bundle: // com/sun/logging/enterprise/system/tools/deployment/backend/LogStrings.properties diff --git a/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/RestoreManager.java b/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/RestoreManager.java index 0fdf9bab3b7..393342cb3ed 100644 --- a/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/RestoreManager.java +++ b/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/RestoreManager.java @@ -19,7 +19,9 @@ import com.sun.enterprise.backup.util.BackupUtils; import com.sun.enterprise.util.io.FileUtils; import com.sun.enterprise.util.zip.ZipFile; -import java.io.*; + +import java.io.File; +import java.io.IOException; /** * diff --git a/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/StringHelper.java b/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/StringHelper.java index d6a62c0427a..ca3926496c8 100644 --- a/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/StringHelper.java +++ b/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/StringHelper.java @@ -16,8 +16,8 @@ package com.sun.enterprise.backup; -import java.util.ResourceBundle; import java.text.MessageFormat; +import java.util.ResourceBundle; /** * diff --git a/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/ZipFilenameFilter.java b/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/ZipFilenameFilter.java index 1f8a52c24ff..f05aa18451f 100644 --- a/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/ZipFilenameFilter.java +++ b/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/ZipFilenameFilter.java @@ -22,7 +22,8 @@ package com.sun.enterprise.backup; -import java.io.*; +import java.io.File; +import java.io.FilenameFilter; import java.util.Locale; /** diff --git a/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/ZipStorage.java b/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/ZipStorage.java index f3fb117f58e..41d45af9d2d 100644 --- a/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/ZipStorage.java +++ b/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/ZipStorage.java @@ -22,10 +22,12 @@ package com.sun.enterprise.backup; -import com.sun.enterprise.util.io.*; -import com.sun.enterprise.util.zip.*; +import com.sun.enterprise.util.io.FileListerRelative; +import com.sun.enterprise.util.io.FileUtils; +import com.sun.enterprise.util.zip.ZipFileException; +import com.sun.enterprise.util.zip.ZipWriter; -import java.io.*; +import java.io.File; /** * This class implements storing backups as zip files. diff --git a/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/util/BackupUtils.java b/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/util/BackupUtils.java index 03e0b78635a..1eba5e56e90 100644 --- a/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/util/BackupUtils.java +++ b/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/util/BackupUtils.java @@ -18,7 +18,7 @@ import com.sun.enterprise.util.OS; -import java.io.*; +import java.io.File; public class BackupUtils { diff --git a/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/BackupCommands.java b/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/BackupCommands.java index 9c751ccd00f..93db55a57cf 100644 --- a/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/BackupCommands.java +++ b/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/BackupCommands.java @@ -17,8 +17,10 @@ package com.sun.enterprise.admin.cli.optional; -import static com.sun.enterprise.util.Utility.isEmpty; -import static com.sun.enterprise.util.io.DomainDirs.getDefaultDomainsDir; +import com.sun.enterprise.admin.servermgmt.cli.LocalDomainCommand; +import com.sun.enterprise.backup.BackupRequest; +import com.sun.enterprise.universal.i18n.LocalStringsImpl; +import com.sun.enterprise.util.ObjectAnalyzer; import java.io.File; import java.io.IOException; @@ -27,10 +29,8 @@ import org.glassfish.api.admin.CommandException; import org.glassfish.api.admin.CommandValidationException; -import com.sun.enterprise.admin.servermgmt.cli.LocalDomainCommand; -import com.sun.enterprise.backup.BackupRequest; -import com.sun.enterprise.universal.i18n.LocalStringsImpl; -import com.sun.enterprise.util.ObjectAnalyzer; +import static com.sun.enterprise.util.Utility.isEmpty; +import static com.sun.enterprise.util.io.DomainDirs.getDefaultDomainsDir; /** * This is a local command for backing-up domains. diff --git a/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/BackupDomainCommand.java b/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/BackupDomainCommand.java index 2402c328c50..07758abaa21 100644 --- a/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/BackupDomainCommand.java +++ b/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/BackupDomainCommand.java @@ -17,13 +17,6 @@ package com.sun.enterprise.admin.cli.optional; -import java.io.File; - -import org.glassfish.api.Param; -import org.glassfish.api.admin.CommandException; -import org.glassfish.hk2.api.PerLookup; -import org.jvnet.hk2.annotations.Service; - import com.sun.enterprise.admin.cli.remote.RemoteCLICommand; import com.sun.enterprise.backup.BackupException; import com.sun.enterprise.backup.BackupManager; @@ -32,6 +25,13 @@ import com.sun.enterprise.universal.process.ProcessUtils; import com.sun.enterprise.util.ObjectAnalyzer; +import java.io.File; + +import org.glassfish.api.Param; +import org.glassfish.api.admin.CommandException; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; + /** * This is a local command for backing-up domains. * diff --git a/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/DatabaseCommand.java b/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/DatabaseCommand.java index bf490808d2f..1e705e0e588 100644 --- a/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/DatabaseCommand.java +++ b/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/DatabaseCommand.java @@ -17,9 +17,10 @@ package com.sun.enterprise.admin.cli.optional; -import static com.sun.enterprise.util.SystemPropertyConstants.DERBY_ROOT_PROPERTY; -import static com.sun.enterprise.util.SystemPropertyConstants.INSTALL_ROOT_PROPERTY; -import static com.sun.enterprise.util.SystemPropertyConstants.JAVA_ROOT_PROPERTY; +import com.sun.enterprise.admin.cli.CLICommand; +import com.sun.enterprise.admin.cli.ClassPathBuilder; +import com.sun.enterprise.universal.i18n.LocalStringsImpl; +import com.sun.enterprise.util.OS; import java.io.File; @@ -27,10 +28,9 @@ import org.glassfish.api.admin.CommandException; import org.glassfish.api.admin.CommandValidationException; -import com.sun.enterprise.admin.cli.CLICommand; -import com.sun.enterprise.admin.cli.ClassPathBuilder; -import com.sun.enterprise.universal.i18n.LocalStringsImpl; -import com.sun.enterprise.util.OS; +import static com.sun.enterprise.util.SystemPropertyConstants.DERBY_ROOT_PROPERTY; +import static com.sun.enterprise.util.SystemPropertyConstants.INSTALL_ROOT_PROPERTY; +import static com.sun.enterprise.util.SystemPropertyConstants.JAVA_ROOT_PROPERTY; /** * This is an abstract class to be inherited by StartDatabaseCommand and StopDatabaseCommand. This classes prepares the diff --git a/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/DerbyControl.java b/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/DerbyControl.java index 024813aad0e..ee6a0b865db 100644 --- a/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/DerbyControl.java +++ b/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/DerbyControl.java @@ -17,8 +17,7 @@ package com.sun.enterprise.admin.cli.optional; -import static com.sun.enterprise.util.Utility.isAllNull; -import static com.sun.enterprise.util.Utility.isEmpty; +import com.sun.enterprise.util.i18n.StringManager; import java.io.File; import java.io.FileOutputStream; @@ -28,7 +27,8 @@ import org.glassfish.api.admin.CommandException; -import com.sun.enterprise.util.i18n.StringManager; +import static com.sun.enterprise.util.Utility.isAllNull; +import static com.sun.enterprise.util.Utility.isEmpty; /** * This class uses Java reflection to invoke Derby NetworkServerControl class. diff --git a/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/ListBackupsCommand.java b/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/ListBackupsCommand.java index 56dd6658a6f..461ced23840 100644 --- a/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/ListBackupsCommand.java +++ b/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/ListBackupsCommand.java @@ -17,18 +17,18 @@ package com.sun.enterprise.admin.cli.optional; -import java.io.File; - -import org.glassfish.api.admin.CommandException; -import org.glassfish.hk2.api.PerLookup; -import org.jvnet.hk2.annotations.Service; - import com.sun.enterprise.backup.BackupException; import com.sun.enterprise.backup.BackupWarningException; import com.sun.enterprise.backup.ListManager; import com.sun.enterprise.universal.i18n.LocalStringsImpl; import com.sun.enterprise.util.ObjectAnalyzer; +import java.io.File; + +import org.glassfish.api.admin.CommandException; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; + /** * This is a local command for listing backed up domains. * diff --git a/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/StartDatabaseCommand.java b/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/StartDatabaseCommand.java index 1f0f2508799..05ac3189c07 100644 --- a/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/StartDatabaseCommand.java +++ b/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/StartDatabaseCommand.java @@ -17,10 +17,10 @@ package com.sun.enterprise.admin.cli.optional; -import static com.sun.enterprise.admin.cli.optional.DerbyControl.DB_LOG_FILENAME; -import static java.io.File.pathSeparator; -import static java.io.File.separator; -import static java.util.Arrays.asList; +import com.sun.enterprise.admin.cli.CLIProcessExecutor; +import com.sun.enterprise.universal.glassfish.GFLauncherUtils; +import com.sun.enterprise.universal.i18n.LocalStringsImpl; +import com.sun.enterprise.util.OS; import java.io.File; import java.io.IOException; @@ -33,10 +33,10 @@ import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.admin.cli.CLIProcessExecutor; -import com.sun.enterprise.universal.glassfish.GFLauncherUtils; -import com.sun.enterprise.universal.i18n.LocalStringsImpl; -import com.sun.enterprise.util.OS; +import static com.sun.enterprise.admin.cli.optional.DerbyControl.DB_LOG_FILENAME; +import static java.io.File.pathSeparator; +import static java.io.File.separator; +import static java.util.Arrays.asList; /** * start-database command This command class will invoke DerbyControl to first ping if the database is running. If not diff --git a/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/StopDatabaseCommand.java b/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/StopDatabaseCommand.java index a9b60284f3d..b25765cb0ab 100644 --- a/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/StopDatabaseCommand.java +++ b/appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/StopDatabaseCommand.java @@ -17,12 +17,10 @@ package com.sun.enterprise.admin.cli.optional; -import static com.sun.enterprise.admin.cli.CLIUtil.readPasswordFileOptions; -import static com.sun.enterprise.admin.cli.ProgramOptions.PASSWORDFILE; -import static com.sun.enterprise.universal.io.SmartFile.sanitize; -import static com.sun.enterprise.util.Utility.isAllNull; -import static java.io.File.pathSeparator; -import static java.io.File.separator; +import com.sun.enterprise.admin.cli.CLIProcessExecutor; +import com.sun.enterprise.admin.cli.Environment; +import com.sun.enterprise.universal.i18n.LocalStringsImpl; +import com.sun.enterprise.util.OS; import java.io.File; import java.util.HashMap; @@ -33,10 +31,12 @@ import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.admin.cli.CLIProcessExecutor; -import com.sun.enterprise.admin.cli.Environment; -import com.sun.enterprise.universal.i18n.LocalStringsImpl; -import com.sun.enterprise.util.OS; +import static com.sun.enterprise.admin.cli.CLIUtil.readPasswordFileOptions; +import static com.sun.enterprise.admin.cli.ProgramOptions.PASSWORDFILE; +import static com.sun.enterprise.universal.io.SmartFile.sanitize; +import static com.sun.enterprise.util.Utility.isAllNull; +import static java.io.File.pathSeparator; +import static java.io.File.separator; /** * stop-database command This command class will not invoke DerbyControl to stop the database. diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ArgumentTokenizer.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ArgumentTokenizer.java index a54276b7b58..30d6b089bb9 100644 --- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ArgumentTokenizer.java +++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ArgumentTokenizer.java @@ -16,9 +16,10 @@ package com.sun.enterprise.admin.cli; -import java.util.*; import com.sun.enterprise.universal.i18n.LocalStringsImpl; +import java.util.NoSuchElementException; + public class ArgumentTokenizer { protected int currentPosition; protected int maxPosition; diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/CLIContainer.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/CLIContainer.java index d5a894f1514..f6caacb606c 100644 --- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/CLIContainer.java +++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/CLIContainer.java @@ -21,6 +21,9 @@ import com.sun.enterprise.module.single.StaticModulesRegistry; import com.sun.enterprise.util.StringUtils; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + import java.io.BufferedReader; import java.io.File; import java.io.FilenameFilter; @@ -38,7 +41,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.zip.ZipEntry; -import jakarta.inject.Inject; + import org.glassfish.hk2.api.MultiException; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/CLIUtil.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/CLIUtil.java index f584425f8b1..45c4a27e349 100644 --- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/CLIUtil.java +++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/CLIUtil.java @@ -18,13 +18,35 @@ import com.sun.enterprise.admin.cli.remote.RemoteCLICommand; import com.sun.enterprise.universal.i18n.LocalStringsImpl; -import java.io.*; -import java.text.*; -import java.util.*; + +import java.io.BufferedInputStream; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Properties; +import java.util.Set; import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.ActionReport.MessagePart; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.CommandException; +import org.glassfish.api.admin.CommandValidationException; +import org.glassfish.api.admin.InvalidCommandException; /** * CLI Utility class diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ClassPathBuilder.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ClassPathBuilder.java index b46eacf2162..8b8e378cbea 100644 --- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ClassPathBuilder.java +++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ClassPathBuilder.java @@ -18,9 +18,9 @@ import java.io.File; import java.io.FileFilter; -import java.util.List; import java.util.ArrayList; import java.util.Iterator; +import java.util.List; /** * Builds up a classpath. diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ExportCommand.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ExportCommand.java index 1d946a5318a..bf04e3a4b54 100644 --- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ExportCommand.java +++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ExportCommand.java @@ -16,13 +16,16 @@ package com.sun.enterprise.admin.cli; -import java.util.*; -import org.jvnet.hk2.annotations.*; +import com.sun.enterprise.universal.i18n.LocalStringsImpl; + +import java.util.List; +import java.util.Map; + import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.CommandException; +import org.glassfish.api.admin.CommandValidationException; import org.glassfish.hk2.api.PerLookup; - -import com.sun.enterprise.universal.i18n.LocalStringsImpl; +import org.jvnet.hk2.annotations.Service; /** * A local export command. diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/HelpCommand.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/HelpCommand.java index 407f18b8f7d..b6adf94bd7a 100644 --- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/HelpCommand.java +++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/HelpCommand.java @@ -16,17 +16,22 @@ package com.sun.enterprise.admin.cli; -import java.io.*; +import com.sun.enterprise.universal.i18n.LocalStringsImpl; + +import jakarta.inject.Inject; + +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.io.Reader; +import java.io.Writer; -import org.jvnet.hk2.annotations.Service; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.CommandException; +import org.glassfish.api.admin.CommandValidationException; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; - -import com.sun.enterprise.universal.i18n.LocalStringsImpl; - -import jakarta.inject.Inject; +import org.jvnet.hk2.annotations.Service; /** * The help command will display the help text for all the commands and their options diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ListCommandsCommand.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ListCommandsCommand.java index 866aeb248d5..92cdc3d09d2 100644 --- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ListCommandsCommand.java +++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ListCommandsCommand.java @@ -16,18 +16,20 @@ package com.sun.enterprise.admin.cli; -import java.util.*; -import java.util.regex.*; - -import org.jvnet.hk2.annotations.Service; -import org.glassfish.api.Param; -import org.glassfish.api.admin.*; -import org.glassfish.hk2.api.PerLookup; - import com.sun.enterprise.universal.i18n.LocalStringsImpl; import jakarta.inject.Inject; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Pattern; + +import org.glassfish.api.Param; +import org.glassfish.api.admin.CommandException; +import org.glassfish.api.admin.CommandValidationException; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; + import static com.sun.enterprise.admin.cli.CLIConstants.EOL; /** diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/LoginCommand.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/LoginCommand.java index 1d34c5ee593..c5bb052aa22 100644 --- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/LoginCommand.java +++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/LoginCommand.java @@ -19,13 +19,16 @@ import com.sun.appserv.management.client.prefs.LoginInfo; import com.sun.appserv.management.client.prefs.LoginInfoStore; import com.sun.appserv.management.client.prefs.LoginInfoStoreFactory; -import com.sun.enterprise.admin.cli.remote.*; +import com.sun.enterprise.admin.cli.remote.DASUtils; import com.sun.enterprise.universal.i18n.LocalStringsImpl; import com.sun.enterprise.util.SystemPropertyConstants; + import java.io.Console; -import org.glassfish.api.admin.*; + +import org.glassfish.api.admin.CommandException; +import org.glassfish.api.admin.CommandValidationException; import org.glassfish.hk2.api.PerLookup; -import org.jvnet.hk2.annotations.*; +import org.jvnet.hk2.annotations.Service; /** * The asadmin login command. Pretend to be a remote command so that program options are allowed. diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/More.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/More.java index 5aad8a603b7..7b51d6cdc45 100644 --- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/More.java +++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/More.java @@ -16,11 +16,11 @@ package com.sun.enterprise.admin.cli; -import java.io.Writer; -import java.io.Reader; -import java.io.IOException; -import java.io.BufferedWriter; import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.IOException; +import java.io.Reader; +import java.io.Writer; /** * More.java diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/MultimodeCommand.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/MultimodeCommand.java index 554c0c04415..a502659e726 100644 --- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/MultimodeCommand.java +++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/MultimodeCommand.java @@ -16,24 +16,35 @@ package com.sun.enterprise.admin.cli; -import java.io.*; -import java.util.*; +import com.sun.enterprise.admin.util.CommandModelData; +import com.sun.enterprise.universal.i18n.LocalStringsImpl; + +import jakarta.inject.Inject; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; -import org.jvnet.hk2.annotations.Service; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.CommandException; import org.glassfish.api.admin.CommandModel.ParamModel; +import org.glassfish.api.admin.CommandValidationException; +import org.glassfish.api.admin.InvalidCommandException; import org.glassfish.hk2.api.ActiveDescriptor; import org.glassfish.hk2.api.DynamicConfiguration; import org.glassfish.hk2.api.DynamicConfigurationService; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.hk2.utilities.BuilderHelper; - -import com.sun.enterprise.admin.util.*; -import com.sun.enterprise.universal.i18n.LocalStringsImpl; - -import jakarta.inject.Inject; +import org.jvnet.hk2.annotations.Service; /** * A scaled-down implementation of multi-mode command. diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/UnsetCommand.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/UnsetCommand.java index f06ce279384..2afb736a82c 100644 --- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/UnsetCommand.java +++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/UnsetCommand.java @@ -16,13 +16,15 @@ package com.sun.enterprise.admin.cli; -import java.util.*; -import org.jvnet.hk2.annotations.*; +import com.sun.enterprise.universal.i18n.LocalStringsImpl; + +import java.util.List; + import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.CommandException; +import org.glassfish.api.admin.CommandValidationException; import org.glassfish.hk2.api.PerLookup; - -import com.sun.enterprise.universal.i18n.LocalStringsImpl; +import org.jvnet.hk2.annotations.Service; /** * A local unset command to unset environment variables. diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/embeddable/CommandExecutorImpl.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/embeddable/CommandExecutorImpl.java index f9a3894aa65..6636d9d8836 100644 --- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/embeddable/CommandExecutorImpl.java +++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/embeddable/CommandExecutorImpl.java @@ -17,14 +17,18 @@ package com.sun.enterprise.admin.cli.embeddable; +import com.sun.enterprise.admin.cli.CLIUtil; +import com.sun.enterprise.admin.cli.Parser; +import com.sun.enterprise.admin.cli.ProgramOptions; + +import jakarta.inject.Inject; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.List; import java.util.Map; import java.util.logging.Logger; -import jakarta.inject.Inject; - import org.glassfish.api.ActionReport; import org.glassfish.api.admin.CommandException; import org.glassfish.api.admin.CommandModel; @@ -33,14 +37,10 @@ import org.glassfish.embeddable.CommandResult; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.EmbeddedSystemAdministrator; import org.jvnet.hk2.annotations.ContractsProvided; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.admin.cli.CLIUtil; -import com.sun.enterprise.admin.cli.Parser; -import com.sun.enterprise.admin.cli.ProgramOptions; -import org.glassfish.internal.api.EmbeddedSystemAdministrator; - /** * @author bhavanishankar@dev.java.net * @author sanjeeb.sahoo@sun.com diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/remote/ClientCookieStore.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/remote/ClientCookieStore.java index cdd00afa7fa..2269399e973 100644 --- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/remote/ClientCookieStore.java +++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/remote/ClientCookieStore.java @@ -21,13 +21,12 @@ import java.io.File; import java.io.FileReader; import java.io.FileWriter; -import java.io.PrintWriter; import java.io.IOException; - +import java.io.PrintWriter; import java.net.CookieStore; -import java.net.URISyntaxException; import java.net.HttpCookie; import java.net.URI; +import java.net.URISyntaxException; import java.util.List; /* diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/remote/DetachListener.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/remote/DetachListener.java index 4435f9b98f1..9da1432e70f 100644 --- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/remote/DetachListener.java +++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/remote/DetachListener.java @@ -20,9 +20,11 @@ import com.sun.enterprise.admin.remote.sse.GfSseInboundEvent; import com.sun.enterprise.universal.i18n.LocalStringsImpl; import com.sun.enterprise.util.StringUtils; + import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.admin.AdminCommandEventBroker; import org.glassfish.api.admin.AdminCommandState; diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/remote/ProgressStatusPrinter.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/remote/ProgressStatusPrinter.java index b0c5c2f2365..6fe8229e0c4 100644 --- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/remote/ProgressStatusPrinter.java +++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/remote/ProgressStatusPrinter.java @@ -20,9 +20,11 @@ import com.sun.enterprise.admin.remote.sse.GfSseInboundEvent; import com.sun.enterprise.universal.i18n.LocalStringsImpl; import com.sun.enterprise.util.StringUtils; + import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; + import org.glassfish.api.admin.AdminCommandEventBroker; import org.glassfish.api.admin.AdminCommandEventBroker.AdminCommandListener; import org.glassfish.api.admin.CommandProgress; diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/remote/RemoteCLICommand.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/remote/RemoteCLICommand.java index 6c96925d2e7..853aea0b77c 100644 --- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/remote/RemoteCLICommand.java +++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/remote/RemoteCLICommand.java @@ -37,6 +37,7 @@ import com.sun.enterprise.universal.i18n.LocalStringsImpl; import com.sun.enterprise.util.StringUtils; import com.sun.enterprise.util.SystemPropertyConstants; + import java.io.BufferedReader; import java.io.Console; import java.io.File; diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/schemadoc/ClassDef.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/schemadoc/ClassDef.java index b04ae17ccc9..776a6486281 100644 --- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/schemadoc/ClassDef.java +++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/schemadoc/ClassDef.java @@ -16,18 +16,18 @@ package com.sun.enterprise.admin.cli.schemadoc; +import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; -import java.util.Comparator; -import java.util.List; -import org.jvnet.hk2.config.Dom; -import org.jvnet.hk2.config.Attribute; import org.glassfish.api.admin.config.PropertyDesc; +import org.jvnet.hk2.config.Attribute; +import org.jvnet.hk2.config.Dom; /** * Contains metadata information about a class diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/schemadoc/Context.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/schemadoc/Context.java index a9433200de6..9996e80aa0b 100644 --- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/schemadoc/Context.java +++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/schemadoc/Context.java @@ -16,9 +16,9 @@ package com.sun.enterprise.admin.cli.schemadoc; -import java.util.Map; -import java.util.HashMap; import java.io.File; +import java.util.HashMap; +import java.util.Map; public class Context { private Boolean showSubclasses; diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/schemadoc/GenerateDomainSchema.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/schemadoc/GenerateDomainSchema.java index 9d14340d2e2..a403033e628 100644 --- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/schemadoc/GenerateDomainSchema.java +++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/schemadoc/GenerateDomainSchema.java @@ -16,6 +16,10 @@ package com.sun.enterprise.admin.cli.schemadoc; +import com.sun.enterprise.config.serverbeans.Domain; + +import jakarta.inject.Inject; + import java.io.File; import java.io.FilenameFilter; import java.io.IOException; @@ -31,20 +35,21 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.config.serverbeans.Domain; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AccessRequired; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; - +import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; import org.jvnet.hk2.annotations.Service; - -import org.glassfish.hk2.api.PerLookup; import org.objectweb.asm.ClassReader; -import jakarta.inject.Inject; - @Service(name = "generate-domain-schema") @PerLookup @ExecuteOn(value = { RuntimeType.DAS }) diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ConfigBeanInstaller.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ConfigBeanInstaller.java index 52d54710f3f..3be545baf53 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ConfigBeanInstaller.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ConfigBeanInstaller.java @@ -24,18 +24,18 @@ import com.sun.enterprise.config.serverbeans.DomainExtension; import com.sun.enterprise.module.bootstrap.StartupContext; -import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.api.admin.config.ConfigExtension; -import org.glassfish.hk2.api.PostConstruct; -import org.glassfish.hk2.api.ServiceLocator; -import org.jvnet.hk2.annotations.Service; - import jakarta.inject.Inject; import jakarta.inject.Named; import java.lang.annotation.Annotation; import java.util.List; +import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.api.admin.config.ConfigExtension; +import org.glassfish.hk2.api.PostConstruct; +import org.glassfish.hk2.api.ServiceLocator; +import org.jvnet.hk2.annotations.Service; + /** * @author Masoud Kalali */ diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ConfigModularityJustInTimeInjectionResolver.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ConfigModularityJustInTimeInjectionResolver.java index 350d79e0279..d42b190c8c1 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ConfigModularityJustInTimeInjectionResolver.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ConfigModularityJustInTimeInjectionResolver.java @@ -19,6 +19,10 @@ import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.DomainExtension; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import org.glassfish.api.admin.config.ConfigExtension; import org.glassfish.hk2.api.DynamicConfigurationService; import org.glassfish.hk2.api.Injectee; @@ -28,9 +32,6 @@ import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigBeanProxy; -import jakarta.inject.Inject; -import jakarta.inject.Singleton; - /** * create the default ejb-container configbean when non exists and an injection point requires it. * diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ExtensionPatternInvocationImpl.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ExtensionPatternInvocationImpl.java index b01222438b4..8292df578fa 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ExtensionPatternInvocationImpl.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ExtensionPatternInvocationImpl.java @@ -19,6 +19,12 @@ import com.sun.enterprise.config.modularity.parser.ModuleConfigurationLoader; import com.sun.enterprise.config.util.ConfigApiLoggerInfo; +import jakarta.inject.Inject; + +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.logging.LogHelper; import org.glassfish.hk2.api.ServiceLocator; import org.jvnet.hk2.annotations.Service; @@ -27,12 +33,6 @@ import org.jvnet.hk2.config.ConfigExtensionHandler; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; - -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * This is to integrate the whole getExtensionByType with the config modularity irrelevant of the invocation point. More * explanation at Config Modularity one pager and diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/GetSetModularityHelper.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/GetSetModularityHelper.java index 21e63a34846..4973fd6395f 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/GetSetModularityHelper.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/GetSetModularityHelper.java @@ -18,12 +18,14 @@ import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; -import org.glassfish.config.support.Singleton; -import org.jvnet.hk2.annotations.Service; import jakarta.inject.Inject; + import java.util.StringTokenizer; +import org.glassfish.config.support.Singleton; +import org.jvnet.hk2.annotations.Service; + /** * The main driver to make the getset commands compatible with the config modularity. * diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/annotation/CustomConfiguration.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/annotation/CustomConfiguration.java index adc1f027c04..44a3b801449 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/annotation/CustomConfiguration.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/annotation/CustomConfiguration.java @@ -17,6 +17,7 @@ package com.sun.enterprise.config.modularity.annotation; import jakarta.inject.Qualifier; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/annotation/HasCustomizationTokens.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/annotation/HasCustomizationTokens.java index 73577a55a79..5b188d8be16 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/annotation/HasCustomizationTokens.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/annotation/HasCustomizationTokens.java @@ -17,6 +17,7 @@ package com.sun.enterprise.config.modularity.annotation; import jakarta.inject.Qualifier; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/AbstractConfigModularityCommand.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/AbstractConfigModularityCommand.java index 50557a6e8aa..37a627ddb03 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/AbstractConfigModularityCommand.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/AbstractConfigModularityCommand.java @@ -22,18 +22,20 @@ import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Server; -import org.glassfish.api.admin.AccessRequired; -import org.glassfish.config.support.CommandTarget; -import org.glassfish.hk2.api.ServiceLocator; -import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.config.ConfigBeanProxy; import jakarta.inject.Inject; + import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.StringTokenizer; +import org.glassfish.api.admin.AccessRequired; +import org.glassfish.config.support.CommandTarget; +import org.glassfish.hk2.api.ServiceLocator; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.ConfigBeanProxy; + /** * @author Masoud Kalali */ diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/CreateModuleConfigCommand.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/CreateModuleConfigCommand.java index 42ae4b5ff1a..1e810ce0f7c 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/CreateModuleConfigCommand.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/CreateModuleConfigCommand.java @@ -16,8 +16,6 @@ package com.sun.enterprise.config.modularity.command; -import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.*; - import com.sun.enterprise.config.modularity.ConfigModularityUtils; import com.sun.enterprise.config.modularity.annotation.CustomConfiguration; import com.sun.enterprise.config.modularity.customization.ConfigBeanDefaultValue; @@ -29,6 +27,17 @@ import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -49,16 +58,11 @@ import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.Dom; -import jakarta.inject.Inject; -import jakarta.inject.Named; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.CREATE_MODULE_CONFIG_CREATING_ALL_FAILED; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.CREATE_MODULE_CONFIG_CREATING_FOR_SERVICE_NAME_FAILED; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.CREATE_MODULE_CONFIG_FAILURE; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.CREATE_MODULE_CONFIG_SHOW_ALL_FAILED; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.getLogger; /** * A remote command to create the default configuration for a given service using the snippets available in the relevant diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/DeleteModuleConfigCommand.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/DeleteModuleConfigCommand.java index af1e0197b81..b211a1ad1e2 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/DeleteModuleConfigCommand.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/DeleteModuleConfigCommand.java @@ -16,8 +16,6 @@ package com.sun.enterprise.config.modularity.command; -import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.*; - import com.sun.enterprise.config.modularity.ConfigModularityUtils; import com.sun.enterprise.config.modularity.customization.ConfigBeanDefaultValue; import com.sun.enterprise.config.modularity.customization.ConfigCustomizationToken; @@ -28,6 +26,18 @@ import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import java.beans.PropertyVetoException; +import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -50,17 +60,8 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; -import jakarta.inject.Named; - -import java.beans.PropertyVetoException; -import java.lang.reflect.Method; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.DELETE_MODULE_CONFIG_FAILED_DELETING_DEPENDENT; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.getLogger; /** * A remote command to delete a module's configuration. diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/GetActiveConfigCommand.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/GetActiveConfigCommand.java index 9ecbad6a357..4b9641c4d2d 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/GetActiveConfigCommand.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/command/GetActiveConfigCommand.java @@ -16,8 +16,6 @@ package com.sun.enterprise.config.modularity.command; -import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.*; - import com.sun.enterprise.config.modularity.ConfigModularityUtils; import com.sun.enterprise.config.modularity.annotation.CustomConfiguration; import com.sun.enterprise.config.modularity.customization.ConfigBeanDefaultValue; @@ -28,6 +26,18 @@ import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -48,17 +58,8 @@ import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigBeanProxy; -import jakarta.inject.Inject; -import jakarta.inject.Named; - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.GET_ACTIVE_CONFIG_FOR_SERVICE_FAILED; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.getLogger; /** * Get the current active configuration of a service and print it out for the user's review. diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/customization/ConfigBeanDefaultValue.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/customization/ConfigBeanDefaultValue.java index 0407f714fd1..b12d49d7edd 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/customization/ConfigBeanDefaultValue.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/customization/ConfigBeanDefaultValue.java @@ -16,12 +16,6 @@ package com.sun.enterprise.config.modularity.customization; -/** - * @author Masoud Kalali - */ - -import org.jvnet.hk2.config.ConfigBeanProxy; - import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; @@ -29,6 +23,12 @@ import java.util.List; import java.util.Scanner; +/** + * @author Masoud Kalali + */ + +import org.jvnet.hk2.config.ConfigBeanProxy; + /** * Carries the default configuration values for a ConfigBeanProxy */ diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ConfigurationParser.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ConfigurationParser.java index b3112f9b80d..4dcd70d35cf 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ConfigurationParser.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ConfigurationParser.java @@ -20,6 +20,16 @@ import com.sun.enterprise.config.modularity.customization.ConfigBeanDefaultValue; import com.sun.enterprise.config.serverbeans.ConfigLoader; import com.sun.enterprise.config.util.ConfigApiLoggerInfo; + +import jakarta.inject.Inject; + +import java.beans.PropertyVetoException; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.xml.stream.XMLStreamReader; + import org.glassfish.config.support.GlassFishConfigBean; import org.glassfish.hk2.api.ServiceLocator; import org.jvnet.hk2.annotations.Service; @@ -32,14 +42,6 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; -import javax.xml.stream.XMLStreamReader; - -import java.beans.PropertyVetoException; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * This is a class to create the ConfigBeanProxy from the xml an xml snippet * diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ConfigurationPopulator.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ConfigurationPopulator.java index b7028d4e869..0ba1ebad23d 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ConfigurationPopulator.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ConfigurationPopulator.java @@ -17,20 +17,21 @@ package com.sun.enterprise.config.modularity.parser; import com.sun.enterprise.config.util.ConfigApiLoggerInfo; -import org.jvnet.hk2.config.ConfigBeanProxy; -import org.jvnet.hk2.config.ConfigParser; -import org.jvnet.hk2.config.Dom; -import org.jvnet.hk2.config.DomDocument; - -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.util.logging.Level; import java.util.logging.Logger; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; + +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.ConfigParser; +import org.jvnet.hk2.config.Dom; +import org.jvnet.hk2.config.DomDocument; + /** * populate the a DomDocument from the given configuration snippet file containing a config bean configuration. * diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ModuleConfigurationLoader.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ModuleConfigurationLoader.java index 9bc41633f93..ccbfc6f9179 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ModuleConfigurationLoader.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ModuleConfigurationLoader.java @@ -22,6 +22,11 @@ import com.sun.enterprise.config.modularity.customization.ConfigBeanDefaultValue; import com.sun.enterprise.module.bootstrap.StartupContext; +import jakarta.inject.Inject; + +import java.beans.PropertyVetoException; +import java.util.List; + import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.api.admin.config.ConfigExtension; import org.glassfish.hk2.api.ServiceLocator; @@ -34,11 +39,6 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; - -import java.beans.PropertyVetoException; -import java.util.List; - /** * Containing shared functionalists between different derived classes like ConfigSnippetLoader and so on. Shared * functionalists includes finding, loading the configuration and creating a ConFigBean from it. diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/AccessLog.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/AccessLog.java index e14bd684441..c1bc4878870 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/AccessLog.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/AccessLog.java @@ -17,15 +17,15 @@ package com.sun.enterprise.config.serverbeans; -import jakarta.validation.constraints.Min; import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; import java.beans.PropertyVetoException; import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.types.PropertyBag; /** diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Application.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Application.java index 73e1187f842..81c082b01b9 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Application.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Application.java @@ -23,26 +23,26 @@ import java.beans.PropertyVetoException; import java.io.File; +import java.net.URI; +import java.net.URISyntaxException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Properties; import java.util.logging.Level; -import java.net.URISyntaxException; -import java.net.URI; -import org.jvnet.hk2.config.types.Property; -import org.jvnet.hk2.config.types.PropertyBag; +import org.glassfish.api.admin.RestRedirect; +import org.glassfish.api.admin.RestRedirects; import org.glassfish.api.admin.config.ApplicationName; import org.glassfish.api.admin.config.PropertiesDesc; -import org.glassfish.api.admin.RestRedirects; -import org.glassfish.api.admin.RestRedirect; import org.glassfish.api.deployment.DeployCommandParameters; import org.glassfish.quality.ToDo; import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.Element; +import org.jvnet.hk2.config.types.Property; +import org.jvnet.hk2.config.types.PropertyBag; import static java.util.logging.Logger.getAnonymousLogger; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ApplicationRef.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ApplicationRef.java index c9b97207b5f..dc5bceb7399 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ApplicationRef.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ApplicationRef.java @@ -18,15 +18,15 @@ package com.sun.enterprise.config.serverbeans; import jakarta.validation.Payload; -import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import java.beans.PropertyVetoException; import org.glassfish.api.Param; import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Configured; import static org.glassfish.config.support.Constants.NAME_APP_REGEX; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/AvailabilityService.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/AvailabilityService.java index d32935bfb72..f3c261d5813 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/AvailabilityService.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/AvailabilityService.java @@ -26,9 +26,9 @@ import org.glassfish.api.admin.config.PropertiesDesc; import org.glassfish.quality.ToDo; import org.jvnet.hk2.config.Attribute; +import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.Element; -import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.types.Property; import org.jvnet.hk2.config.types.PropertyBag; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Clusters.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Clusters.java index 865e9d85615..0df560b8f5d 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Clusters.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Clusters.java @@ -23,9 +23,9 @@ import org.glassfish.config.support.Create; import org.glassfish.config.support.Delete; import org.glassfish.config.support.TypeAndNameResolver; +import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.Element; -import org.jvnet.hk2.config.ConfigBeanProxy; /** * Clusters configuration. diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ConfigBeansUtilities.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ConfigBeansUtilities.java index 730e266aa67..7dba684193f 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ConfigBeansUtilities.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ConfigBeansUtilities.java @@ -20,13 +20,13 @@ import jakarta.inject.Inject; import jakarta.inject.Singleton; +import java.io.PrintWriter; +import java.io.StringWriter; import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.io.PrintWriter; -import java.io.StringWriter; import java.util.Objects; import org.glassfish.api.admin.config.ApplicationName; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/CopyConfig.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/CopyConfig.java index 18f16e38a8a..240e3de5589 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/CopyConfig.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/CopyConfig.java @@ -19,14 +19,9 @@ import com.sun.enterprise.config.util.ConfigApiLoggerInfo; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.io.FileUtils; -import org.glassfish.api.Param; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.config.support.GenericCrudCommand; -import org.glassfish.server.ServerEnvironmentImpl; -import org.jvnet.hk2.config.TransactionFailure; import jakarta.inject.Inject; + import java.beans.PropertyVetoException; import java.io.File; import java.io.IOException; @@ -35,6 +30,13 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.config.support.GenericCrudCommand; +import org.glassfish.server.ServerEnvironmentImpl; +import org.jvnet.hk2.config.TransactionFailure; + /** * This is the abstract class which will be used by the config beans {@link Cluster} and {@link Server} classes to copy * the default-configs diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/DasConfig.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/DasConfig.java index ec575c93164..335e2696389 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/DasConfig.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/DasConfig.java @@ -25,9 +25,9 @@ import org.glassfish.api.admin.config.PropertiesDesc; import org.glassfish.quality.ToDo; import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.Element; -import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Configured; +import org.jvnet.hk2.config.Element; import org.jvnet.hk2.config.types.Property; import org.jvnet.hk2.config.types.PropertyBag; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/DiagnosticService.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/DiagnosticService.java index 6f83f0c0c77..0f438af472d 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/DiagnosticService.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/DiagnosticService.java @@ -25,9 +25,9 @@ import org.glassfish.api.admin.config.PropertiesDesc; import org.glassfish.quality.ToDo; import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.Element; -import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Configured; +import org.jvnet.hk2.config.Element; import org.jvnet.hk2.config.types.Property; import org.jvnet.hk2.config.types.PropertyBag; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/DomainExtensionResolver.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/DomainExtensionResolver.java index bf4c757b75e..7f9206fd364 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/DomainExtensionResolver.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/DomainExtensionResolver.java @@ -17,6 +17,7 @@ package com.sun.enterprise.config.serverbeans; import jakarta.inject.Inject; + import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.config.support.CrudResolver; import org.jvnet.hk2.annotations.Service; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Engine.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Engine.java index cd39ee2bc7f..e86c322d695 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Engine.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Engine.java @@ -25,9 +25,9 @@ import org.glassfish.api.admin.config.PropertiesDesc; import org.glassfish.quality.ToDo; import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.ConfigSupport; +import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.Element; import org.jvnet.hk2.config.TransactionFailure; import org.jvnet.hk2.config.types.Property; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/FailureDetection.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/FailureDetection.java index be572b3d124..31ee3b86c4e 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/FailureDetection.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/FailureDetection.java @@ -23,8 +23,8 @@ import java.beans.PropertyVetoException; import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Configured; /** *
      diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/HttpAccessLog.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/HttpAccessLog.java index 2223fa33837..1c38442c919 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/HttpAccessLog.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/HttpAccessLog.java @@ -20,8 +20,8 @@ import java.beans.PropertyVetoException; import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Configured; /** * diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/JavaConfig.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/JavaConfig.java index 66e91f5cfbb..0e96f449ac1 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/JavaConfig.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/JavaConfig.java @@ -23,14 +23,14 @@ import java.util.List; import java.util.StringTokenizer; -import org.glassfish.api.admin.RestRedirects; import org.glassfish.api.admin.RestRedirect; +import org.glassfish.api.admin.RestRedirects; import org.glassfish.api.admin.config.PropertiesDesc; import org.glassfish.quality.ToDo; import org.jvnet.hk2.config.Attribute; +import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.Element; -import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.types.Property; import org.jvnet.hk2.config.types.PropertyBag; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/JmxConnector.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/JmxConnector.java index 8b81bfce23e..a38fd35c84e 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/JmxConnector.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/JmxConnector.java @@ -19,9 +19,9 @@ import com.sun.enterprise.config.serverbeans.customvalidators.ReferenceConstraint; +import jakarta.validation.Payload; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; -import jakarta.validation.Payload; import java.beans.PropertyVetoException; import java.util.List; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ListenerConfig.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ListenerConfig.java index 451dd7b14f6..d644e9031c9 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ListenerConfig.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ListenerConfig.java @@ -16,22 +16,20 @@ package com.sun.enterprise.config.serverbeans; -import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.Element; -import org.jvnet.hk2.config.Configured; -import org.jvnet.hk2.config.ConfigBeanProxy; +import jakarta.validation.constraints.NotNull; import java.beans.PropertyVetoException; import java.util.List; import org.glassfish.api.admin.config.PropertiesDesc; +import org.glassfish.quality.ToDo; +import org.jvnet.hk2.config.Attribute; +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Configured; +import org.jvnet.hk2.config.Element; import org.jvnet.hk2.config.types.Property; import org.jvnet.hk2.config.types.PropertyBag; -import org.glassfish.quality.ToDo; - -import jakarta.validation.constraints.NotNull; - /** * Connects a specific listener class with specific managed objects */ diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/LogService.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/LogService.java index e2750f82c8e..1d44d5ca711 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/LogService.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/LogService.java @@ -17,15 +17,15 @@ package com.sun.enterprise.config.serverbeans; -import jakarta.validation.constraints.Min; import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; import java.beans.PropertyVetoException; import org.jvnet.hk2.config.Attribute; +import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.Element; -import org.jvnet.hk2.config.ConfigBeanProxy; /** * By default, logs would be kept in {@code $INSTANCE-ROOT/logs}. The following log files diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ManagedJobConfig.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ManagedJobConfig.java index ab0003c6a4f..4264e5fc901 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ManagedJobConfig.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ManagedJobConfig.java @@ -16,16 +16,16 @@ package com.sun.enterprise.config.serverbeans; -import org.glassfish.api.Param; import jakarta.validation.Payload; +import jakarta.validation.constraints.Pattern; + +import java.beans.PropertyVetoException; + +import org.glassfish.api.Param; import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.Configured; - import org.jvnet.hk2.config.types.PropertyBag; -import jakarta.validation.constraints.Pattern; -import java.beans.PropertyVetoException; - /** * This config bean will define parameters for Managed jobs A Managed job is a commands which is annotated with * either @ManagedJob,@Progress or running with --detach diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Mbean.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Mbean.java index 6a9c473970f..72e89b0e00d 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Mbean.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Mbean.java @@ -16,20 +16,20 @@ package com.sun.enterprise.config.serverbeans; -import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.Element; -import org.jvnet.hk2.config.Configured; -import org.jvnet.hk2.config.ConfigBeanProxy; +import jakarta.validation.constraints.NotNull; import java.beans.PropertyVetoException; import java.util.List; -import org.glassfish.api.admin.config.*; +import org.glassfish.api.admin.config.Named; +import org.glassfish.api.admin.config.PropertiesDesc; +import org.glassfish.quality.ToDo; +import org.jvnet.hk2.config.Attribute; +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Configured; +import org.jvnet.hk2.config.Element; import org.jvnet.hk2.config.types.Property; import org.jvnet.hk2.config.types.PropertyBag; -import org.glassfish.quality.ToDo; - -import jakarta.validation.constraints.NotNull; /** * Note on the Name of the MBean : It is a String that represents the name of the MBean. It is required that the name is diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ModuleLogLevels.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ModuleLogLevels.java index 293d5742e34..36bf6c5db06 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ModuleLogLevels.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ModuleLogLevels.java @@ -18,9 +18,9 @@ package com.sun.enterprise.config.serverbeans; import java.beans.PropertyVetoException; -import java.util.Map; import java.util.HashMap; import java.util.List; +import java.util.Map; import org.glassfish.api.admin.config.PropertiesDesc; import org.glassfish.quality.ToDo; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/MonitoringService.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/MonitoringService.java index 7ebe945f272..c839217adaf 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/MonitoringService.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/MonitoringService.java @@ -28,8 +28,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.logging.Logger; import java.util.logging.Level; +import java.util.logging.Logger; import org.glassfish.api.admin.config.ConfigExtension; import org.glassfish.api.admin.config.PropertiesDesc; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Node.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Node.java index 12299edb44b..727490c66bb 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Node.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Node.java @@ -17,12 +17,12 @@ package com.sun.enterprise.config.serverbeans; -import com.sun.enterprise.config.serverbeans.customvalidators.NotTargetKeyword; import com.sun.enterprise.config.serverbeans.customvalidators.NotDuplicateTargetName; +import com.sun.enterprise.config.serverbeans.customvalidators.NotTargetKeyword; import com.sun.enterprise.config.util.ConfigApiLoggerInfo; import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.net.NetUtils; import com.sun.enterprise.util.StringUtils; +import com.sun.enterprise.util.net.NetUtils; import jakarta.inject.Inject; import jakarta.validation.Payload; @@ -37,8 +37,8 @@ import org.glassfish.api.Param; import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.admin.config.Named; import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.api.admin.config.Named; import org.glassfish.api.admin.config.ReferenceContainer; import org.glassfish.config.support.CreationDecorator; import org.glassfish.config.support.DeletionDecorator; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Nodes.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Nodes.java index 49d2e337115..85c867613fd 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Nodes.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Nodes.java @@ -22,13 +22,15 @@ import java.util.Objects; import org.glassfish.api.I18n; -import org.glassfish.config.support.*; +import org.glassfish.config.support.Create; +import org.glassfish.config.support.Delete; +import org.glassfish.config.support.TypeAndNameResolver; import org.glassfish.hk2.api.ServiceLocator; +import org.jvnet.hk2.config.Attribute; +import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.Dom; import org.jvnet.hk2.config.Element; -import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.ConfigBeanProxy; /** * Nodes configuration. diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ResourcePool.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ResourcePool.java index 05577231f90..1623acd257c 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ResourcePool.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ResourcePool.java @@ -19,11 +19,11 @@ import com.sun.enterprise.config.serverbeans.customvalidators.ResourceNameConstraint; +import jakarta.validation.Payload; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import java.beans.PropertyVetoException; -import jakarta.validation.Payload; import org.jvnet.hk2.config.Attribute; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ResourcePoolReference.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ResourcePoolReference.java index 1b53406337b..63739231c00 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ResourcePoolReference.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/ResourcePoolReference.java @@ -16,11 +16,12 @@ package com.sun.enterprise.config.serverbeans; -import org.jvnet.hk2.config.Attribute; - import jakarta.validation.constraints.NotNull; + import java.beans.PropertyVetoException; +import org.jvnet.hk2.config.Attribute; + /** * This is an abstraction for a resource that refers a resource-pool. Samples are jdbc-resource and connector-resource. */ diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SecurityService.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SecurityService.java index 088a9dbb892..844a7a4d870 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SecurityService.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SecurityService.java @@ -23,8 +23,8 @@ import org.glassfish.api.admin.config.PropertiesDesc; import org.glassfish.quality.ToDo; import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.Element; import org.jvnet.hk2.config.types.Property; import org.jvnet.hk2.config.types.PropertyBag; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Servers.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Servers.java index 79bd3e23465..fdc6f89fbba 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Servers.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Servers.java @@ -17,8 +17,8 @@ package com.sun.enterprise.config.serverbeans; -import java.util.List; import java.util.ArrayList; +import java.util.List; import org.glassfish.api.I18n; import org.glassfish.config.support.Create; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SshAuth.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SshAuth.java index 085ed342a88..8bd9ee772f6 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SshAuth.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SshAuth.java @@ -19,10 +19,10 @@ import java.beans.PropertyVetoException; +import org.glassfish.api.Param; import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.Configured; -import org.glassfish.api.Param; /** * A cluster defines a homogeneous set of server instances that share diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SslClientConfig.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SslClientConfig.java index 5cefe648574..133c5a4c3f8 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SslClientConfig.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/SslClientConfig.java @@ -16,13 +16,13 @@ package com.sun.enterprise.config.serverbeans; +import java.beans.PropertyVetoException; + import org.glassfish.grizzly.config.dom.Ssl; import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.Element; -import java.beans.PropertyVetoException; - /** * Specifies the SSL configuration when the Application Server is making outbound IIOP/SSL connections. */ diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ConfigRefConstraint.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ConfigRefConstraint.java index 6d5a2cf1fb1..3d484404af0 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ConfigRefConstraint.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ConfigRefConstraint.java @@ -18,6 +18,7 @@ import jakarta.validation.Constraint; import jakarta.validation.Payload; + import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ConfigRefValidator.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ConfigRefValidator.java index e357f5cb3ba..1864f75ee94 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ConfigRefValidator.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ConfigRefValidator.java @@ -23,12 +23,14 @@ import com.sun.enterprise.config.serverbeans.Servers; import com.sun.enterprise.config.util.ConfigApiLoggerInfo; import com.sun.enterprise.util.LocalStringManagerImpl; -import java.util.logging.Logger; +import com.sun.enterprise.util.SystemPropertyConstants; + import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import jakarta.validation.Payload; -import com.sun.enterprise.util.SystemPropertyConstants; +import java.util.logging.Logger; + import org.glassfish.api.admin.config.Named; public class ConfigRefValidator implements ConstraintValidator, Payload { diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ContextRootCheck.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ContextRootCheck.java index 8e431b3c922..3261b27ffac 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ContextRootCheck.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ContextRootCheck.java @@ -16,13 +16,14 @@ package com.sun.enterprise.config.serverbeans.customvalidators; -import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.ElementType; import jakarta.validation.Constraint; import jakarta.validation.Payload; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + /** * ContextRootCheck constraint to verify a context root attribute is not a duplicate for a virtual server. * diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ContextRootCheckValidator.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ContextRootCheckValidator.java index ce40e78e812..9264109d725 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ContextRootCheckValidator.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ContextRootCheckValidator.java @@ -16,14 +16,19 @@ package com.sun.enterprise.config.serverbeans.customvalidators; -import com.sun.enterprise.config.serverbeans.*; +import com.sun.enterprise.config.serverbeans.Application; +import com.sun.enterprise.config.serverbeans.ApplicationRef; +import com.sun.enterprise.config.serverbeans.ConfigBeansUtilities; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; -import java.util.Arrays; -import java.util.List; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import jakarta.validation.UnexpectedTypeException; +import java.util.Arrays; +import java.util.List; + import org.glassfish.hk2.api.ServiceLocator; import org.jvnet.hk2.config.Dom; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/FileRealmPropertyCheck.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/FileRealmPropertyCheck.java index 98045ca7f73..897ea207e8d 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/FileRealmPropertyCheck.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/FileRealmPropertyCheck.java @@ -16,15 +16,17 @@ package com.sun.enterprise.config.serverbeans.customvalidators; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + +import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.ElementType.METHOD; + import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import jakarta.validation.Constraint; -import jakarta.validation.Payload; @Retention(RUNTIME) @Target({ METHOD, FIELD, TYPE }) diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/FileRealmPropertyCheckValidator.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/FileRealmPropertyCheckValidator.java index dc1faa2d99e..9404f4ab278 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/FileRealmPropertyCheckValidator.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/FileRealmPropertyCheckValidator.java @@ -17,8 +17,10 @@ package com.sun.enterprise.config.serverbeans.customvalidators; import com.sun.enterprise.config.serverbeans.AuthRealm; + import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; + import org.jvnet.hk2.config.types.Property; /** diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/JDBCRealmPropertyCheck.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/JDBCRealmPropertyCheck.java index 793b7d6262c..784be1cfc1c 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/JDBCRealmPropertyCheck.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/JDBCRealmPropertyCheck.java @@ -16,15 +16,17 @@ package com.sun.enterprise.config.serverbeans.customvalidators; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + +import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.ElementType.METHOD; + import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import jakarta.validation.Constraint; -import jakarta.validation.Payload; @Retention(RUNTIME) @Target({ METHOD, FIELD, TYPE }) diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/JDBCRealmPropertyCheckValidator.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/JDBCRealmPropertyCheckValidator.java index e5932f46a1f..ed8251248b6 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/JDBCRealmPropertyCheckValidator.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/JDBCRealmPropertyCheckValidator.java @@ -17,10 +17,13 @@ package com.sun.enterprise.config.serverbeans.customvalidators; import com.sun.enterprise.config.serverbeans.AuthRealm; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; + import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; + +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; + import org.jvnet.hk2.config.types.Property; /** diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/JavaClassName.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/JavaClassName.java index ebd3de40162..d5f75315ed0 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/JavaClassName.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/JavaClassName.java @@ -16,14 +16,16 @@ package com.sun.enterprise.config.serverbeans.customvalidators; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + +import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import java.lang.annotation.Documented; + import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import jakarta.validation.Constraint; -import jakarta.validation.Payload; /** * User-defined constraint to check if an attribute is a valid Java class name The class name can be a fully qualified diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/LDAPRealmPropertyCheck.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/LDAPRealmPropertyCheck.java index 47c5c854230..d5e94741eae 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/LDAPRealmPropertyCheck.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/LDAPRealmPropertyCheck.java @@ -16,15 +16,17 @@ package com.sun.enterprise.config.serverbeans.customvalidators; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + +import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.ElementType.METHOD; + import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import jakarta.validation.Constraint; -import jakarta.validation.Payload; @Retention(RUNTIME) @Target({ METHOD, FIELD, TYPE }) diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/LDAPRealmPropertyCheckValidator.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/LDAPRealmPropertyCheckValidator.java index a1b517b3708..fe3af37f35b 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/LDAPRealmPropertyCheckValidator.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/LDAPRealmPropertyCheckValidator.java @@ -17,8 +17,10 @@ package com.sun.enterprise.config.serverbeans.customvalidators; import com.sun.enterprise.config.serverbeans.AuthRealm; + import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; + import org.jvnet.hk2.config.types.Property; /** diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/NotDuplicateTargetName.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/NotDuplicateTargetName.java index ac0271e532e..c499c3dcf45 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/NotDuplicateTargetName.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/NotDuplicateTargetName.java @@ -16,13 +16,14 @@ package com.sun.enterprise.config.serverbeans.customvalidators; -import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.ElementType; import jakarta.validation.Constraint; import jakarta.validation.Payload; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + /** * NotDuplicateTargetName class-level constraint to verify that the name attribute is not already in use by another * target (cluster, instance, node, config). diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/NotDuplicateTargetNameValidator.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/NotDuplicateTargetNameValidator.java index e1209ace20c..e61fe48b64f 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/NotDuplicateTargetNameValidator.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/NotDuplicateTargetNameValidator.java @@ -17,13 +17,15 @@ package com.sun.enterprise.config.serverbeans.customvalidators; -import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.config.serverbeans.Cluster; import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Node; import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Node; +import com.sun.enterprise.config.serverbeans.Server; + import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; + import org.glassfish.api.admin.config.Named; import org.glassfish.hk2.api.ServiceLocator; import org.jvnet.hk2.config.Dom; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/NotTargetKeyword.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/NotTargetKeyword.java index 333ae23152b..a6ae4ed5ddc 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/NotTargetKeyword.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/NotTargetKeyword.java @@ -16,13 +16,14 @@ package com.sun.enterprise.config.serverbeans.customvalidators; -import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.ElementType; import jakarta.validation.Constraint; import jakarta.validation.Payload; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + /** * NotTargetKeyword constraint to verify a name attribute is not a reserved word like 'domain'. * diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/NotTargetKeywordValidator.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/NotTargetKeywordValidator.java index b1a7db9edb1..242ca0ded5e 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/NotTargetKeywordValidator.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/NotTargetKeywordValidator.java @@ -18,6 +18,7 @@ import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; + import java.util.HashSet; /** diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ReferenceConstraint.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ReferenceConstraint.java index 3cb618b6b50..7b89fbe4b5b 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ReferenceConstraint.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ReferenceConstraint.java @@ -16,14 +16,15 @@ package com.sun.enterprise.config.serverbeans.customvalidators; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; - -import java.lang.annotation.Target; import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.ElementType; -import jakarta.validation.Constraint; -import jakarta.validation.Payload; +import java.lang.annotation.Target; + import org.jvnet.hk2.config.ConfigBeanProxy; /** diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ReferenceValidator.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ReferenceValidator.java index 0cf2307b2dc..f7e9ffd7c40 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ReferenceValidator.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ReferenceValidator.java @@ -17,13 +17,15 @@ package com.sun.enterprise.config.serverbeans.customvalidators; import com.sun.enterprise.util.LocalStringManagerImpl; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Collection; + import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import jakarta.validation.UnexpectedTypeException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Collection; + import org.glassfish.hk2.api.ServiceLocator; import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.Dom; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ResourceNameConstraint.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ResourceNameConstraint.java index 1e4be53a5ed..8657aaea0de 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ResourceNameConstraint.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ResourceNameConstraint.java @@ -18,6 +18,7 @@ import jakarta.validation.Constraint; import jakarta.validation.Payload; + import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/SolarisRealmPropertyCheck.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/SolarisRealmPropertyCheck.java index 8a3876a68ec..62f3ddb8329 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/SolarisRealmPropertyCheck.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/SolarisRealmPropertyCheck.java @@ -16,15 +16,17 @@ package com.sun.enterprise.config.serverbeans.customvalidators; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + +import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.ElementType.METHOD; + import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import jakarta.validation.Constraint; -import jakarta.validation.Payload; @Retention(RUNTIME) @Target({ METHOD, FIELD, TYPE }) diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/SolarisRealmPropertyCheckValidator.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/SolarisRealmPropertyCheckValidator.java index 9a0635afbb9..156121e1553 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/SolarisRealmPropertyCheckValidator.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/SolarisRealmPropertyCheckValidator.java @@ -17,8 +17,10 @@ package com.sun.enterprise.config.serverbeans.customvalidators; import com.sun.enterprise.config.serverbeans.AuthRealm; + import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; + import org.jvnet.hk2.config.types.Property; /** diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/ConfigApiLoggerInfo.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/ConfigApiLoggerInfo.java index 3378f57f2fd..607786f3640 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/ConfigApiLoggerInfo.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/ConfigApiLoggerInfo.java @@ -17,13 +17,13 @@ package com.sun.enterprise.config.util; +import java.text.MessageFormat; +import java.util.logging.Logger; + import org.glassfish.logging.annotation.LogMessageInfo; import org.glassfish.logging.annotation.LogMessagesResourceBundle; import org.glassfish.logging.annotation.LoggerInfo; -import java.text.MessageFormat; -import java.util.logging.Logger; - /** * Logger information for the config-api module. * diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/InstanceRegisterInstanceCommandParameters.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/InstanceRegisterInstanceCommandParameters.java index 0e197788bde..9bb38ef3895 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/InstanceRegisterInstanceCommandParameters.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/InstanceRegisterInstanceCommandParameters.java @@ -17,6 +17,7 @@ package com.sun.enterprise.config.util; import java.util.Properties; + import org.glassfish.api.Param; /** diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/PortBaseHelper.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/PortBaseHelper.java index 94aa5f6063f..5f024a6faf8 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/PortBaseHelper.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/PortBaseHelper.java @@ -18,13 +18,36 @@ import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.config.serverbeans.SystemProperty; +import com.sun.enterprise.universal.i18n.LocalStringsImpl; +import com.sun.enterprise.util.net.NetUtils; + import java.beans.PropertyVetoException; import java.util.logging.Level; import java.util.logging.Logger; + import org.jvnet.hk2.config.TransactionFailure; -import com.sun.enterprise.universal.i18n.LocalStringsImpl; -import com.sun.enterprise.util.net.NetUtils; -import static com.sun.enterprise.config.util.PortConstants.*; + +import static com.sun.enterprise.config.util.PortConstants.ADMIN; +import static com.sun.enterprise.config.util.PortConstants.DEBUG; +import static com.sun.enterprise.config.util.PortConstants.HTTP; +import static com.sun.enterprise.config.util.PortConstants.HTTPS; +import static com.sun.enterprise.config.util.PortConstants.IIOP; +import static com.sun.enterprise.config.util.PortConstants.IIOPM; +import static com.sun.enterprise.config.util.PortConstants.IIOPS; +import static com.sun.enterprise.config.util.PortConstants.JMS; +import static com.sun.enterprise.config.util.PortConstants.JMX; +import static com.sun.enterprise.config.util.PortConstants.OSGI; +import static com.sun.enterprise.config.util.PortConstants.PORTBASE_ADMINPORT_SUFFIX; +import static com.sun.enterprise.config.util.PortConstants.PORTBASE_DEBUG_SUFFIX; +import static com.sun.enterprise.config.util.PortConstants.PORTBASE_HTTPSSL_SUFFIX; +import static com.sun.enterprise.config.util.PortConstants.PORTBASE_IIOPMUTUALAUTH_SUFFIX; +import static com.sun.enterprise.config.util.PortConstants.PORTBASE_IIOPSSL_SUFFIX; +import static com.sun.enterprise.config.util.PortConstants.PORTBASE_IIOP_SUFFIX; +import static com.sun.enterprise.config.util.PortConstants.PORTBASE_INSTANCE_SUFFIX; +import static com.sun.enterprise.config.util.PortConstants.PORTBASE_JMS_SUFFIX; +import static com.sun.enterprise.config.util.PortConstants.PORTBASE_JMX_SUFFIX; +import static com.sun.enterprise.config.util.PortConstants.PORTBASE_OSGI_SUFFIX; +import static com.sun.enterprise.config.util.PortConstants.PORT_MAX_VAL; /** * Port base utilities used by create-local-instance. Similar to create-domain. diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/PortConstants.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/PortConstants.java index e06603227ba..06906d3d307 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/PortConstants.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/PortConstants.java @@ -16,7 +16,8 @@ package com.sun.enterprise.config.util; -import java.util.*; +import java.util.Arrays; +import java.util.List; /** * diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/PortManager.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/PortManager.java index c7bb78978f0..64dfed99294 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/PortManager.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/PortManager.java @@ -22,7 +22,7 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.config.serverbeans.SystemProperty; -import com.sun.enterprise.util.net.*; +import com.sun.enterprise.util.net.NetUtils; import java.beans.PropertyVetoException; import java.util.ArrayList; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/PortUtils.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/PortUtils.java index 5e775fece01..fdd8acf0ab9 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/PortUtils.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/PortUtils.java @@ -19,10 +19,15 @@ import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.config.serverbeans.SystemProperty; import com.sun.enterprise.util.net.NetUtils; -import java.util.*; + +import java.util.List; +import java.util.Set; +import java.util.TreeSet; + import org.jvnet.hk2.config.TransactionFailure; + +import static com.sun.enterprise.config.util.PortConstants.PORTSLIST; import static com.sun.enterprise.util.net.NetUtils.MAX_PORT; -import static com.sun.enterprise.config.util.PortConstants.*; /** * static methods useful for dealing with ports. diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/ServerHelper.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/ServerHelper.java index dfa378f79d1..1f0fdf3828f 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/ServerHelper.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/ServerHelper.java @@ -22,10 +22,10 @@ import com.sun.enterprise.config.serverbeans.Node; import com.sun.enterprise.config.serverbeans.Nodes; import com.sun.enterprise.config.serverbeans.Server; -import com.sun.enterprise.config.serverbeans.SystemProperty; import com.sun.enterprise.config.serverbeans.ServerTags; -import com.sun.enterprise.util.SystemPropertyConstants; +import com.sun.enterprise.config.serverbeans.SystemProperty; import com.sun.enterprise.util.StringUtils; +import com.sun.enterprise.util.SystemPropertyConstants; import com.sun.enterprise.util.net.NetUtils; import java.util.List; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/ServerPorts.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/ServerPorts.java index 0568497aa0c..887e0f2dbc6 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/ServerPorts.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/ServerPorts.java @@ -23,7 +23,11 @@ import com.sun.enterprise.config.serverbeans.SystemProperty; import com.sun.enterprise.util.StringUtils; import com.sun.enterprise.util.net.NetUtils; -import java.util.*; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import static com.sun.enterprise.config.util.PortConstants.PORTSLIST; /** diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/BaseLegacyConfigurationUpgrade.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/BaseLegacyConfigurationUpgrade.java index 8b19463a1ac..c4874365633 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/BaseLegacyConfigurationUpgrade.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/BaseLegacyConfigurationUpgrade.java @@ -23,7 +23,6 @@ import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.config.LegacyConfigurationUpgrade; -import static org.glassfish.config.support.IntrospectionUtils.*; import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.Dom; @@ -32,6 +31,8 @@ import org.jvnet.hk2.config.types.Property; import org.jvnet.hk2.config.types.PropertyBag; +import static org.glassfish.config.support.IntrospectionUtils.setProperty; + public abstract class BaseLegacyConfigurationUpgrade implements LegacyConfigurationUpgrade { protected void report(AdminCommandContext context, final String message) { context.getActionReport().setMessage("DEPRECATION WARNING: " + message); diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ConfigConfigBeanListener.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ConfigConfigBeanListener.java index 04d614fbe93..cb6374766bc 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ConfigConfigBeanListener.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ConfigConfigBeanListener.java @@ -16,14 +16,16 @@ package org.glassfish.config.support; -import java.beans.PropertyChangeEvent; -import java.util.logging.Level; -import java.util.logging.Logger; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.util.ConfigApiLoggerInfo; import jakarta.inject.Inject; import jakarta.inject.Named; -import com.sun.enterprise.config.util.ConfigApiLoggerInfo; +import java.beans.PropertyChangeEvent; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.StartupRunLevel; import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.hk2.api.ServiceLocator; @@ -37,8 +39,8 @@ import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.UnprocessedChangeEvents; -import com.sun.enterprise.config.serverbeans.Config; -import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.*; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.AddingDefaultInstanceIndexFor; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.removingDefaultInstanceIndexFor; /** * Listens for changes to the Config for the current server and adds an index for the name diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ConfigurationAccess.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ConfigurationAccess.java index b86a6f948eb..23bb7ad1db9 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ConfigurationAccess.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ConfigurationAccess.java @@ -16,12 +16,12 @@ package org.glassfish.config.support; -import org.jvnet.hk2.annotations.Contract; - import java.io.IOException; import java.util.concurrent.TimeoutException; import java.util.concurrent.locks.Lock; +import org.jvnet.hk2.annotations.Contract; + /** * Service to lock the configuration elements for a particular domain configuration. All changes to the domain * configuration changes being the domain.xml or the security artifacts must go through this service to ensure proper diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ConfigurationPersistence.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ConfigurationPersistence.java index 5b1244f6e20..43b90a2d4c5 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ConfigurationPersistence.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ConfigurationPersistence.java @@ -16,11 +16,12 @@ package org.glassfish.config.support; -import org.jvnet.hk2.annotations.Contract; -import org.jvnet.hk2.config.DomDocument; +import java.io.IOException; import javax.xml.stream.XMLStreamException; -import java.io.IOException; + +import org.jvnet.hk2.annotations.Contract; +import org.jvnet.hk2.config.DomDocument; /** * Contract defining services capable of persisting the configuration. diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/Create.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/Create.java index efbb6385d94..956b286755d 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/Create.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/Create.java @@ -16,15 +16,15 @@ package org.glassfish.config.support; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + import org.glassfish.api.I18n; +import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.ExecuteOn; import org.jvnet.hk2.config.GenerateServiceFromMethod; import org.jvnet.hk2.config.GeneratedServiceName; -import org.glassfish.api.admin.AdminCommand; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/CreationDecorator.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/CreationDecorator.java index e59291fe94d..69223323834 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/CreationDecorator.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/CreationDecorator.java @@ -16,15 +16,14 @@ package org.glassfish.config.support; -import org.glassfish.api.admin.AdminCommandContext; +import java.beans.PropertyVetoException; -import org.jvnet.hk2.annotations.Service; +import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.TransactionFailure; -import java.beans.PropertyVetoException; - /** * An element decorator decorates a newly added configuration element, usually added through the generic create command * implementation. diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/CrudResolver.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/CrudResolver.java index 96f40adc970..a5209945760 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/CrudResolver.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/CrudResolver.java @@ -16,14 +16,14 @@ package org.glassfish.config.support; -import org.jvnet.hk2.annotations.Optional; +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import org.glassfish.api.admin.AdminCommandContext; import org.jvnet.hk2.annotations.Contract; +import org.jvnet.hk2.annotations.Optional; import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigBeanProxy; -import org.glassfish.api.admin.AdminCommandContext; - -import jakarta.inject.Inject; -import jakarta.inject.Named; /** * A config resolver is responsible for finding the target object of a specified type on which a creation command diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DasReaderFilter.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DasReaderFilter.java index 37faf89544d..2cc549dbe27 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DasReaderFilter.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DasReaderFilter.java @@ -16,7 +16,8 @@ package org.glassfish.config.support; -import java.net.*; +import java.net.URL; + import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DefaultConfigUpgrade.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DefaultConfigUpgrade.java index c1004f5cfa9..3a9ae0e445a 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DefaultConfigUpgrade.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DefaultConfigUpgrade.java @@ -85,7 +85,67 @@ import org.jvnet.hk2.config.TransactionFailure; import org.jvnet.hk2.config.types.Property; -import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.*; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.ProblemParsingNetworkListener; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.ProblemParsingProviderConfig; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.createProviderConfigPropertyFailed; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.createProviderConfigRequestPolicyFailed; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.defaultConfigUpgradeFailure; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.existingDefaultConfig; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failedToCreateAdminService; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreateModuleLogLevel; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreatingAuditModule; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreatingAuditModuleAttr; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreatingAuthRealm; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreatingAuthRealmProperty; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreatingAvailabilityServiceConfig; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreatingFileCacheConfig; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreatingHttpConfig; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreatingHttpRedirect; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreatingHttpServiceVS; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreatingJaccProvider; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreatingJaccProviderAttr; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreatingJavaConfigObject; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreatingLogService; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreatingNetworkConfig; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreatingNetworkListener; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreatingNetworkListeners; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreatingPortUnification; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreatingProtocolConfig; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreatingProtocolFinder; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreatingProtocolsConfig; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreatingProviderConfig; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreatingSSLConfig; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreatingSecurityService; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreatingSecurityServiceConfig; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreatingSystemProperty; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreatingTransportConfig; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureCreatingTransportsConfig; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureParsingAuditModuleProp; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureParsingAuthRealm; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureParsingAuthRealmProperty; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureParsingTransportsConfig; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureToCreateThreadPoolsObject; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.failureToCreateThreadpoolObject; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.installRootIsNull; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.problemParsingAdminService; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.problemParsingFileCacheElement; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.problemParsingHttpServiceVs; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.problemParsingJaacProvider; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.problemParsingJaacProviderAttr; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.problemParsingJvmOptions; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.problemParsingModuleLogLevel; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.problemParsingNetworkListeners; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.problemParsingProtocolElement; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.problemParsingProtocolFinder; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.problemParsingProtocolsConfig; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.problemParsingProviderConfigProp; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.problemParsingRequestPolicyProp; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.problemParsingSSlElement; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.problemParsingSecurityServiceConfig; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.problemParsingSystemProperty; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.problemParsingThreadPoolElement; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.problemParsingTransportConfig; +import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.runningDefaultConfigUpgrade; import static javax.xml.stream.XMLStreamConstants.END_ELEMENT; import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/Delete.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/Delete.java index 1cbc52215f6..2252a715ea5 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/Delete.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/Delete.java @@ -16,15 +16,15 @@ package org.glassfish.config.support; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + import org.glassfish.api.I18n; import org.glassfish.api.admin.ExecuteOn; import org.jvnet.hk2.config.GenerateServiceFromMethod; import org.jvnet.hk2.config.GeneratedServiceName; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - import static java.lang.annotation.RetentionPolicy.RUNTIME; /** diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DeletionDecorator.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DeletionDecorator.java index 749711eb667..63210f3a9f3 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DeletionDecorator.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DeletionDecorator.java @@ -16,15 +16,14 @@ package org.glassfish.config.support; -import org.glassfish.api.admin.AdminCommandContext; +import java.beans.PropertyVetoException; -import org.jvnet.hk2.annotations.Service; +import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.TransactionFailure; -import java.beans.PropertyVetoException; - /** * A decorator for acting upon a configuration element deletion. * diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DomainXml.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DomainXml.java index 96b60624f68..b75c83243f1 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DomainXml.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DomainXml.java @@ -63,7 +63,10 @@ import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.successfulCleanupWith; import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.successfulUpgrade; import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.totalTimeToParseDomain; -import static java.util.logging.Level.*; +import static java.util.logging.Level.CONFIG; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.SEVERE; +import static java.util.logging.Level.WARNING; /** * Locates and parses the portion of domain.xml that we care. diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DomainXmlPreParser.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DomainXmlPreParser.java index e87baa2940b..ac315d6fc34 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DomainXmlPreParser.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DomainXmlPreParser.java @@ -18,16 +18,30 @@ import com.sun.enterprise.util.StringUtils; import com.sun.enterprise.util.Utility; -import java.io.*; + import java.io.InputStream; +import java.io.InputStreamReader; import java.net.URL; import java.nio.charset.Charset; -import java.util.*; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; + import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; + import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; -import static org.glassfish.config.support.Constants.*; +import static org.glassfish.config.support.Constants.CLUSTER; +import static org.glassfish.config.support.Constants.CLUSTERS; +import static org.glassfish.config.support.Constants.CONFIG; +import static org.glassfish.config.support.Constants.CONFIGS; +import static org.glassfish.config.support.Constants.CONFIG_REF; +import static org.glassfish.config.support.Constants.NAME; +import static org.glassfish.config.support.Constants.REF; +import static org.glassfish.config.support.Constants.SERVER; +import static org.glassfish.config.support.Constants.SERVERS; +import static org.glassfish.config.support.Constants.SERVER_REF; /** * It is incredibly complex and difficult to do "perfect-parsing" when the elements aren't in the right order. These 3 diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GenericCreateCommand.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GenericCreateCommand.java index dab5274385e..4970a92e2b1 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GenericCreateCommand.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GenericCreateCommand.java @@ -18,26 +18,30 @@ import com.sun.enterprise.config.util.ConfigApiLoggerInfo; import com.sun.enterprise.util.AnnotationUtil; -import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.ExceptionUtil; +import com.sun.enterprise.util.LocalStringManagerImpl; -import java.util.logging.Level; - -import org.glassfish.api.ActionReport; -import org.glassfish.api.admin.*; -import org.glassfish.api.admin.config.Named; -import org.glassfish.common.util.admin.GenericCommandModel; -import org.glassfish.hk2.api.PerLookup; -import org.jvnet.hk2.config.*; - -import java.util.List; import java.beans.PropertyVetoException; import java.util.ArrayList; import java.util.Collection; +import java.util.List; +import java.util.logging.Level; +import org.glassfish.api.ActionReport; import org.glassfish.api.admin.AccessRequired.AccessCheck; +import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.AdminCommandSecurity; +import org.glassfish.api.admin.CommandModel; +import org.glassfish.api.admin.ManagedJob; +import org.glassfish.api.admin.config.Named; +import org.glassfish.common.util.admin.GenericCommandModel; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.ConfigSupport; +import org.jvnet.hk2.config.DomDocument; +import org.jvnet.hk2.config.SingleConfigCode; +import org.jvnet.hk2.config.TransactionFailure; /** * Generic create command implementation. diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GenericDeleteCommand.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GenericDeleteCommand.java index 6b785347611..65f552b71f2 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GenericDeleteCommand.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GenericDeleteCommand.java @@ -16,17 +16,9 @@ package org.glassfish.config.support; -import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.config.util.ConfigApiLoggerInfo; import com.sun.enterprise.util.AnnotationUtil; - -import java.util.logging.Level; - -import org.glassfish.api.ActionReport; -import org.glassfish.api.admin.*; -import org.glassfish.common.util.admin.GenericCommandModel; -import org.glassfish.hk2.api.PerLookup; -import org.jvnet.hk2.config.*; +import com.sun.enterprise.util.LocalStringManagerImpl; import jakarta.inject.Inject; @@ -34,10 +26,26 @@ import java.lang.reflect.Proxy; import java.util.ArrayList; import java.util.Collection; +import java.util.logging.Level; -import org.glassfish.api.admin.AdminCommandSecurity; +import org.glassfish.api.ActionReport; import org.glassfish.api.admin.AccessRequired.AccessCheck; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.AdminCommandSecurity; +import org.glassfish.api.admin.CommandModel; +import org.glassfish.api.admin.CommandRunner; +import org.glassfish.api.admin.ManagedJob; import org.glassfish.api.logging.LogHelper; +import org.glassfish.common.util.admin.GenericCommandModel; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.config.ConfigBean; +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.ConfigSupport; +import org.jvnet.hk2.config.DomDocument; +import org.jvnet.hk2.config.SingleConfigCode; +import org.jvnet.hk2.config.TransactionFailure; +import org.jvnet.hk2.config.WriteableView; /** * Implementation of the generic delete command diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GrizzlyConfigSchemaMigrator.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GrizzlyConfigSchemaMigrator.java index 0e604505db9..e50df2ede09 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GrizzlyConfigSchemaMigrator.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GrizzlyConfigSchemaMigrator.java @@ -16,6 +16,16 @@ package org.glassfish.config.support; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Configs; +import com.sun.enterprise.config.serverbeans.HttpService; +import com.sun.enterprise.config.serverbeans.JavaConfig; +import com.sun.enterprise.config.serverbeans.ThreadPools; +import com.sun.enterprise.config.serverbeans.VirtualServer; +import com.sun.enterprise.config.util.ConfigApiLoggerInfo; + +import jakarta.inject.Inject; + import java.beans.PropertyVetoException; import java.util.ArrayList; import java.util.Collection; @@ -24,14 +34,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Configs; -import com.sun.enterprise.config.serverbeans.JavaConfig; -import com.sun.enterprise.config.serverbeans.ThreadPools; -import com.sun.enterprise.config.serverbeans.VirtualServer; -import com.sun.enterprise.config.serverbeans.HttpService; -import com.sun.enterprise.config.util.ConfigApiLoggerInfo; - import org.glassfish.api.admin.config.ConfigurationUpgrade; import org.glassfish.grizzly.config.dom.FileCache; import org.glassfish.grizzly.config.dom.Http; @@ -43,16 +45,14 @@ import org.glassfish.grizzly.config.dom.Ssl; import org.glassfish.grizzly.config.dom.ThreadPool; import org.glassfish.grizzly.config.dom.Transports; -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PostConstruct; import org.glassfish.hk2.api.ServiceLocator; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; import org.jvnet.hk2.config.types.Property; -import jakarta.inject.Inject; - @SuppressWarnings({ "deprecation" }) @Service(name = "grizzlyconfigupgrade") public class GrizzlyConfigSchemaMigrator implements ConfigurationUpgrade, PostConstruct { diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/HttpServicePropertiesUpgrade.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/HttpServicePropertiesUpgrade.java index c474791ee11..b89ed814817 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/HttpServicePropertiesUpgrade.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/HttpServicePropertiesUpgrade.java @@ -22,6 +22,12 @@ import com.sun.enterprise.config.serverbeans.HttpService; import com.sun.enterprise.config.util.ConfigApiLoggerInfo; +import jakarta.inject.Inject; + +import java.util.Iterator; +import java.util.List; +import java.util.logging.Level; + import org.glassfish.api.admin.AdminCommandContext; import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigSupport; @@ -29,12 +35,6 @@ import org.jvnet.hk2.config.TransactionFailure; import org.jvnet.hk2.config.types.Property; -import jakarta.inject.Inject; - -import java.util.Iterator; -import java.util.List; -import java.util.logging.Level; - @Service public class HttpServicePropertiesUpgrade extends BaseLegacyConfigurationUpgrade { @Inject diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/InstanceReaderFilter.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/InstanceReaderFilter.java index 347370dc5d7..a25264a4d17 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/InstanceReaderFilter.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/InstanceReaderFilter.java @@ -17,12 +17,19 @@ package org.glassfish.config.support; import com.sun.enterprise.util.StringUtils; -import java.net.*; + +import java.net.URL; + import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; + import org.glassfish.config.support.DomainXmlPreParser.DomainXmlPreParserException; -import static org.glassfish.config.support.Constants.*; + +import static org.glassfish.config.support.Constants.CLUSTER; +import static org.glassfish.config.support.Constants.CONFIG; +import static org.glassfish.config.support.Constants.NAME; +import static org.glassfish.config.support.Constants.SERVER; /** * The "pre-parser" goes through the domain.xml and finds all the 'special' elements that should be retained. This diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/IntrospectionUtils.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/IntrospectionUtils.java index 4ffeb9f37ff..a7ca2427d1b 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/IntrospectionUtils.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/IntrospectionUtils.java @@ -16,6 +16,8 @@ package org.glassfish.config.support; +import com.sun.enterprise.config.util.ConfigApiLoggerInfo; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.net.InetAddress; @@ -23,8 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.config.util.ConfigApiLoggerInfo; - public final class IntrospectionUtils { private static final Logger logger = ConfigApiLoggerInfo.getLogger(); private static final int debugLevel = 0; diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/Listing.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/Listing.java index 7a6f10e7691..affff81740a 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/Listing.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/Listing.java @@ -16,14 +16,14 @@ package org.glassfish.config.support; -import org.glassfish.api.I18n; -import org.jvnet.hk2.config.GenerateServiceFromMethod; -import org.jvnet.hk2.config.GeneratedServiceName; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import org.glassfish.api.I18n; +import org.jvnet.hk2.config.GenerateServiceFromMethod; +import org.jvnet.hk2.config.GeneratedServiceName; + import static java.lang.annotation.RetentionPolicy.RUNTIME; /** diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/PropertyResolver.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/PropertyResolver.java index cf059178466..bccc1154142 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/PropertyResolver.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/PropertyResolver.java @@ -22,10 +22,10 @@ package org.glassfish.config.support; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.config.serverbeans.Cluster; import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.config.serverbeans.SystemProperty; import java.util.List; diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ServerReaderFilter.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ServerReaderFilter.java index 913c48f981f..0987744a62e 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ServerReaderFilter.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ServerReaderFilter.java @@ -16,10 +16,13 @@ package org.glassfish.config.support; -import java.io.*; -import java.net.*; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; import java.nio.charset.Charset; -import javax.xml.stream.*; + +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamException; /** * Instances and DAS' are quite different diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/SystemPropertyUpgrade.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/SystemPropertyUpgrade.java index ff563526c79..db4675bd960 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/SystemPropertyUpgrade.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/SystemPropertyUpgrade.java @@ -16,22 +16,36 @@ package org.glassfish.config.support; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Configs; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.config.serverbeans.Servers; +import com.sun.enterprise.config.serverbeans.SystemProperty; +import com.sun.enterprise.config.serverbeans.SystemPropertyBag; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.beans.PropertyVetoException; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.config.serverbeans.*; -import static com.sun.enterprise.config.util.PortConstants.*; import org.glassfish.api.admin.config.ConfigurationUpgrade; +import org.glassfish.hk2.api.PostConstruct; import org.jvnet.hk2.annotations.Optional; import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PostConstruct; import org.jvnet.hk2.config.ConfigSupport; -import org.jvnet.hk2.config.TransactionFailure; import org.jvnet.hk2.config.SingleConfigCode; +import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; -import jakarta.inject.Named; +import static com.sun.enterprise.config.util.PortConstants.ADMIN; +import static com.sun.enterprise.config.util.PortConstants.DEBUG; +import static com.sun.enterprise.config.util.PortConstants.DEFAULT_JAVA_DEBUGGER_PORT; +import static com.sun.enterprise.config.util.PortConstants.DEFAULT_OSGI_SHELL_TELNET_PORT; +import static com.sun.enterprise.config.util.PortConstants.HTTP; +import static com.sun.enterprise.config.util.PortConstants.OSGI; /** * Upgrade service to add the new 3.1 system properties to the config elements (except DAS config, server-config) in diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TargetBasedResolver.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TargetBasedResolver.java index bdaee77d115..022f53fea6c 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TargetBasedResolver.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TargetBasedResolver.java @@ -16,9 +16,14 @@ package org.glassfish.config.support; +import com.sun.enterprise.config.serverbeans.Cluster; import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Server; -import com.sun.enterprise.config.serverbeans.Cluster; + +import jakarta.inject.Inject; + +import java.util.Collection; + import org.glassfish.api.Param; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.hk2.api.ServiceLocator; @@ -27,9 +32,6 @@ import org.jvnet.hk2.config.ConfigModel; import org.jvnet.hk2.config.Dom; -import jakarta.inject.Inject; -import java.util.Collection; - /** * Resolver based on a supplied target parameter (with a possible default value). * diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TargetType.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TargetType.java index b804617c2ff..55024954db2 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TargetType.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TargetType.java @@ -16,7 +16,11 @@ package org.glassfish.config.support; -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Target type annotation defines valid target configuration elements for the annotated command type. Valid 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 4123cafc907..e4f149efee5 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 @@ -17,6 +17,8 @@ package org.glassfish.config.support; +import com.sun.enterprise.security.store.DomainScopedPasswordAliasStore; + import java.io.IOException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; @@ -35,8 +37,6 @@ 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. * diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TypeAndNameResolver.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TypeAndNameResolver.java index c90f4f2aac7..64aaf87584f 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TypeAndNameResolver.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TypeAndNameResolver.java @@ -17,14 +17,15 @@ package org.glassfish.config.support; import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + import org.glassfish.api.Param; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.hk2.api.ServiceLocator; import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigBeanProxy; -import jakarta.inject.Inject; - /** * Resolver based on type + name. * diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TypeResolver.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TypeResolver.java index 65d1b34cf3e..21287163b29 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TypeResolver.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/TypeResolver.java @@ -18,14 +18,20 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + +import java.beans.PropertyVetoException; + import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.hk2.utilities.ServiceLocatorUtilities; import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.config.*; - -import jakarta.inject.Inject; -import java.beans.PropertyVetoException; +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.ConfigSupport; +import org.jvnet.hk2.config.Dom; +import org.jvnet.hk2.config.SingleConfigCode; +import org.jvnet.hk2.config.TransactionFailure; /** * Resolver for an un-named type. If the type instance is not found, it will create an instance of it under the domain diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/BasicModularityTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/BasicModularityTest.java index 0e48be15b77..f55c522786d 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/BasicModularityTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/BasicModularityTest.java @@ -25,6 +25,8 @@ import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; +import jakarta.inject.Inject; + import java.util.List; import java.util.concurrent.TimeUnit; @@ -39,8 +41,6 @@ import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.types.Property; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/ConfigExtensionOne.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/ConfigExtensionOne.java index 2fa581277b4..3856c660688 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/ConfigExtensionOne.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/ConfigExtensionOne.java @@ -16,13 +16,13 @@ package com.sun.enterprise.config.modularity.tests; +import java.beans.PropertyVetoException; + import org.glassfish.api.admin.config.ConfigExtension; import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.types.PropertyBag; -import java.beans.PropertyVetoException; - /** * @author Masoud Kalali */ diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/ConfigExtensionThree.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/ConfigExtensionThree.java index 64e3e883007..972b3e91f87 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/ConfigExtensionThree.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/ConfigExtensionThree.java @@ -17,6 +17,7 @@ package com.sun.enterprise.config.modularity.tests; import com.sun.enterprise.config.modularity.annotation.HasNoDefaultConfiguration; + import org.glassfish.api.admin.config.ConfigExtension; import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.Configured; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/ConfigExtensionTwo.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/ConfigExtensionTwo.java index c820a1ba8ec..0c495dbfe58 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/ConfigExtensionTwo.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/ConfigExtensionTwo.java @@ -16,12 +16,12 @@ package com.sun.enterprise.config.modularity.tests; +import java.beans.PropertyVetoException; + import org.glassfish.api.admin.config.ConfigExtension; import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.Configured; -import java.beans.PropertyVetoException; - /** * @author Masoud Kalali */ diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/RankedConfigBean.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/RankedConfigBean.java index a1dcd21185c..eff8cc556db 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/RankedConfigBean.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/RankedConfigBean.java @@ -18,6 +18,7 @@ import com.sun.enterprise.config.modularity.RankedConfigBeanProxy; import com.sun.enterprise.config.serverbeans.DomainExtension; + import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.Configured; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/RankedConfigBeanNewConfigBringer.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/RankedConfigBeanNewConfigBringer.java index f626e63af9b..ee26ceca06b 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/RankedConfigBeanNewConfigBringer.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/RankedConfigBeanNewConfigBringer.java @@ -18,6 +18,7 @@ import com.sun.enterprise.config.modularity.ConfigBeanInstaller; import com.sun.enterprise.config.modularity.annotation.CustomConfiguration; + import org.glassfish.hk2.runlevel.RunLevel; import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigBeanProxy; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/SimpleConfigExtension.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/SimpleConfigExtension.java index 71686c27b3b..42ac077bb7f 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/SimpleConfigExtension.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/SimpleConfigExtension.java @@ -16,14 +16,14 @@ package com.sun.enterprise.config.modularity.tests; +import java.util.List; + import org.glassfish.api.admin.config.ConfigExtension; import org.glassfish.api.admin.config.Named; import org.jvnet.hk2.config.ConfigExtensionMethod; import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.Element; -import java.util.List; - /** * @author Masoud Kalali */ diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/SimpleExtensionTypeOne.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/SimpleExtensionTypeOne.java index 37ec483e9ae..a431a01a5e1 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/SimpleExtensionTypeOne.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/SimpleExtensionTypeOne.java @@ -16,13 +16,14 @@ package com.sun.enterprise.config.modularity.tests; +import jakarta.validation.constraints.NotNull; + +import java.beans.PropertyVetoException; + import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.types.PropertyBag; -import jakarta.validation.constraints.NotNull; -import java.beans.PropertyVetoException; - /** * @author Masoud Kalali */ diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/SimpleExtensionTypeTwo.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/SimpleExtensionTypeTwo.java index 919a9a8be42..438211170ef 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/SimpleExtensionTypeTwo.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/SimpleExtensionTypeTwo.java @@ -16,13 +16,14 @@ package com.sun.enterprise.config.modularity.tests; +import jakarta.validation.constraints.NotNull; + +import java.beans.PropertyVetoException; + import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.types.PropertyBag; -import jakarta.validation.constraints.NotNull; -import java.beans.PropertyVetoException; - /** * @author Masoud Kalali */ diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/AddPropertyTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/AddPropertyTest.java index 7f211e283c1..9c476d7de3d 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/AddPropertyTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/AddPropertyTest.java @@ -19,6 +19,8 @@ import com.sun.enterprise.config.serverbeans.Domain; +import jakarta.inject.Inject; + import java.beans.PropertyChangeEvent; import java.util.HashMap; import java.util.List; @@ -38,8 +40,6 @@ import org.jvnet.hk2.config.UnprocessedChangeEvents; import org.jvnet.hk2.config.types.Property; -import jakarta.inject.Inject; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ApplicationsTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ApplicationsTest.java index c7632e56a3f..ed72e9d749b 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ApplicationsTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ApplicationsTest.java @@ -20,6 +20,8 @@ import com.sun.enterprise.config.serverbeans.Application; import com.sun.enterprise.config.serverbeans.Applications; +import jakarta.inject.Inject; + import java.util.List; import org.glassfish.api.admin.config.ApplicationName; @@ -31,8 +33,6 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.instanceOf; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/AttributeRemovalTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/AttributeRemovalTest.java index 69b521ec603..10fabc61f8a 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/AttributeRemovalTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/AttributeRemovalTest.java @@ -21,6 +21,8 @@ import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.config.serverbeans.VirtualServer; +import jakarta.inject.Inject; + import java.beans.PropertyVetoException; import java.util.logging.Logger; @@ -32,8 +34,6 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/CollectionsAccessTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/CollectionsAccessTest.java index a5dc92d26f9..c5e26f4fe53 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/CollectionsAccessTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/CollectionsAccessTest.java @@ -20,6 +20,8 @@ import com.sun.enterprise.config.serverbeans.Application; import com.sun.enterprise.config.serverbeans.Applications; +import jakarta.inject.Inject; + import java.util.List; import org.glassfish.api.admin.config.ApplicationName; @@ -31,8 +33,6 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ConfigListenerTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ConfigListenerTest.java index 5bad03419af..18722bed1e1 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ConfigListenerTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ConfigListenerTest.java @@ -19,6 +19,8 @@ import com.sun.enterprise.configapi.tests.example.HttpListenerContainer; +import jakarta.inject.Inject; + import org.glassfish.config.api.test.ConfigApiJunit5Extension; import org.glassfish.config.support.ConfigConfigBeanListener; import org.glassfish.grizzly.config.dom.NetworkListener; @@ -36,8 +38,6 @@ import org.jvnet.hk2.config.TransactionFailure; import org.jvnet.hk2.config.Transactions; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ConfigPersistence.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ConfigPersistence.java index 1239b31e12c..4d03925ae50 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ConfigPersistence.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ConfigPersistence.java @@ -17,6 +17,8 @@ package com.sun.enterprise.configapi.tests; +import jakarta.inject.Inject; + import java.beans.PropertyChangeEvent; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -38,8 +40,6 @@ import org.jvnet.hk2.config.Transactions; import org.jvnet.hk2.config.UnprocessedChangeEvents; -import jakarta.inject.Inject; - /** * User: Jerome Dochez * Date: Mar 25, 2008 diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DeepCopyTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DeepCopyTest.java index accf1ade28f..a310b0fef40 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DeepCopyTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DeepCopyTest.java @@ -20,6 +20,8 @@ import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Configs; +import jakarta.inject.Inject; + import java.io.ByteArrayOutputStream; import java.util.logging.Level; import java.util.logging.Logger; @@ -39,8 +41,6 @@ import org.jvnet.hk2.config.IndentingXMLStreamWriter; import org.jvnet.hk2.config.SingleConfigCode; -import jakarta.inject.Inject; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.stringContainsInOrder; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DefaultValueTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DefaultValueTest.java index b304bcbd195..36814b6182e 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DefaultValueTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DefaultValueTest.java @@ -17,6 +17,8 @@ package com.sun.enterprise.configapi.tests; +import jakarta.inject.Inject; + import org.glassfish.config.api.test.ConfigApiJunit5Extension; import org.glassfish.grizzly.config.dom.Http; import org.glassfish.grizzly.config.dom.NetworkListener; @@ -30,8 +32,6 @@ import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.Dom; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DirectAccessTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DirectAccessTest.java index ce8f7f3b8f4..3a00b56b0d0 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DirectAccessTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DirectAccessTest.java @@ -18,6 +18,10 @@ package com.sun.enterprise.configapi.tests; import com.sun.enterprise.config.serverbeans.JavaConfig; + +import java.util.HashMap; +import java.util.Map; + import org.glassfish.grizzly.config.dom.Http; import org.glassfish.grizzly.config.dom.NetworkConfig; import org.glassfish.grizzly.config.dom.NetworkListener; @@ -29,9 +33,6 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.stringContainsInOrder; -import java.util.HashMap; -import java.util.Map; - /** * User: Jerome Dochez * Date: Mar 12, 2008 diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DomainTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DomainTest.java index b2c3b54c476..70cea6aebc9 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DomainTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DomainTest.java @@ -19,13 +19,13 @@ import com.sun.enterprise.config.serverbeans.Domain; +import jakarta.inject.Inject; + import org.glassfish.config.api.test.ConfigApiJunit5Extension; import org.glassfish.hk2.api.ServiceLocator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertNotNull; /** diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DuplicateKeyedElementTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DuplicateKeyedElementTest.java index 449137f9c4a..f4f0e05ae73 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DuplicateKeyedElementTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/DuplicateKeyedElementTest.java @@ -20,6 +20,8 @@ import com.sun.enterprise.config.serverbeans.HttpService; import com.sun.enterprise.config.serverbeans.VirtualServer; +import jakarta.inject.Inject; + import org.glassfish.config.api.test.ConfigApiJunit5Extension; import org.glassfish.hk2.api.ServiceLocator; import org.junit.jupiter.api.Test; @@ -29,8 +31,6 @@ import org.jvnet.hk2.config.TransactionFailure; import org.jvnet.hk2.config.types.Property; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/EnabledTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/EnabledTest.java index 227abbcfd6e..e0019cd221a 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/EnabledTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/EnabledTest.java @@ -17,6 +17,8 @@ package com.sun.enterprise.configapi.tests; +import jakarta.inject.Inject; + import java.util.List; import java.util.logging.Logger; @@ -28,8 +30,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/GetElementTypeByNameTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/GetElementTypeByNameTest.java index e35d9aa94ee..c361b9edbe8 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/GetElementTypeByNameTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/GetElementTypeByNameTest.java @@ -19,6 +19,8 @@ import com.sun.enterprise.config.serverbeans.Config; +import jakarta.inject.Inject; + import org.glassfish.config.api.test.ConfigApiJunit5Extension; import org.glassfish.hk2.api.ServiceLocator; import org.junit.jupiter.api.Test; @@ -26,8 +28,6 @@ import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.ConfigSupport; -import jakarta.inject.Inject; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.StringEndsWith.endsWith; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/HttpListenerTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/HttpListenerTest.java index 26f7ad80cc1..4b88565e577 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/HttpListenerTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/HttpListenerTest.java @@ -17,6 +17,8 @@ package com.sun.enterprise.configapi.tests; +import jakarta.inject.Inject; + import java.util.logging.Logger; import org.glassfish.config.api.test.ConfigApiJunit5Extension; @@ -31,8 +33,6 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/HttpServiceTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/HttpServiceTest.java index 922ca05af82..261dc6379e7 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/HttpServiceTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/HttpServiceTest.java @@ -17,6 +17,8 @@ package com.sun.enterprise.configapi.tests; +import jakarta.inject.Inject; + import org.glassfish.config.api.test.ConfigApiJunit5Extension; import org.glassfish.grizzly.config.dom.FileCache; import org.glassfish.grizzly.config.dom.Http; @@ -31,8 +33,6 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ModulesTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ModulesTest.java index 80005670af0..80ef84baa25 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ModulesTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ModulesTest.java @@ -19,6 +19,8 @@ import com.sun.enterprise.config.serverbeans.Applications; +import jakarta.inject.Inject; + import java.util.Collection; import java.util.logging.Logger; @@ -29,8 +31,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertNotNull; /** diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ParentConfigListenerTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ParentConfigListenerTest.java index c258b474463..7d5ec67f131 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ParentConfigListenerTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ParentConfigListenerTest.java @@ -17,6 +17,8 @@ package com.sun.enterprise.configapi.tests; +import jakarta.inject.Inject; + import java.util.List; import org.glassfish.config.api.test.ConfigApiJunit5Extension; @@ -32,8 +34,6 @@ import org.jvnet.hk2.config.TransactionFailure; import org.jvnet.hk2.config.Transactions; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ParentTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ParentTest.java index d76418e7315..e6ecf05fb7a 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ParentTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ParentTest.java @@ -17,6 +17,8 @@ package com.sun.enterprise.configapi.tests; +import jakarta.inject.Inject; + import org.glassfish.config.api.test.ConfigApiJunit5Extension; import org.glassfish.grizzly.config.dom.NetworkListener; import org.glassfish.grizzly.config.dom.NetworkListeners; @@ -25,8 +27,6 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.jvnet.hk2.config.ConfigBeanProxy; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertNotNull; /** diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/PropertyChangeListenerTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/PropertyChangeListenerTest.java index 4e7982f0a57..ebd37a6049f 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/PropertyChangeListenerTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/PropertyChangeListenerTest.java @@ -20,6 +20,8 @@ import com.sun.enterprise.config.serverbeans.HttpService; import com.sun.enterprise.config.serverbeans.VirtualServer; +import jakarta.inject.Inject; + import java.beans.PropertyChangeEvent; import org.glassfish.config.api.test.ConfigApiJunit5Extension; @@ -35,8 +37,6 @@ import org.jvnet.hk2.config.UnprocessedChangeEvents; import org.jvnet.hk2.config.types.Property; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/RawValueTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/RawValueTest.java index 9011b93b899..6a25663ce6a 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/RawValueTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/RawValueTest.java @@ -20,6 +20,8 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.util.SystemPropertyConstants; +import jakarta.inject.Inject; + import org.glassfish.config.api.test.ConfigApiJunit5Extension; import org.glassfish.config.support.GlassFishConfigBean; import org.glassfish.hk2.api.ServiceLocator; @@ -28,8 +30,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import jakarta.inject.Inject; - import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/Ssl2EnabledTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/Ssl2EnabledTest.java index ee56f6bb206..f4e335725e1 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/Ssl2EnabledTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/Ssl2EnabledTest.java @@ -17,6 +17,8 @@ package com.sun.enterprise.configapi.tests; +import jakarta.inject.Inject; + import java.util.List; import org.glassfish.config.api.test.ConfigApiJunit5Extension; @@ -27,8 +29,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import jakarta.inject.Inject; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.junit.jupiter.api.Assertions.assertAll; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/SubTypesTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/SubTypesTest.java index 27ec14374c6..ba00e55acd8 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/SubTypesTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/SubTypesTest.java @@ -19,6 +19,8 @@ import com.sun.enterprise.config.serverbeans.Domain; +import jakarta.inject.Inject; + import java.util.Set; import org.glassfish.config.api.test.ConfigApiJunit5Extension; @@ -29,8 +31,6 @@ import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.Dom; -import jakarta.inject.Inject; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.arrayWithSize; import static org.hamcrest.Matchers.hasItems; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/TransactionListenerTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/TransactionListenerTest.java index 5fd927397f8..feb80f4ce34 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/TransactionListenerTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/TransactionListenerTest.java @@ -19,6 +19,8 @@ import com.sun.enterprise.config.serverbeans.HttpService; +import jakarta.inject.Inject; + import java.beans.PropertyChangeEvent; import java.util.List; import java.util.logging.Logger; @@ -37,8 +39,6 @@ import org.jvnet.hk2.config.Transactions; import org.jvnet.hk2.config.UnprocessedChangeEvents; -import jakarta.inject.Inject; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.junit.jupiter.api.Assertions.assertAll; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/TranslatedValuesTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/TranslatedValuesTest.java index 1ba58578862..821b579453d 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/TranslatedValuesTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/TranslatedValuesTest.java @@ -21,8 +21,11 @@ import com.sun.enterprise.config.serverbeans.JavaConfig; import com.sun.enterprise.util.SystemPropertyConstants; +import jakarta.inject.Inject; + import java.io.File; import java.nio.file.Files; + import org.glassfish.config.api.test.ConfigApiJunit5Extension; import org.glassfish.hk2.api.ServiceLocator; import org.junit.jupiter.api.AfterAll; @@ -30,8 +33,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import jakarta.inject.Inject; - import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/TranslatedViewCreationTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/TranslatedViewCreationTest.java index 57ef8226ba3..ff6fdcffbd0 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/TranslatedViewCreationTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/TranslatedViewCreationTest.java @@ -20,6 +20,8 @@ import com.sun.enterprise.config.serverbeans.HttpService; import com.sun.enterprise.config.serverbeans.VirtualServer; +import jakarta.inject.Inject; + import java.beans.PropertyChangeEvent; import java.util.List; @@ -37,8 +39,6 @@ import org.jvnet.hk2.config.Transactions; import org.jvnet.hk2.config.UnprocessedChangeEvents; -import jakarta.inject.Inject; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/UnprocessedEventsTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/UnprocessedEventsTest.java index 704ef88f5b1..3f4d312cbc5 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/UnprocessedEventsTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/UnprocessedEventsTest.java @@ -17,6 +17,8 @@ package com.sun.enterprise.configapi.tests; +import jakarta.inject.Inject; + import java.beans.PropertyChangeEvent; import java.util.List; @@ -36,8 +38,6 @@ import org.jvnet.hk2.config.UnprocessedChangeEvent; import org.jvnet.hk2.config.UnprocessedChangeEvents; -import jakarta.inject.Inject; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/VetoableChangeListenerTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/VetoableChangeListenerTest.java index 83819e6843e..d9b1acb8f84 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/VetoableChangeListenerTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/VetoableChangeListenerTest.java @@ -20,6 +20,8 @@ import com.sun.enterprise.config.serverbeans.HttpService; import com.sun.enterprise.config.serverbeans.VirtualServer; +import jakarta.inject.Inject; + import java.beans.PropertyChangeEvent; import java.beans.PropertyVetoException; import java.beans.VetoableChangeListener; @@ -34,8 +36,6 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/concurrent/ConcurrentAccessTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/concurrent/ConcurrentAccessTest.java index ad7a364f5ae..dc155179e21 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/concurrent/ConcurrentAccessTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/concurrent/ConcurrentAccessTest.java @@ -19,6 +19,8 @@ import com.sun.enterprise.config.serverbeans.Domain; +import jakarta.inject.Inject; + import java.util.concurrent.Semaphore; import java.util.logging.Logger; @@ -30,8 +32,6 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertThrows; /** diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/dvt/AccessLogAllDefaultsTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/dvt/AccessLogAllDefaultsTest.java index 60a2f601916..dbacab75198 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/dvt/AccessLogAllDefaultsTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/dvt/AccessLogAllDefaultsTest.java @@ -18,13 +18,14 @@ package com.sun.enterprise.configapi.tests.dvt; import com.sun.enterprise.config.serverbeans.AccessLog; + +import jakarta.inject.Inject; + import org.glassfish.config.api.test.ConfigApiJunit5Extension; import org.glassfish.tests.utils.junit.DomainXml; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/dvt/SecurityServiceDefaultsTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/dvt/SecurityServiceDefaultsTest.java index 2bdcefb736a..5adfd96e3e2 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/dvt/SecurityServiceDefaultsTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/dvt/SecurityServiceDefaultsTest.java @@ -18,13 +18,14 @@ package com.sun.enterprise.configapi.tests.dvt; import com.sun.enterprise.config.serverbeans.SecurityService; + +import jakarta.inject.Inject; + import org.glassfish.config.api.test.ConfigApiJunit5Extension; import org.glassfish.tests.utils.junit.DomainXml; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/example/HttpListenerContainer.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/example/HttpListenerContainer.java index 759f49805d0..1ce4f4a8828 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/example/HttpListenerContainer.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/example/HttpListenerContainer.java @@ -17,6 +17,9 @@ package com.sun.enterprise.configapi.tests.example; +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.beans.PropertyChangeEvent; import org.glassfish.grizzly.config.dom.NetworkListener; @@ -25,9 +28,6 @@ import org.jvnet.hk2.config.ConfigListener; import org.jvnet.hk2.config.UnprocessedChangeEvents; -import jakarta.inject.Inject; -import jakarta.inject.Named; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/extensibility/ContainerExtensionTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/extensibility/ContainerExtensionTest.java index 5d2ba8b58f8..8afcde9dc98 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/extensibility/ContainerExtensionTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/extensibility/ContainerExtensionTest.java @@ -25,6 +25,8 @@ import com.sun.enterprise.configapi.tests.example.RandomElement; import com.sun.enterprise.configapi.tests.example.RandomExtension; +import jakarta.inject.Inject; + import java.util.List; import org.glassfish.api.admin.config.Container; @@ -34,8 +36,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import jakarta.inject.Inject; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/typedlistener/TypedListenerTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/typedlistener/TypedListenerTest.java index b60f2473a43..3d267dab9fc 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/typedlistener/TypedListenerTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/typedlistener/TypedListenerTest.java @@ -20,6 +20,8 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.SystemProperty; +import jakarta.inject.Inject; + import java.beans.PropertyChangeEvent; import java.util.Arrays; import java.util.List; @@ -36,8 +38,6 @@ import org.jvnet.hk2.config.TransactionFailure; import org.jvnet.hk2.config.Transactions; -import jakarta.inject.Inject; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/validation/FieldsValidationTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/validation/FieldsValidationTest.java index 132561dcc5c..4b636da3775 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/validation/FieldsValidationTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/validation/FieldsValidationTest.java @@ -19,6 +19,9 @@ import com.sun.enterprise.config.serverbeans.AdminService; +import jakarta.inject.Inject; +import jakarta.validation.ConstraintViolationException; + import java.beans.PropertyVetoException; import org.glassfish.config.api.test.ConfigApiJunit5Extension; @@ -29,9 +32,6 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; -import jakarta.validation.ConstraintViolationException; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/validation/ReferenceConstrainClusterTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/validation/ReferenceConstrainClusterTest.java index 20feb2153a1..38ad090443a 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/validation/ReferenceConstrainClusterTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/validation/ReferenceConstrainClusterTest.java @@ -19,6 +19,10 @@ import com.sun.enterprise.config.serverbeans.Cluster; import com.sun.enterprise.config.serverbeans.ServerRef; + +import jakarta.inject.Inject; +import jakarta.validation.ConstraintViolationException; + import java.util.HashMap; import java.util.Map; @@ -32,9 +36,6 @@ import org.jvnet.hk2.config.Dom; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; -import jakarta.validation.ConstraintViolationException; - import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/validation/ReferenceConstrainTest.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/validation/ReferenceConstrainTest.java index 279c758d196..15fbef03ee1 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/validation/ReferenceConstrainTest.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/validation/ReferenceConstrainTest.java @@ -19,6 +19,10 @@ import com.sun.enterprise.config.serverbeans.JmxConnector; import com.sun.enterprise.config.serverbeans.Server; + +import jakarta.inject.Inject; +import jakarta.validation.ConstraintViolationException; + import java.util.HashMap; import java.util.Map; @@ -31,9 +35,6 @@ import org.jvnet.hk2.config.Dom; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; -import jakarta.validation.ConstraintViolationException; - import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/GFDomainLauncher.java b/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/GFDomainLauncher.java index 8ea331482bb..df03846cc19 100644 --- a/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/GFDomainLauncher.java +++ b/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/GFDomainLauncher.java @@ -16,13 +16,13 @@ package com.sun.enterprise.admin.launcher; -import static com.sun.enterprise.universal.io.SmartFile.sanitize; -import static com.sun.enterprise.util.SystemPropertyConstants.INSTALL_ROOT_PROPERTY; - import java.io.File; import java.util.ArrayList; import java.util.List; +import static com.sun.enterprise.universal.io.SmartFile.sanitize; +import static com.sun.enterprise.util.SystemPropertyConstants.INSTALL_ROOT_PROPERTY; + /** * GFDomainLauncher This class is a package-private subclass of GFLauncher designed for domain launching * diff --git a/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/GFEmbeddedLauncher.java b/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/GFEmbeddedLauncher.java index 3f38468a9e4..338ba368c6f 100644 --- a/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/GFEmbeddedLauncher.java +++ b/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/GFEmbeddedLauncher.java @@ -16,16 +16,16 @@ package com.sun.enterprise.admin.launcher; -import java.io.File; -import java.util.ArrayList; -import java.util.List; - import com.sun.enterprise.universal.io.SmartFile; import com.sun.enterprise.universal.xml.MiniXmlParser; import com.sun.enterprise.universal.xml.MiniXmlParserException; import com.sun.enterprise.util.HostAndPort; import com.sun.enterprise.util.io.FileUtils; +import java.io.File; +import java.util.ArrayList; +import java.util.List; + /** * * @author Byron Nevins diff --git a/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/GFInstanceLauncher.java b/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/GFInstanceLauncher.java index cb55cdd456a..c34521b8988 100644 --- a/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/GFInstanceLauncher.java +++ b/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/GFInstanceLauncher.java @@ -16,13 +16,13 @@ package com.sun.enterprise.admin.launcher; -import static com.sun.enterprise.util.SystemPropertyConstants.INSTALL_ROOT_PROPERTY; +import com.sun.enterprise.universal.io.SmartFile; import java.io.File; import java.util.ArrayList; import java.util.List; -import com.sun.enterprise.universal.io.SmartFile; +import static com.sun.enterprise.util.SystemPropertyConstants.INSTALL_ROOT_PROPERTY; /** * diff --git a/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/GFLauncherFactory.java b/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/GFLauncherFactory.java index 2d754003361..a87c6868c2b 100644 --- a/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/GFLauncherFactory.java +++ b/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/GFLauncherFactory.java @@ -16,12 +16,12 @@ package com.sun.enterprise.admin.launcher; +import org.glassfish.api.admin.RuntimeType; + import static org.glassfish.api.admin.RuntimeType.DAS; import static org.glassfish.api.admin.RuntimeType.EMBEDDED; import static org.glassfish.api.admin.RuntimeType.INSTANCE; -import org.glassfish.api.admin.RuntimeType; - /** * * @author bnevins diff --git a/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/GFLauncherInfo.java b/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/GFLauncherInfo.java index 1b6347fea29..f888ac40e1d 100644 --- a/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/GFLauncherInfo.java +++ b/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/GFLauncherInfo.java @@ -16,11 +16,8 @@ package com.sun.enterprise.admin.launcher; -import static com.sun.enterprise.admin.launcher.ArgumentManager.argsToMap; -import static com.sun.enterprise.universal.glassfish.GFLauncherUtils.ok; -import static com.sun.enterprise.universal.glassfish.GFLauncherUtils.safeExists; -import static com.sun.enterprise.universal.glassfish.GFLauncherUtils.safeIsDirectory; -import static com.sun.enterprise.universal.io.SmartFile.sanitize; +import com.sun.enterprise.universal.glassfish.GFLauncherUtils; +import com.sun.enterprise.util.HostAndPort; import java.io.File; import java.util.ArrayList; @@ -30,8 +27,11 @@ import org.glassfish.api.admin.RuntimeType; -import com.sun.enterprise.universal.glassfish.GFLauncherUtils; -import com.sun.enterprise.util.HostAndPort; +import static com.sun.enterprise.admin.launcher.ArgumentManager.argsToMap; +import static com.sun.enterprise.universal.glassfish.GFLauncherUtils.ok; +import static com.sun.enterprise.universal.glassfish.GFLauncherUtils.safeExists; +import static com.sun.enterprise.universal.glassfish.GFLauncherUtils.safeIsDirectory; +import static com.sun.enterprise.universal.io.SmartFile.sanitize; /** * @author Byron Nevins diff --git a/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/GFLauncherNativeHelper.java b/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/GFLauncherNativeHelper.java index 2dd977089c2..fa5763354f9 100644 --- a/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/GFLauncherNativeHelper.java +++ b/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/GFLauncherNativeHelper.java @@ -16,6 +16,12 @@ package com.sun.enterprise.admin.launcher; +import com.sun.enterprise.universal.glassfish.GFLauncherUtils; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + import static com.sun.enterprise.admin.launcher.GFLauncherConstants.AMD64; import static com.sun.enterprise.admin.launcher.GFLauncherConstants.JAVA_NATIVE_SYSPROP_NAME; import static com.sun.enterprise.admin.launcher.GFLauncherConstants.LIBDIR; @@ -25,12 +31,6 @@ import static com.sun.enterprise.admin.launcher.GFLauncherConstants.X86; import static com.sun.enterprise.universal.io.SmartFile.sanitize; -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import com.sun.enterprise.universal.glassfish.GFLauncherUtils; - /** * The platform-specific code is ugly. That's why it is concentrated here. * diff --git a/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/JavaConfig.java b/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/JavaConfig.java index 23617556797..f2d2e678a2a 100644 --- a/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/JavaConfig.java +++ b/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/JavaConfig.java @@ -16,18 +16,18 @@ package com.sun.enterprise.admin.launcher; -import static com.sun.enterprise.admin.launcher.GFLauncherConstants.NATIVE_LIB_PREFIX; -import static com.sun.enterprise.admin.launcher.GFLauncherConstants.NATIVE_LIB_SUFFIX; -import static com.sun.enterprise.universal.glassfish.GFLauncherUtils.ok; -import static java.util.Arrays.asList; -import static java.util.Collections.emptyList; +import com.sun.enterprise.universal.glassfish.GFLauncherUtils; import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.Map; -import com.sun.enterprise.universal.glassfish.GFLauncherUtils; +import static com.sun.enterprise.admin.launcher.GFLauncherConstants.NATIVE_LIB_PREFIX; +import static com.sun.enterprise.admin.launcher.GFLauncherConstants.NATIVE_LIB_SUFFIX; +import static com.sun.enterprise.universal.glassfish.GFLauncherUtils.ok; +import static java.util.Arrays.asList; +import static java.util.Collections.emptyList; /** * diff --git a/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/JvmOptions.java b/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/JvmOptions.java index a404878b531..ece2a4c6063 100644 --- a/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/JvmOptions.java +++ b/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/JvmOptions.java @@ -16,7 +16,8 @@ package com.sun.enterprise.admin.launcher; -import static com.sun.enterprise.util.StringUtils.ok; +import com.sun.enterprise.util.OS; +import com.sun.enterprise.util.StringUtils; import java.util.ArrayList; import java.util.HashMap; @@ -26,8 +27,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.sun.enterprise.util.OS; -import com.sun.enterprise.util.StringUtils; +import static com.sun.enterprise.util.StringUtils.ok; /** * diff --git a/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/Profiler.java b/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/Profiler.java index 12c67a07b60..fe521a7c10c 100644 --- a/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/Profiler.java +++ b/nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/Profiler.java @@ -16,17 +16,17 @@ package com.sun.enterprise.admin.launcher; -import static com.sun.enterprise.universal.glassfish.GFLauncherUtils.ok; -import static com.sun.enterprise.universal.glassfish.GFLauncherUtils.stringToFiles; -import static java.util.Collections.emptyList; -import static java.util.Collections.emptyMap; - import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; +import static com.sun.enterprise.universal.glassfish.GFLauncherUtils.ok; +import static com.sun.enterprise.universal.glassfish.GFLauncherUtils.stringToFiles; +import static java.util.Collections.emptyList; +import static java.util.Collections.emptyMap; + /** * This class wraps the profiler element in java-config Note that the V2 dtd says that there can be generic property * elements in the profiler element. I don't know why anyone would use them -- but if they do I turn it into a "-D" diff --git a/nucleus/admin/monitor/src/main/java/com/sun/enterprise/admin/monitor/jndi/JndiNameLookupHelper.java b/nucleus/admin/monitor/src/main/java/com/sun/enterprise/admin/monitor/jndi/JndiNameLookupHelper.java index bb3473d2925..87d5f593066 100644 --- a/nucleus/admin/monitor/src/main/java/com/sun/enterprise/admin/monitor/jndi/JndiNameLookupHelper.java +++ b/nucleus/admin/monitor/src/main/java/com/sun/enterprise/admin/monitor/jndi/JndiNameLookupHelper.java @@ -16,15 +16,19 @@ package com.sun.enterprise.admin.monitor.jndi; -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; -import javax.naming.NameNotFoundException; -import javax.naming.InitialContext; +import com.sun.enterprise.util.i18n.StringManager; + +import java.util.ArrayList; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.ArrayList; -import com.sun.enterprise.util.i18n.StringManager; -import static org.glassfish.admin.monitor.MLogger.*; + +import javax.naming.InitialContext; +import javax.naming.NameNotFoundException; +import javax.naming.NamingEnumeration; +import javax.naming.NamingException; + +import static org.glassfish.admin.monitor.MLogger.UNHANDLED_EXCEPTION; +import static org.glassfish.admin.monitor.MLogger.getLogger; public class JndiNameLookupHelper { private InitialContext context; diff --git a/nucleus/admin/monitor/src/main/java/com/sun/enterprise/management/support/SystemInfoData.java b/nucleus/admin/monitor/src/main/java/com/sun/enterprise/management/support/SystemInfoData.java index e44f7a126cb..85efd1a4749 100644 --- a/nucleus/admin/monitor/src/main/java/com/sun/enterprise/management/support/SystemInfoData.java +++ b/nucleus/admin/monitor/src/main/java/com/sun/enterprise/management/support/SystemInfoData.java @@ -16,9 +16,9 @@ package com.sun.enterprise.management.support; -import java.util.Map; -import java.util.HashMap; import java.util.Collections; +import java.util.HashMap; +import java.util.Map; /** * See also com.sun.enterprise.management.support.SystemInfoImpl diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/FutureStatsProviders.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/FutureStatsProviders.java index 90a6f067803..8f7d72c34d4 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/FutureStatsProviders.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/FutureStatsProviders.java @@ -16,8 +16,10 @@ package org.glassfish.admin.monitor; -import java.util.*; -import java.util.concurrent.*; +import java.util.Iterator; +import java.util.Set; +import java.util.concurrent.CopyOnWriteArraySet; + import org.glassfish.external.probe.provider.StatsProviderInfo; /** diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/MLogger.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/MLogger.java index 3bd5403dc03..6168e4e434c 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/MLogger.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/MLogger.java @@ -16,10 +16,11 @@ package org.glassfish.admin.monitor; -import java.util.logging.*; +import java.util.logging.Logger; + import org.glassfish.logging.annotation.LogMessageInfo; -import org.glassfish.logging.annotation.LoggerInfo; import org.glassfish.logging.annotation.LogMessagesResourceBundle; +import org.glassfish.logging.annotation.LoggerInfo; /** * A POL (plain old logger). diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/MonitoringBootstrap.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/MonitoringBootstrap.java index a14fe368f53..982c71c4102 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/MonitoringBootstrap.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/MonitoringBootstrap.java @@ -22,68 +22,77 @@ package org.glassfish.admin.monitor; -import java.beans.PropertyChangeEvent; -import java.net.URISyntaxException; -import java.util.*; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.external.probe.provider.StatsProviderInfo; -import org.glassfish.hk2.api.PostConstruct; -import org.glassfish.hk2.api.PreDestroy; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.hk2.runlevel.RunLevel; -import org.glassfish.external.probe.provider.StatsProviderManager; -import com.sun.enterprise.config.serverbeans.*; -import org.glassfish.flashlight.MonitoringRuntimeDataRegistry; - -import org.jvnet.hk2.annotations.Optional; - -import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.config.ConfigBeanProxy; -import org.jvnet.hk2.config.ConfigListener; -import org.jvnet.hk2.config.UnprocessedChangeEvents; - +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.ModuleMonitoringLevels; +import com.sun.enterprise.config.serverbeans.MonitoringService; import com.sun.enterprise.module.HK2Module; -import com.sun.enterprise.module.ModuleState; import com.sun.enterprise.module.ModuleDefinition; -import com.sun.enterprise.module.ModulesRegistry; import com.sun.enterprise.module.ModuleLifecycleListener; +import com.sun.enterprise.module.ModuleState; +import com.sun.enterprise.module.ModulesRegistry; + +import jakarta.inject.Inject; +import jakarta.inject.Named; +import java.beans.PropertyChangeEvent; import java.io.File; import java.io.FileInputStream; import java.io.FilenameFilter; import java.io.IOException; import java.lang.management.ManagementFactory; import java.net.URI; -import java.util.jar.Manifest; -import java.util.jar.Attributes; +import java.net.URISyntaxException; import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; import java.util.List; +import java.util.Locale; import java.util.Map; -import java.util.WeakHashMap; -import java.util.Collections; import java.util.StringTokenizer; +import java.util.WeakHashMap; +import java.util.jar.Attributes; +import java.util.jar.Manifest; +import java.util.logging.Level; +import java.util.logging.Logger; -import org.glassfish.external.amx.AMXGlassfish; - -import org.glassfish.api.event.Events; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.api.event.EventListener; import org.glassfish.api.event.EventTypes; +import org.glassfish.api.event.Events; import org.glassfish.api.monitoring.ContainerMonitoring; +import org.glassfish.external.amx.AMXGlassfish; +import org.glassfish.external.probe.provider.StatsProviderInfo; +import org.glassfish.external.probe.provider.StatsProviderManager; +import org.glassfish.flashlight.MonitoringRuntimeDataRegistry; import org.glassfish.flashlight.client.ProbeClientMediator; import org.glassfish.flashlight.impl.client.AgentAttacher; -import org.glassfish.flashlight.provider.ProbeProviderFactory; import org.glassfish.flashlight.provider.ProbeProviderEventListener; +import org.glassfish.flashlight.provider.ProbeProviderFactory; import org.glassfish.flashlight.provider.ProbeRegistry; +import org.glassfish.hk2.api.PostConstruct; +import org.glassfish.hk2.api.PreDestroy; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.hk2.runlevel.RunLevel; import org.glassfish.internal.api.InitRunLevel; import org.glassfish.internal.api.LogManager; +import org.jvnet.hk2.annotations.Optional; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.ConfigListener; import org.jvnet.hk2.config.Transactions; +import org.jvnet.hk2.config.UnprocessedChangeEvents; -import jakarta.inject.Inject; -import jakarta.inject.Named; -import static org.glassfish.admin.monitor.MLogger.*; +import static org.glassfish.admin.monitor.MLogger.UNHANDLED_EXCEPTION_INFO; +import static org.glassfish.admin.monitor.MLogger.dtraceEnabled; +import static org.glassfish.admin.monitor.MLogger.getLogger; +import static org.glassfish.admin.monitor.MLogger.mbeanDisabled; +import static org.glassfish.admin.monitor.MLogger.mbeanEnabled; +import static org.glassfish.admin.monitor.MLogger.monitoringDisabledLogMsg; +import static org.glassfish.admin.monitor.MLogger.monitoringEnabledLogMsg; +import static org.glassfish.admin.monitor.MLogger.monitoringMissingModuleFromXmlProbeProviders; +import static org.glassfish.admin.monitor.MLogger.unableToLoadProbeProvider; +import static org.glassfish.admin.monitor.MLogger.unableToProcessXMLProbeProvider; /** * diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderManagerDelegateImpl.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderManagerDelegateImpl.java index 0c99dcb6cfb..f78b2928d2f 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderManagerDelegateImpl.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderManagerDelegateImpl.java @@ -20,53 +20,71 @@ */ package org.glassfish.admin.monitor; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.MonitoringService; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.StringUtils; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Singleton; + +import java.beans.PropertyVetoException; +import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Locale; +import java.util.ResourceBundle; +import java.util.StringTokenizer; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.*; + import javax.management.ObjectName; +import org.glassfish.admin.monitor.StatsProviderRegistry.StatsProviderRegistryElement; import org.glassfish.api.monitoring.ContainerMonitoring; -import org.glassfish.flashlight.datatree.TreeNode; -import org.glassfish.flashlight.datatree.factory.TreeNodeFactory; -import org.glassfish.gmbal.AMXMetadata; -import org.glassfish.gmbal.ManagedObjectManager; -import org.glassfish.gmbal.ManagedObjectManagerFactory; -import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.external.amx.AMXGlassfish; +import org.glassfish.external.amx.MBeanListener; import org.glassfish.external.probe.provider.PluginPoint; +import org.glassfish.external.probe.provider.StatsProviderInfo; import org.glassfish.external.probe.provider.StatsProviderManagerDelegate; import org.glassfish.external.statistics.Statistic; -import org.glassfish.external.probe.provider.StatsProviderInfo; import org.glassfish.external.statistics.annotations.Reset; import org.glassfish.external.statistics.impl.StatisticImpl; import org.glassfish.external.statistics.impl.StatsImpl; import org.glassfish.flashlight.MonitoringRuntimeDataRegistry; -import com.sun.enterprise.config.serverbeans.*; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; -import com.sun.enterprise.util.StringUtils; -import java.io.IOException; -import java.text.MessageFormat; - import org.glassfish.flashlight.client.ProbeClientMediator; import org.glassfish.flashlight.client.ProbeClientMethodHandle; - -import jakarta.inject.Singleton; -import org.jvnet.hk2.config.SingleConfigCode; +import org.glassfish.flashlight.datatree.TreeNode; +import org.glassfish.flashlight.datatree.factory.TreeNodeFactory; +import org.glassfish.flashlight.provider.FlashlightProbe; +import org.glassfish.flashlight.provider.ProbeRegistry; +import org.glassfish.gmbal.AMXMetadata; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedObjectManager; +import org.glassfish.gmbal.ManagedObjectManagerFactory; import org.jvnet.hk2.config.ConfigSupport; +import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import java.beans.PropertyVetoException; -import org.glassfish.admin.monitor.StatsProviderRegistry.StatsProviderRegistryElement; -import org.glassfish.external.amx.MBeanListener; -import org.glassfish.external.amx.AMXGlassfish; -import static org.glassfish.external.amx.AMX.*; - -import org.glassfish.flashlight.provider.FlashlightProbe; -import org.glassfish.flashlight.provider.ProbeRegistry; -import static org.glassfish.admin.monitor.MLogger.*; +import static org.glassfish.admin.monitor.MLogger.ListenerRegistrationFailed; +import static org.glassfish.admin.monitor.MLogger.cannotCreateConfigElement; +import static org.glassfish.admin.monitor.MLogger.errorResettingStatsProvider; +import static org.glassfish.admin.monitor.MLogger.errorUnregisteringStatsProvider; +import static org.glassfish.admin.monitor.MLogger.getLogger; +import static org.glassfish.admin.monitor.MLogger.gmbalRegistrationFailed; +import static org.glassfish.admin.monitor.MLogger.gmbalUnRegistrationFailed; +import static org.glassfish.admin.monitor.MLogger.invalidStatsProvider; +import static org.glassfish.admin.monitor.MLogger.monitorElementDoesnotExist; +import static org.glassfish.admin.monitor.MLogger.nodeNotFound; +import static org.glassfish.admin.monitor.MLogger.notaManagedObject; +import static org.glassfish.external.amx.AMX.NAME_KEY; +import static org.glassfish.external.amx.AMX.PARENT_PATH_KEY; +import static org.glassfish.external.amx.AMX.TYPE_KEY; /** * diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderRegistry.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderRegistry.java index fb64012665e..94ddffbe953 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderRegistry.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderRegistry.java @@ -17,13 +17,19 @@ package org.glassfish.admin.monitor; import java.lang.reflect.Method; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; + +import org.glassfish.external.probe.provider.PluginPoint; +import org.glassfish.external.probe.provider.StatsProviderInfo; import org.glassfish.flashlight.MonitoringRuntimeDataRegistry; import org.glassfish.flashlight.client.ProbeClientMethodHandle; import org.glassfish.gmbal.ManagedObjectManager; -import org.glassfish.external.probe.provider.PluginPoint; -import org.glassfish.external.probe.provider.StatsProviderInfo; public class StatsProviderRegistry { private Map> configToRegistryElementMap = new HashMap(); diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderUtil.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderUtil.java index 35edda0b837..53b8ad56033 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderUtil.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderUtil.java @@ -16,10 +16,10 @@ package org.glassfish.admin.monitor; -import org.glassfish.flashlight.client.ProbeClientMethodHandle; - import java.util.Collection; +import org.glassfish.flashlight.client.ProbeClientMethodHandle; + public class StatsProviderUtil { private static StatsProviderManagerDelegateImpl spmd; // populate this during our initilaization process diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/cli/ListJndiEntries.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/cli/ListJndiEntries.java index 76a7e3957f0..6d3e0861399 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/cli/ListJndiEntries.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/cli/ListJndiEntries.java @@ -16,28 +16,29 @@ package org.glassfish.admin.monitor.cli; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.admin.CommandLock; -import org.glassfish.api.I18n; -import org.glassfish.api.Param; -import org.glassfish.api.ActionReport; -import org.glassfish.config.support.TargetType; -import org.glassfish.config.support.CommandTarget; -import org.glassfish.api.admin.ExecuteOn; -import org.glassfish.api.admin.RuntimeType; -import org.jvnet.hk2.annotations.Service; - -import org.glassfish.hk2.api.PerLookup; -import com.sun.enterprise.util.SystemPropertyConstants; -import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.admin.monitor.jndi.JndiNameLookupHelper; import com.sun.enterprise.config.serverbeans.Resources; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; -import javax.naming.NamingException; import java.util.List; + +import javax.naming.NamingException; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.I18n; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.config.support.CommandTarget; +import org.glassfish.config.support.TargetType; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; @Service(name = "list-jndi-entries") @PerLookup diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/cli/Monitor.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/cli/Monitor.java index 96a6e8cc0c2..e0e0bc59972 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/cli/Monitor.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/cli/Monitor.java @@ -16,20 +16,20 @@ package org.glassfish.admin.monitor.cli; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + +import java.util.Iterator; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.jvnet.hk2.annotations.Service; - +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; - -import com.sun.enterprise.util.LocalStringManagerImpl; - -import jakarta.inject.Inject; -import java.util.Iterator; +import org.jvnet.hk2.annotations.Service; /** * Return the version and build number diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMClassLoadingStatsProvider.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMClassLoadingStatsProvider.java index 235700deae9..ca33547a288 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMClassLoadingStatsProvider.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMClassLoadingStatsProvider.java @@ -18,6 +18,7 @@ import java.lang.management.ClassLoadingMXBean; import java.lang.management.ManagementFactory; + import org.glassfish.external.statistics.CountStatistic; import org.glassfish.external.statistics.impl.CountStatisticImpl; import org.glassfish.gmbal.AMXMetadata; diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMCompilationStatsProvider.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMCompilationStatsProvider.java index 39ac86bd3de..3f0342f268e 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMCompilationStatsProvider.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMCompilationStatsProvider.java @@ -18,12 +18,13 @@ import java.lang.management.CompilationMXBean; import java.lang.management.ManagementFactory; + import org.glassfish.external.statistics.CountStatistic; -import org.glassfish.external.statistics.impl.CountStatisticImpl; import org.glassfish.external.statistics.StringStatistic; +import org.glassfish.external.statistics.impl.CountStatisticImpl; import org.glassfish.external.statistics.impl.StringStatisticImpl; -import org.glassfish.gmbal.Description; import org.glassfish.gmbal.AMXMetadata; +import org.glassfish.gmbal.Description; import org.glassfish.gmbal.ManagedAttribute; import org.glassfish.gmbal.ManagedObject; diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMGCStatsProvider.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMGCStatsProvider.java index 757c48f6b58..2587dd80e19 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMGCStatsProvider.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMGCStatsProvider.java @@ -19,10 +19,11 @@ import java.lang.management.GarbageCollectorMXBean; import java.lang.management.ManagementFactory; import java.util.List; + import org.glassfish.external.statistics.CountStatistic; import org.glassfish.external.statistics.impl.CountStatisticImpl; -import org.glassfish.gmbal.Description; import org.glassfish.gmbal.AMXMetadata; +import org.glassfish.gmbal.Description; import org.glassfish.gmbal.ManagedAttribute; import org.glassfish.gmbal.ManagedObject; diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMMemoryStatsProvider.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMMemoryStatsProvider.java index 53b77472181..548ba5a5898 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMMemoryStatsProvider.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMMemoryStatsProvider.java @@ -18,6 +18,7 @@ import java.lang.management.ManagementFactory; import java.lang.management.MemoryMXBean; + import org.glassfish.external.statistics.CountStatistic; import org.glassfish.external.statistics.impl.CountStatisticImpl; import org.glassfish.gmbal.AMXMetadata; diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMOSStatsProvider.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMOSStatsProvider.java index 3e99fdfcf2f..4b868ccf1af 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMOSStatsProvider.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMOSStatsProvider.java @@ -18,9 +18,10 @@ import java.lang.management.ManagementFactory; import java.lang.management.OperatingSystemMXBean; + import org.glassfish.external.statistics.CountStatistic; -import org.glassfish.external.statistics.impl.CountStatisticImpl; import org.glassfish.external.statistics.StringStatistic; +import org.glassfish.external.statistics.impl.CountStatisticImpl; import org.glassfish.external.statistics.impl.StringStatisticImpl; import org.glassfish.gmbal.AMXMetadata; import org.glassfish.gmbal.Description; diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMRuntimeStatsProvider.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMRuntimeStatsProvider.java index 5925eaae712..723766824c5 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMRuntimeStatsProvider.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMRuntimeStatsProvider.java @@ -19,9 +19,10 @@ import java.lang.management.ManagementFactory; import java.lang.management.RuntimeMXBean; import java.util.List; + import org.glassfish.external.statistics.CountStatistic; -import org.glassfish.external.statistics.impl.CountStatisticImpl; import org.glassfish.external.statistics.StringStatistic; +import org.glassfish.external.statistics.impl.CountStatisticImpl; import org.glassfish.external.statistics.impl.StringStatisticImpl; import org.glassfish.gmbal.AMXMetadata; import org.glassfish.gmbal.Description; diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMStatsProviderBootstrap.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMStatsProviderBootstrap.java index aaba2c4fb3c..94ab582abff 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMStatsProviderBootstrap.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMStatsProviderBootstrap.java @@ -21,13 +21,14 @@ import java.lang.management.ManagementFactory; import java.lang.management.ThreadInfo; import java.lang.management.ThreadMXBean; -import org.jvnet.hk2.annotations.Service; + import org.glassfish.api.monitoring.ContainerMonitoring; import org.glassfish.external.probe.provider.PluginPoint; import org.glassfish.external.probe.provider.StatsProviderManager; import org.glassfish.hk2.api.PostConstruct; import org.glassfish.hk2.runlevel.RunLevel; -import org.glassfish.internal.api.*; +import org.glassfish.internal.api.PostStartupRunLevel; +import org.jvnet.hk2.annotations.Service; /** * diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMThreadInfoStatsProvider.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMThreadInfoStatsProvider.java index 298625f1afe..a648d833286 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMThreadInfoStatsProvider.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMThreadInfoStatsProvider.java @@ -17,6 +17,7 @@ package org.glassfish.admin.monitor.jvm; import java.lang.management.ThreadInfo; + import org.glassfish.external.statistics.CountStatistic; import org.glassfish.external.statistics.StringStatistic; import org.glassfish.external.statistics.impl.CountStatisticImpl; diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMThreadSystemStatsProvider.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMThreadSystemStatsProvider.java index 3dc810f8a3d..3da2ed9cc3c 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMThreadSystemStatsProvider.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMThreadSystemStatsProvider.java @@ -18,6 +18,7 @@ import java.lang.management.ManagementFactory; import java.lang.management.ThreadMXBean; + import org.glassfish.external.statistics.CountStatistic; import org.glassfish.external.statistics.StringStatistic; import org.glassfish.external.statistics.impl.CountStatisticImpl; diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/ServerRuntimeStatsProvider.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/ServerRuntimeStatsProvider.java index 9878ccf884f..478618150fa 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/ServerRuntimeStatsProvider.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/ServerRuntimeStatsProvider.java @@ -18,6 +18,7 @@ import java.lang.management.ManagementFactory; import java.lang.management.RuntimeMXBean; + import org.glassfish.gmbal.AMXMetadata; import org.glassfish.gmbal.Description; import org.glassfish.gmbal.ManagedAttribute; diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/statistics/JVMStatsImpl.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/statistics/JVMStatsImpl.java index 00ef8d24fa4..925fe90cf91 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/statistics/JVMStatsImpl.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/statistics/JVMStatsImpl.java @@ -16,25 +16,26 @@ package org.glassfish.admin.monitor.jvm.statistics; -import java.util.*; -import org.jvnet.hk2.annotations.Optional; -import org.jvnet.hk2.annotations.Service; +import com.sun.enterprise.config.serverbeans.MonitoringService; +import com.sun.enterprise.util.LocalStringManagerImpl; -import org.glassfish.hk2.api.PerLookup; +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import java.util.List; + +import org.glassfish.admin.monitor.cli.MonitorContract; import org.glassfish.api.ActionReport; -import org.glassfish.api.monitoring.ContainerMonitoring; import org.glassfish.api.ActionReport.ExitCode; -import org.glassfish.admin.monitor.cli.MonitorContract; -import org.glassfish.flashlight.MonitoringRuntimeDataRegistry; -import org.glassfish.flashlight.datatree.TreeNode; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.config.serverbeans.MonitoringService; import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.external.statistics.Statistic; +import org.glassfish.api.monitoring.ContainerMonitoring; import org.glassfish.external.statistics.CountStatistic; - -import jakarta.inject.Inject; -import jakarta.inject.Named; +import org.glassfish.external.statistics.Statistic; +import org.glassfish.flashlight.MonitoringRuntimeDataRegistry; +import org.glassfish.flashlight.datatree.TreeNode; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Optional; +import org.jvnet.hk2.annotations.Service; /** * diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/datatree/factory/TreeNodeFactory.java b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/datatree/factory/TreeNodeFactory.java index 4326a239049..f2d6cff767d 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/datatree/factory/TreeNodeFactory.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/datatree/factory/TreeNodeFactory.java @@ -22,8 +22,9 @@ package org.glassfish.flashlight.datatree.factory; import java.lang.reflect.Method; -import org.glassfish.flashlight.datatree.TreeNode; + import org.glassfish.flashlight.datatree.MethodInvoker; +import org.glassfish.flashlight.datatree.TreeNode; import org.glassfish.flashlight.datatree.impl.MethodInvokerImpl; import org.glassfish.flashlight.datatree.impl.TreeNodeImpl; diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/datatree/impl/AbstractTreeNode.java b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/datatree/impl/AbstractTreeNode.java index 81472f99f91..ebf8b543b20 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/datatree/impl/AbstractTreeNode.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/datatree/impl/AbstractTreeNode.java @@ -16,16 +16,25 @@ package org.glassfish.flashlight.datatree.impl; -import static com.sun.enterprise.util.StringUtils.ok; import com.sun.enterprise.util.ObjectAnalyzer; -import static com.sun.enterprise.util.SystemPropertyConstants.MONDOT; -import static com.sun.enterprise.util.SystemPropertyConstants.SLASH; -import org.glassfish.flashlight.datatree.TreeNode; -import java.util.*; -import java.util.concurrent.*; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.glassfish.flashlight.datatree.TreeNode; + +import static com.sun.enterprise.util.StringUtils.ok; +import static com.sun.enterprise.util.SystemPropertyConstants.MONDOT; +import static com.sun.enterprise.util.SystemPropertyConstants.SLASH; + /** * * @author Harpreet Singh diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/datatree/impl/MethodInvokerImpl.java b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/datatree/impl/MethodInvokerImpl.java index bdf6343da5c..893cf251b5a 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/datatree/impl/MethodInvokerImpl.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/datatree/impl/MethodInvokerImpl.java @@ -21,11 +21,11 @@ package org.glassfish.flashlight.datatree.impl; -import org.glassfish.flashlight.datatree.MethodInvoker; - import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import org.glassfish.flashlight.datatree.MethodInvoker; + /** * * @author Harpreet Singh diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/impl/MonitoringRuntimeDataRegistryImpl.java b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/impl/MonitoringRuntimeDataRegistryImpl.java index 20101cd4318..cf11d1d91a6 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/impl/MonitoringRuntimeDataRegistryImpl.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/impl/MonitoringRuntimeDataRegistryImpl.java @@ -21,13 +21,14 @@ package org.glassfish.flashlight.impl; -import org.glassfish.flashlight.*; +import jakarta.inject.Singleton; + import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.glassfish.flashlight.datatree.TreeNode; +import org.glassfish.flashlight.MonitoringRuntimeDataRegistry; +import org.glassfish.flashlight.datatree.TreeNode; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Singleton; /** * @author Harpreet Singh diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/Average.java b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/Average.java index 776ca7fb03f..053473638de 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/Average.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/Average.java @@ -16,8 +16,8 @@ package org.glassfish.flashlight.statistics; -import org.jvnet.hk2.annotations.Contract; import org.glassfish.external.statistics.RangeStatistic; +import org.jvnet.hk2.annotations.Contract; /** * @author Harpreet SIngh diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/factory/AverageFactory.java b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/factory/AverageFactory.java index d658b768363..0ec78c11c9d 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/factory/AverageFactory.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/factory/AverageFactory.java @@ -21,8 +21,8 @@ package org.glassfish.flashlight.statistics.factory; -import org.glassfish.flashlight.statistics.impl.AverageImpl; import org.glassfish.flashlight.statistics.Average; +import org.glassfish.flashlight.statistics.impl.AverageImpl; /** * diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/factory/CounterFactory.java b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/factory/CounterFactory.java index dc28ef45084..47e7383e375 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/factory/CounterFactory.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/factory/CounterFactory.java @@ -21,7 +21,7 @@ package org.glassfish.flashlight.statistics.factory; -import org.glassfish.flashlight.statistics.*; +import org.glassfish.flashlight.statistics.Counter; import org.glassfish.flashlight.statistics.impl.CounterImpl; /** diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/impl/AverageImpl.java b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/impl/AverageImpl.java index 16a75b22fbd..b436cacb1b6 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/impl/AverageImpl.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/impl/AverageImpl.java @@ -21,11 +21,11 @@ package org.glassfish.flashlight.statistics.impl; import java.util.concurrent.atomic.AtomicLong; + import org.glassfish.flashlight.datatree.impl.AbstractTreeNode; import org.glassfish.flashlight.statistics.Average; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/impl/CounterImpl.java b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/impl/CounterImpl.java index 0c4615531af..3c22016ed59 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/impl/CounterImpl.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/impl/CounterImpl.java @@ -20,12 +20,12 @@ */ package org.glassfish.flashlight.statistics.impl; -import org.glassfish.flashlight.statistics.*; import java.util.concurrent.atomic.AtomicLong; -import org.glassfish.flashlight.datatree.impl.AbstractTreeNode; -import org.jvnet.hk2.annotations.Service; +import org.glassfish.flashlight.datatree.impl.AbstractTreeNode; +import org.glassfish.flashlight.statistics.Counter; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * @author Harpreet Singh diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/impl/TimeStatsAbstractImpl.java b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/impl/TimeStatsAbstractImpl.java index bade1eb22f1..5a465f9c894 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/impl/TimeStatsAbstractImpl.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/impl/TimeStatsAbstractImpl.java @@ -16,12 +16,13 @@ package org.glassfish.flashlight.statistics.impl; +import java.util.concurrent.atomic.AtomicLong; + import org.glassfish.flashlight.datatree.impl.AbstractTreeNode; -import org.glassfish.flashlight.statistics.*; +import org.glassfish.flashlight.statistics.Average; +import org.glassfish.flashlight.statistics.TimeStats; import org.glassfish.flashlight.statistics.factory.AverageFactory; -import java.util.concurrent.atomic.AtomicLong; - /** * @author Harpreet Singh */ diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/impl/TimeStatsMillisImpl.java b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/impl/TimeStatsMillisImpl.java index 5e78a12394a..ad143c423d5 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/impl/TimeStatsMillisImpl.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/impl/TimeStatsMillisImpl.java @@ -22,9 +22,8 @@ package org.glassfish.flashlight.statistics.impl; import org.glassfish.flashlight.statistics.TimeStatsMillis; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/impl/TimeStatsNanosImpl.java b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/impl/TimeStatsNanosImpl.java index af5bf7b18e4..30c6bb964b1 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/impl/TimeStatsNanosImpl.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/impl/TimeStatsNanosImpl.java @@ -21,9 +21,8 @@ package org.glassfish.flashlight.statistics.impl; import org.glassfish.flashlight.statistics.TimeStatsNanos; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * diff --git a/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/AbstractProxyRestAdapter.java b/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/AbstractProxyRestAdapter.java index 2deb0dfcd31..2ea894c815c 100644 --- a/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/AbstractProxyRestAdapter.java +++ b/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/AbstractProxyRestAdapter.java @@ -18,13 +18,14 @@ import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.v3.admin.adapter.AdminEndpointDecider; -import org.glassfish.api.container.Adapter; -import org.glassfish.grizzly.http.server.HttpHandler; -import org.glassfish.hk2.api.ServiceLocator; import java.net.InetAddress; import java.util.List; +import org.glassfish.api.container.Adapter; +import org.glassfish.grizzly.http.server.HttpHandler; +import org.glassfish.hk2.api.ServiceLocator; + /** * Base class for our implementation of Adapter proxies. To avoid early loading of adapter implentations, use a * handle-body idiom here. Only operations related to metadata is handled by this class. The rest of the operations are diff --git a/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/Logging.java b/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/Logging.java index b4f89913704..d6dcd759fba 100644 --- a/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/Logging.java +++ b/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/Logging.java @@ -17,6 +17,7 @@ package org.glassfish.admin.restconnector; import java.util.logging.Logger; + import org.glassfish.logging.annotation.LogMessageInfo; import org.glassfish.logging.annotation.LogMessagesResourceBundle; import org.glassfish.logging.annotation.LoggerInfo; diff --git a/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/ProxyRestCommandAdapter.java b/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/ProxyRestCommandAdapter.java index 8cdc03a1f27..fca83ba3c97 100644 --- a/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/ProxyRestCommandAdapter.java +++ b/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/ProxyRestCommandAdapter.java @@ -17,12 +17,14 @@ package org.glassfish.admin.restconnector; import com.sun.enterprise.config.serverbeans.Config; + import jakarta.inject.Inject; import jakarta.inject.Named; + import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.api.container.Adapter; -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.ServiceLocator; +import org.jvnet.hk2.annotations.Service; /** * Implementation of {@link Adapter} for rest based command executor. It extends from {@link AbstractProxyRestAdapter} diff --git a/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/ProxyRestManagementAdapter.java b/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/ProxyRestManagementAdapter.java index 936003780ba..e64e5367df9 100644 --- a/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/ProxyRestManagementAdapter.java +++ b/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/ProxyRestManagementAdapter.java @@ -17,14 +17,15 @@ package org.glassfish.admin.restconnector; import com.sun.enterprise.config.serverbeans.Config; -import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.api.container.Adapter; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; import jakarta.inject.Inject; import jakarta.inject.Named; +import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.api.container.Adapter; +import org.glassfish.hk2.api.ServiceLocator; +import org.jvnet.hk2.annotations.Service; + /** * Implementation of {@link Adapter} for rest based management. It extends from {@link AbstractProxyRestAdapter} that * uses a handle-body idiom. The handle implements methods that are metadata/configuration based. The body implements diff --git a/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/ProxyRestMonitoringAdapter.java b/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/ProxyRestMonitoringAdapter.java index 4e1aa724584..cd7ff6a7c4c 100644 --- a/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/ProxyRestMonitoringAdapter.java +++ b/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/ProxyRestMonitoringAdapter.java @@ -17,14 +17,15 @@ package org.glassfish.admin.restconnector; import com.sun.enterprise.config.serverbeans.Config; -import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.api.container.Adapter; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; import jakarta.inject.Inject; import jakarta.inject.Named; +import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.api.container.Adapter; +import org.glassfish.hk2.api.ServiceLocator; +import org.jvnet.hk2.annotations.Service; + /** * Implementation of {@link Adapter} for rest based monitoring. It extends from {@link AbstractProxyRestAdapter} that * uses a handle-body idiom. The handle implements methods that are metadata/configuration based. The body implements diff --git a/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/RestConfig.java b/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/RestConfig.java index 934e248443d..3109ca005ab 100644 --- a/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/RestConfig.java +++ b/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/RestConfig.java @@ -18,7 +18,6 @@ import org.glassfish.api.admin.config.ConfigExtension; import org.jvnet.hk2.config.Attribute; - import org.jvnet.hk2.config.Configured; /** diff --git a/nucleus/admin/rest/rest-client/src/main/java/org/glassfish/admin/rest/client/RestClientBase.java b/nucleus/admin/rest/rest-client/src/main/java/org/glassfish/admin/rest/client/RestClientBase.java index daf7f2f8c25..0e8a11323b5 100644 --- a/nucleus/admin/rest/rest-client/src/main/java/org/glassfish/admin/rest/client/RestClientBase.java +++ b/nucleus/admin/rest/rest-client/src/main/java/org/glassfish/admin/rest/client/RestClientBase.java @@ -16,11 +16,6 @@ package org.glassfish.admin.rest.client; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.client.WebTarget; @@ -29,6 +24,12 @@ import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + import org.codehaus.jettison.json.JSONObject; import org.glassfish.admin.rest.client.utils.Util; diff --git a/nucleus/admin/rest/rest-client/src/main/java/org/glassfish/admin/rest/client/RestResponse.java b/nucleus/admin/rest/rest-client/src/main/java/org/glassfish/admin/rest/client/RestResponse.java index 96e68cf3dc9..a206aa70258 100644 --- a/nucleus/admin/rest/rest-client/src/main/java/org/glassfish/admin/rest/client/RestResponse.java +++ b/nucleus/admin/rest/rest-client/src/main/java/org/glassfish/admin/rest/client/RestResponse.java @@ -16,13 +16,14 @@ package org.glassfish.admin.rest.client; -import org.glassfish.admin.rest.client.utils.Util; - import jakarta.ws.rs.core.Response; + import java.util.Collections; import java.util.List; import java.util.Map; +import org.glassfish.admin.rest.client.utils.Util; + /** * * @author jasonlee diff --git a/nucleus/admin/rest/rest-client/src/main/java/org/glassfish/admin/rest/client/utils/RestClientLogging.java b/nucleus/admin/rest/rest-client/src/main/java/org/glassfish/admin/rest/client/utils/RestClientLogging.java index 320ba073db7..501c73f9c5b 100644 --- a/nucleus/admin/rest/rest-client/src/main/java/org/glassfish/admin/rest/client/utils/RestClientLogging.java +++ b/nucleus/admin/rest/rest-client/src/main/java/org/glassfish/admin/rest/client/utils/RestClientLogging.java @@ -17,6 +17,7 @@ package org.glassfish.admin.rest.client.utils; import java.util.logging.Logger; + import org.glassfish.logging.annotation.LogMessageInfo; import org.glassfish.logging.annotation.LogMessagesResourceBundle; import org.glassfish.logging.annotation.LoggerInfo; diff --git a/nucleus/admin/rest/rest-client/src/main/java/org/glassfish/admin/rest/client/utils/Util.java b/nucleus/admin/rest/rest-client/src/main/java/org/glassfish/admin/rest/client/utils/Util.java index 0b7fd5c0388..f2a7ef4cc1a 100644 --- a/nucleus/admin/rest/rest-client/src/main/java/org/glassfish/admin/rest/client/utils/Util.java +++ b/nucleus/admin/rest/rest-client/src/main/java/org/glassfish/admin/rest/client/utils/Util.java @@ -22,6 +22,7 @@ import java.util.List; import java.util.Map; import java.util.logging.Level; + import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/RestConfigChangeListener.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/RestConfigChangeListener.java index 2d9b47a35d4..092e33eccc7 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/RestConfigChangeListener.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/RestConfigChangeListener.java @@ -17,6 +17,7 @@ package org.glassfish.admin.rest; import java.beans.PropertyChangeEvent; + import org.glassfish.admin.rest.adapter.Reloader; import org.glassfish.admin.rest.utils.ResourceUtil; import org.glassfish.admin.restconnector.RestConfig; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/RestLogging.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/RestLogging.java index d1c1456af43..3d7e0bb5dbd 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/RestLogging.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/RestLogging.java @@ -17,6 +17,7 @@ package org.glassfish.admin.rest; import java.util.logging.Logger; + import org.glassfish.logging.annotation.LogMessageInfo; import org.glassfish.logging.annotation.LogMessagesResourceBundle; import org.glassfish.logging.annotation.LoggerInfo; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/AdminJerseyServiceIteratorProvider.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/AdminJerseyServiceIteratorProvider.java index 31eace29a9b..815438e27fa 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/AdminJerseyServiceIteratorProvider.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/AdminJerseyServiceIteratorProvider.java @@ -21,6 +21,7 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.ServiceConfigurationError; + import org.glassfish.jersey.internal.ServiceFinder; import org.glassfish.jersey.internal.ServiceFinder.ServiceIteratorProvider; import org.glassfish.jersey.internal.spi.AutoDiscoverable; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/ExceptionFilter.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/ExceptionFilter.java index ae4de764ca6..8ef060497b6 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/ExceptionFilter.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/ExceptionFilter.java @@ -16,11 +16,13 @@ package org.glassfish.admin.rest.adapter; -import java.io.IOException; import jakarta.ws.rs.container.ContainerRequestContext; import jakarta.ws.rs.container.ContainerResponseContext; import jakarta.ws.rs.container.ContainerResponseFilter; import jakarta.ws.rs.ext.Provider; + +import java.io.IOException; + import org.glassfish.admin.rest.Constants; import org.glassfish.admin.rest.model.ResponseBody; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestCommandResourceProvider.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestCommandResourceProvider.java index e2ef9fa578e..f7fa51ae47a 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestCommandResourceProvider.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestCommandResourceProvider.java @@ -16,12 +16,19 @@ package org.glassfish.admin.rest.adapter; +import jakarta.ws.rs.core.MediaType; + import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import jakarta.ws.rs.core.MediaType; -import org.glassfish.admin.rest.provider.*; + +import org.glassfish.admin.rest.provider.ActionReportJson2Provider; +import org.glassfish.admin.rest.provider.AdminCommandStateJsonProvider; +import org.glassfish.admin.rest.provider.CommandModelStaxProvider; +import org.glassfish.admin.rest.provider.ParamsWithPayloadMultipartWriter; +import org.glassfish.admin.rest.provider.ProgressStatusEventJsonProvider; +import org.glassfish.admin.rest.provider.ProgressStatusJsonProvider; import org.glassfish.admin.rest.readers.JsonParameterMapProvider; import org.glassfish.admin.rest.readers.MultipartFDPayloadReader; import org.glassfish.admin.rest.readers.ParameterMapFormReader; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestMonitoringResourceProvider.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestMonitoringResourceProvider.java index 6f645d8bf39..8b5a430b37d 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestMonitoringResourceProvider.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestMonitoringResourceProvider.java @@ -17,12 +17,12 @@ package org.glassfish.admin.rest.adapter; -import org.glassfish.admin.restconnector.Constants; -import org.glassfish.hk2.api.ServiceLocator; - import java.util.HashSet; import java.util.Set; +import org.glassfish.admin.restconnector.Constants; +import org.glassfish.hk2.api.ServiceLocator; + /** * ReST adapter for monitoring requests via HttpServlet interface */ diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestResourceProvider.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestResourceProvider.java index 04f4cfd5f63..36ee15b045d 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestResourceProvider.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestResourceProvider.java @@ -16,14 +16,14 @@ package org.glassfish.admin.rest.adapter; +import java.util.Set; + import org.glassfish.api.container.EndpointRegistrationException; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.hk2.utilities.Binder; import org.glassfish.internal.api.ServerContext; import org.glassfish.jersey.server.ResourceConfig; -import java.util.Set; - /** * Represents contract between {@link RestAdapter} and actual ReST resource providers. * diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/GetGroupNamesCommand.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/GetGroupNamesCommand.java index c9baf7eb501..002e2d3999d 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/GetGroupNamesCommand.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/GetGroupNamesCommand.java @@ -29,24 +29,33 @@ import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; import com.sun.enterprise.v3.common.ActionReporter; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.util.ArrayList; import java.util.Arrays; import java.util.Enumeration; import java.util.List; import java.util.Properties; + import org.glassfish.api.ActionReport.ExitCode; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.types.Property; -import jakarta.inject.Inject; -import jakarta.inject.Named; - /** * returns the list of targets * diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/GetTokensCommand.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/GetTokensCommand.java index eaa655f1fc9..a99e89aed06 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/GetTokensCommand.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/GetTokensCommand.java @@ -22,22 +22,29 @@ import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.util.SystemPropertyConstants; import com.sun.enterprise.v3.common.ActionReporter; + +import jakarta.inject.Inject; + import java.util.Map; import java.util.Properties; import java.util.TreeMap; + import org.glassfish.api.ActionReport; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.PropertyResolver; import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; - import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; - /** * * @author jasonlee diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/IsAnonymousUserEnabledCommand.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/IsAnonymousUserEnabledCommand.java index cca5e9b2b96..c3a8894cdc1 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/IsAnonymousUserEnabledCommand.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/IsAnonymousUserEnabledCommand.java @@ -17,19 +17,20 @@ package org.glassfish.admin.rest.cli; import com.sun.enterprise.config.serverbeans.Domain; + +import jakarta.inject.Inject; + import java.util.Properties; + import org.glassfish.api.ActionReport; import org.glassfish.api.ActionReport.ExitCode; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; - -import jakarta.inject.Inject; +import org.jvnet.hk2.annotations.Service; /** * diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/PredefinedAuthRealmClassNamesCommand.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/PredefinedAuthRealmClassNamesCommand.java index 0cd21a84efd..0cb4e950326 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/PredefinedAuthRealmClassNamesCommand.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/PredefinedAuthRealmClassNamesCommand.java @@ -17,17 +17,18 @@ package org.glassfish.admin.rest.cli; import com.sun.enterprise.config.serverbeans.Domain; + +import jakarta.inject.Inject; + import org.glassfish.api.ActionReport; import org.glassfish.api.ActionReport.ExitCode; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandLock; - -import org.jvnet.hk2.annotations.Service; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; import org.glassfish.hk2.api.PerLookup; -import org.glassfish.api.admin.*; - -import jakarta.inject.Inject; +import org.jvnet.hk2.annotations.Service; /** * returns the list of targets diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SecurityUtil.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SecurityUtil.java index 9b9712813f6..55dcf160ec8 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SecurityUtil.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SecurityUtil.java @@ -21,20 +21,19 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.SecurityService; import com.sun.enterprise.security.auth.login.LoginContextDriver; +import com.sun.enterprise.security.auth.realm.Realm; +import com.sun.enterprise.security.auth.realm.RealmsManager; +import com.sun.enterprise.security.auth.realm.User; + +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; -import java.util.ArrayList; import java.util.Properties; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.api.Globals; -import com.sun.enterprise.security.auth.realm.RealmsManager; -import com.sun.enterprise.security.auth.realm.Realm; -import com.sun.enterprise.security.auth.realm.User; - -import java.util.Enumeration; - import org.jvnet.hk2.config.types.Property; /** diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SetRestConfig.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SetRestConfig.java index fe05e9207b3..39a14219141 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SetRestConfig.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SetRestConfig.java @@ -18,9 +18,12 @@ import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; -import java.beans.PropertyVetoException; + import jakarta.inject.Inject; import jakarta.inject.Named; + +import java.beans.PropertyVetoException; + import org.glassfish.admin.restconnector.RestConfig; import org.glassfish.api.ActionReport; import org.glassfish.api.Param; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SupportsUserManagementCommand.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SupportsUserManagementCommand.java index febcefd58cf..0cfa76eac6b 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SupportsUserManagementCommand.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SupportsUserManagementCommand.java @@ -26,8 +26,13 @@ import com.sun.enterprise.security.auth.realm.exceptions.NoSuchRealmException; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.util.List; import java.util.Properties; + import org.glassfish.api.ActionReport; import org.glassfish.api.ActionReport.ExitCode; import org.glassfish.api.Param; @@ -42,14 +47,10 @@ import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.types.Property; -import jakarta.inject.Inject; -import jakarta.inject.Named; - /** * returns the list of targets * diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SynchronizeRealmFromConfig.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SynchronizeRealmFromConfig.java index 6c3e853dcaf..c72c5c01a36 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SynchronizeRealmFromConfig.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/cli/SynchronizeRealmFromConfig.java @@ -26,10 +26,15 @@ import com.sun.enterprise.security.auth.realm.exceptions.NoSuchRealmException; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Properties; + import org.glassfish.api.ActionReport; import org.glassfish.api.ActionReport.ExitCode; import org.glassfish.api.Param; @@ -45,14 +50,10 @@ import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.types.Property; -import jakarta.inject.Inject; -import jakarta.inject.Named; - /** * returns the list of targets * diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/LegacyCompositeResource.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/LegacyCompositeResource.java index 6fcd7cd6ca9..367b3bb1f61 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/LegacyCompositeResource.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/LegacyCompositeResource.java @@ -16,12 +16,14 @@ package org.glassfish.admin.rest.composite; -import java.net.URI; import jakarta.ws.rs.OPTIONS; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.ResponseBuilder; import jakarta.ws.rs.core.Response.Status; import jakarta.ws.rs.core.UriInfo; + +import java.net.URI; + import org.codehaus.jettison.json.JSONException; import org.glassfish.admin.rest.OptionsCapable; import org.glassfish.admin.rest.composite.metadata.DefaultsGenerator; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/Primitive.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/Primitive.java index 4d9dd8e243b..650a696d091 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/Primitive.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/Primitive.java @@ -16,7 +16,14 @@ package org.glassfish.admin.rest.composite; -import static org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.DLOAD; +import static org.objectweb.asm.Opcodes.DRETURN; +import static org.objectweb.asm.Opcodes.FLOAD; +import static org.objectweb.asm.Opcodes.FRETURN; +import static org.objectweb.asm.Opcodes.ILOAD; +import static org.objectweb.asm.Opcodes.IRETURN; +import static org.objectweb.asm.Opcodes.LLOAD; +import static org.objectweb.asm.Opcodes.LRETURN; /** * This enum encapsulates the metadata for primitives needed for generating fields, getters and setters diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/Property.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/Property.java index 3c09a88a94a..d300c178f46 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/Property.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/Property.java @@ -17,6 +17,7 @@ package org.glassfish.admin.rest.composite; import jakarta.validation.constraints.NotNull; + import org.jvnet.hk2.annotations.Service; /** diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/RestCollection.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/RestCollection.java index 7db440d1c71..8f34c1d64f7 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/RestCollection.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/RestCollection.java @@ -25,6 +25,7 @@ import java.util.Map.Entry; import java.util.Set; import java.util.TreeSet; + import org.glassfish.admin.rest.composite.metadata.RestModelMetadata; /** diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/RestModelExtension.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/RestModelExtension.java index da17df5730c..8d0e32b00e4 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/RestModelExtension.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/RestModelExtension.java @@ -16,12 +16,14 @@ package org.glassfish.admin.rest.composite; +import jakarta.inject.Qualifier; + import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import jakarta.inject.Qualifier; + import org.jvnet.hk2.annotations.Contract; /** diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/AttributeReference.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/AttributeReference.java index e34784f6d21..48459e34195 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/AttributeReference.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/AttributeReference.java @@ -16,12 +16,13 @@ package org.glassfish.admin.rest.composite.metadata; +import jakarta.inject.Qualifier; + import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import jakarta.inject.Qualifier; /** * Many, if not all, RestModel instances will expose properties that mirror similarly-named properties on diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Confidential.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Confidential.java index 40f403a557c..bb9e116e896 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Confidential.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Confidential.java @@ -16,12 +16,13 @@ package org.glassfish.admin.rest.composite.metadata; +import jakarta.inject.Qualifier; + import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import jakarta.inject.Qualifier; /** * diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/CreateOnly.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/CreateOnly.java index 4a134053546..d8a0841d406 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/CreateOnly.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/CreateOnly.java @@ -16,12 +16,13 @@ package org.glassfish.admin.rest.composite.metadata; +import jakarta.inject.Qualifier; + import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import jakarta.inject.Qualifier; /** * diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Default.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Default.java index f80de4a5d64..dff1b30fc0c 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Default.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Default.java @@ -16,12 +16,13 @@ package org.glassfish.admin.rest.composite.metadata; +import jakarta.inject.Qualifier; + import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import jakarta.inject.Qualifier; /** * diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/DefaultBeanReference.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/DefaultBeanReference.java index dc966e38886..3a5c15e4b18 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/DefaultBeanReference.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/DefaultBeanReference.java @@ -16,12 +16,13 @@ package org.glassfish.admin.rest.composite.metadata; +import jakarta.inject.Qualifier; + import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import jakarta.inject.Qualifier; /** * Often a REST model mirrors/wraps an mbean, descriptor bean or config bean. These beans have annotations and javadoc diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/HelpText.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/HelpText.java index 1a3719495db..5e64d74710c 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/HelpText.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/HelpText.java @@ -16,12 +16,13 @@ package org.glassfish.admin.rest.composite.metadata; +import jakarta.inject.Qualifier; + import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import jakarta.inject.Qualifier; /** * Any property for which help text needs to be specified should be marked with this annotation. The help text will be diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Immutable.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Immutable.java index fa54aa48a59..c953dc63937 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Immutable.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Immutable.java @@ -16,12 +16,13 @@ package org.glassfish.admin.rest.composite.metadata; +import jakarta.inject.Qualifier; + import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import jakarta.inject.Qualifier; /** * diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/LegalValues.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/LegalValues.java index e8c27c24622..33c9c865fb0 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/LegalValues.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/LegalValues.java @@ -16,12 +16,13 @@ package org.glassfish.admin.rest.composite.metadata; +import jakarta.inject.Qualifier; + import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import jakarta.inject.Qualifier; /** * Used to indicate that a String model property can only contain a specific list of strings. diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/ParamMetadata.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/ParamMetadata.java index 0a23a19fbd9..4e082d13bdf 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/ParamMetadata.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/ParamMetadata.java @@ -20,6 +20,7 @@ import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.logging.Level; + import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; import org.glassfish.admin.rest.OptionsCapable; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/ReadOnly.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/ReadOnly.java index 344acde7a88..ba4f4073748 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/ReadOnly.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/ReadOnly.java @@ -16,12 +16,13 @@ package org.glassfish.admin.rest.composite.metadata; +import jakarta.inject.Qualifier; + import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import jakarta.inject.Qualifier; /** * An attribute not intended to be updated/set by the client should be marked read only to indicate that any value diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/RestMethodMetadata.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/RestMethodMetadata.java index 9270c81a9ae..72e4d660c61 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/RestMethodMetadata.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/RestMethodMetadata.java @@ -16,6 +16,13 @@ package org.glassfish.admin.rest.composite.metadata; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.container.Suspended; + import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; @@ -25,12 +32,6 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.container.Suspended; import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/RestResourceMetadata.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/RestResourceMetadata.java index 96b726175c0..fb64b7b9b9c 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/RestResourceMetadata.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/RestResourceMetadata.java @@ -16,17 +16,19 @@ package org.glassfish.admin.rest.composite.metadata; -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; import jakarta.ws.rs.OPTIONS; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; import jakarta.ws.rs.core.MultivaluedHashMap; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; import org.glassfish.admin.rest.OptionsCapable; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Units.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Units.java index 2fd4cec4da0..0ade149400f 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Units.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/Units.java @@ -16,12 +16,13 @@ package org.glassfish.admin.rest.composite.metadata; +import jakarta.inject.Qualifier; + import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import jakarta.inject.Qualifier; /** * Used to indicate what units a scalar property has (e.g. that a long property holds bytes) diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/ASMClassWriter.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/ASMClassWriter.java index 4b419bba720..4d80624c8b0 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/ASMClassWriter.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/ASMClassWriter.java @@ -36,7 +36,31 @@ import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Type; -import static org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.AASTORE; +import static org.objectweb.asm.Opcodes.ACC_PROTECTED; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACC_SUPER; +import static org.objectweb.asm.Opcodes.ALOAD; +import static org.objectweb.asm.Opcodes.ANEWARRAY; +import static org.objectweb.asm.Opcodes.ARETURN; +import static org.objectweb.asm.Opcodes.ASTORE; +import static org.objectweb.asm.Opcodes.BIPUSH; +import static org.objectweb.asm.Opcodes.CHECKCAST; +import static org.objectweb.asm.Opcodes.DUP; +import static org.objectweb.asm.Opcodes.GETFIELD; +import static org.objectweb.asm.Opcodes.ICONST_0; +import static org.objectweb.asm.Opcodes.ICONST_1; +import static org.objectweb.asm.Opcodes.ICONST_2; +import static org.objectweb.asm.Opcodes.ICONST_3; +import static org.objectweb.asm.Opcodes.ICONST_4; +import static org.objectweb.asm.Opcodes.ICONST_5; +import static org.objectweb.asm.Opcodes.INVOKEINTERFACE; +import static org.objectweb.asm.Opcodes.INVOKESPECIAL; +import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL; +import static org.objectweb.asm.Opcodes.NEW; +import static org.objectweb.asm.Opcodes.POP; +import static org.objectweb.asm.Opcodes.RETURN; +import static org.objectweb.asm.Opcodes.V11; /** * @author Ludovic Champenois diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/CommandResourceMetaData.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/CommandResourceMetaData.java index a16d3c1f088..21fce066a9d 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/CommandResourceMetaData.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/CommandResourceMetaData.java @@ -23,6 +23,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; + import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/TextClassWriter.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/TextClassWriter.java index d4ce6173197..3acfc6c1608 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/TextClassWriter.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/TextClassWriter.java @@ -23,6 +23,7 @@ import java.io.Writer; import java.util.List; import java.util.logging.Level; + import org.glassfish.admin.rest.RestLogging; import org.glassfish.admin.rest.utils.ResourceUtil; import org.glassfish.hk2.api.ServiceLocator; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/TextResourcesGenerator.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/TextResourcesGenerator.java index 13d1c9c3d3f..b904070e57f 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/TextResourcesGenerator.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/TextResourcesGenerator.java @@ -22,8 +22,8 @@ import java.io.IOException; import java.util.Date; import java.util.logging.Level; -import org.glassfish.admin.rest.RestLogging; +import org.glassfish.admin.rest.RestLogging; import org.glassfish.hk2.api.ServiceLocator; /** diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/ClientGenerator.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/ClientGenerator.java index 93dce3ecfce..89a94d8a5ea 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/ClientGenerator.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/ClientGenerator.java @@ -18,13 +18,23 @@ import com.sun.appserv.server.util.Version; import com.sun.enterprise.config.serverbeans.Domain; -import org.glassfish.admin.rest.utils.ResourceUtil; -import org.glassfish.admin.rest.utils.Util; + +import java.lang.reflect.Method; +import java.net.URI; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.glassfish.admin.rest.RestLogging; import org.glassfish.admin.rest.client.RestClientBase; import org.glassfish.admin.rest.client.RestLeaf; import org.glassfish.admin.rest.client.RestLeafCollection; import org.glassfish.admin.rest.generator.CommandResourceMetaData; import org.glassfish.admin.rest.generator.ResourcesGeneratorBase; +import org.glassfish.admin.rest.utils.ResourceUtil; +import org.glassfish.admin.rest.utils.Util; import org.glassfish.api.Param; import org.glassfish.api.admin.CommandModel; import org.glassfish.api.admin.CommandModel.ParamModel; @@ -35,15 +45,6 @@ import org.jvnet.hk2.config.Dom; import org.jvnet.hk2.config.DomDocument; -import java.lang.reflect.Method; -import java.net.URI; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import org.glassfish.admin.rest.RestLogging; - /** * * @author jasonlee diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/GenerateClientCommand.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/GenerateClientCommand.java index e697dc83555..4541d31ea39 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/GenerateClientCommand.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/GenerateClientCommand.java @@ -19,6 +19,9 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.util.LocalStringManager; import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + import java.io.File; import java.net.URI; import java.util.ArrayList; @@ -27,9 +30,11 @@ import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.ActionReport.ExitCode; import org.glassfish.api.Param; +import org.glassfish.api.admin.AccessRequired; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandLock; @@ -41,13 +46,9 @@ import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; - import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; -import jakarta.inject.Inject; -import org.glassfish.api.admin.AccessRequired; - /** * * @author jdlee diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/JavaClientClassWriter.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/JavaClientClassWriter.java index 3e032ff6ff6..923ce68cb6e 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/JavaClientClassWriter.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/JavaClientClassWriter.java @@ -23,10 +23,11 @@ import java.util.Collection; import java.util.Locale; import java.util.logging.Level; + import org.glassfish.admin.rest.Constants; import org.glassfish.admin.rest.RestLogging; -import org.glassfish.admin.rest.utils.Util; import org.glassfish.admin.rest.client.RestClientBase; +import org.glassfish.admin.rest.utils.Util; import org.glassfish.api.Param; import org.glassfish.api.admin.CommandModel; import org.glassfish.api.admin.CommandModel.ParamModel; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/JavaClientGenerator.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/JavaClientGenerator.java index 9f46e271499..a3582908e51 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/JavaClientGenerator.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/JavaClientGenerator.java @@ -31,10 +31,12 @@ import java.util.jar.JarEntry; import java.util.jar.JarOutputStream; import java.util.logging.Level; + import javax.tools.JavaCompiler; import javax.tools.JavaFileObject; import javax.tools.StandardJavaFileManager; import javax.tools.ToolProvider; + import org.glassfish.admin.rest.RestLogging; import org.glassfish.admin.rest.utils.Util; import org.glassfish.hk2.api.ServiceLocator; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/PythonClientClassWriter.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/PythonClientClassWriter.java index fb49a735112..fedc79ce378 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/PythonClientClassWriter.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/PythonClientClassWriter.java @@ -16,11 +16,6 @@ package org.glassfish.admin.rest.generator.client; -import org.glassfish.admin.rest.utils.Util; -import org.glassfish.api.Param; -import org.glassfish.api.admin.CommandModel; -import org.jvnet.hk2.config.ConfigModel; - import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; @@ -28,6 +23,11 @@ import java.util.Collection; import java.util.Locale; +import org.glassfish.admin.rest.utils.Util; +import org.glassfish.api.Param; +import org.glassfish.api.admin.CommandModel; +import org.jvnet.hk2.config.ConfigModel; + /** * * @author jdlee diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/PythonClientGenerator.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/PythonClientGenerator.java index 9e3d0aefb72..89b30655678 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/PythonClientGenerator.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/PythonClientGenerator.java @@ -16,11 +16,8 @@ package org.glassfish.admin.rest.generator.client; -import org.glassfish.admin.rest.utils.Util; -import org.glassfish.hk2.api.ServiceLocator; -import org.jvnet.hk2.config.ConfigModel; - import com.sun.appserv.server.util.Version; + import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.File; @@ -28,7 +25,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; - import java.net.URI; import java.util.HashMap; import java.util.Map; @@ -36,7 +32,11 @@ import java.util.logging.Level; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; + import org.glassfish.admin.rest.RestLogging; +import org.glassfish.admin.rest.utils.Util; +import org.glassfish.hk2.api.ServiceLocator; +import org.jvnet.hk2.config.ConfigModel; public class PythonClientGenerator extends ClientGenerator { private File baseDirectory; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/logviewer/CharSpool.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/logviewer/CharSpool.java index 6ee36352449..8cfca0c7afa 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/logviewer/CharSpool.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/logviewer/CharSpool.java @@ -16,10 +16,10 @@ package org.glassfish.admin.rest.logviewer; -import java.io.Writer; import java.io.IOException; -import java.util.List; +import java.io.Writer; import java.util.LinkedList; +import java.util.List; /** * {@link Writer} that spools the output and writes to another {@link Writer} later. diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/logviewer/LineEndNormalizingWriter.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/logviewer/LineEndNormalizingWriter.java index d9791fda9cb..9b1c46c1a18 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/logviewer/LineEndNormalizingWriter.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/logviewer/LineEndNormalizingWriter.java @@ -17,8 +17,8 @@ package org.glassfish.admin.rest.logviewer; import java.io.FilterWriter; -import java.io.Writer; import java.io.IOException; +import java.io.Writer; /** * Finds the lone LF and converts that to CR+LF. diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/logviewer/WriterOutputStream.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/logviewer/WriterOutputStream.java index d1a48b2e4d6..38371e18810 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/logviewer/WriterOutputStream.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/logviewer/WriterOutputStream.java @@ -16,16 +16,16 @@ package org.glassfish.admin.rest.logviewer; +import java.io.IOException; import java.io.OutputStream; import java.io.Writer; -import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.CharBuffer; +import java.nio.charset.Charset; import java.nio.charset.CharsetDecoder; -import java.nio.charset.CodingErrorAction; import java.nio.charset.CoderResult; -import java.nio.charset.Charset; +import java.nio.charset.CodingErrorAction; import java.nio.charset.UnsupportedCharsetException; -import java.nio.*; -import java.nio.ByteBuffer; /** * {@link OutputStream} that writes to {@link Writer} by assuming the platform default encoding. diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/model/LegacySseResponseBody.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/model/LegacySseResponseBody.java index fd386b0f140..99aab9d526d 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/model/LegacySseResponseBody.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/model/LegacySseResponseBody.java @@ -20,6 +20,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; import org.glassfish.admin.rest.composite.RestModel; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/model/ResourceLink.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/model/ResourceLink.java index 863d46dcc87..f88f11278f5 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/model/ResourceLink.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/model/ResourceLink.java @@ -17,6 +17,7 @@ package org.glassfish.admin.rest.model; import java.net.URI; + import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/model/ResponseBody.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/model/ResponseBody.java index 5ecda6cd55c..7417cfc109f 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/model/ResponseBody.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/model/ResponseBody.java @@ -19,6 +19,7 @@ import java.net.URI; import java.util.ArrayList; import java.util.List; + import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/model/RestCollectionResponseBody.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/model/RestCollectionResponseBody.java index 71db63f2f15..425160089e9 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/model/RestCollectionResponseBody.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/model/RestCollectionResponseBody.java @@ -16,10 +16,12 @@ package org.glassfish.admin.rest.model; +import jakarta.ws.rs.core.UriInfo; + import java.net.URI; import java.util.ArrayList; import java.util.List; -import jakarta.ws.rs.core.UriInfo; + import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/model/SseResponseBody.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/model/SseResponseBody.java index ba1f2499369..559bbf0316d 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/model/SseResponseBody.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/model/SseResponseBody.java @@ -20,6 +20,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/AbstractStaxProvider.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/AbstractStaxProvider.java index 6ef38d074cf..40ee7951c76 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/AbstractStaxProvider.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/AbstractStaxProvider.java @@ -16,6 +16,11 @@ package org.glassfish.admin.rest.provider; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; @@ -23,13 +28,11 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.logging.Level; -import jakarta.ws.rs.WebApplicationException; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; + import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; + import org.codehaus.jettison.mapped.MappedNamespaceConvention; import org.codehaus.jettison.mapped.MappedXMLStreamWriter; import org.glassfish.admin.rest.Constants; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ActionReportJson2Provider.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ActionReportJson2Provider.java index b3f8b4fde4e..16a9b5f0164 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ActionReportJson2Provider.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ActionReportJson2Provider.java @@ -17,9 +17,11 @@ package org.glassfish.admin.rest.provider; import com.sun.enterprise.v3.common.ActionReporter; + import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.ext.Provider; + import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ActionReportJsonProvider.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ActionReportJsonProvider.java index 5f5850fedc7..641097b058a 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ActionReportJsonProvider.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ActionReportJsonProvider.java @@ -17,14 +17,19 @@ package org.glassfish.admin.rest.provider; import com.sun.enterprise.v3.common.ActionReporter; + +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.Provider; + import java.lang.reflect.Field; import java.lang.reflect.Type; import java.security.AccessController; import java.security.PrivilegedAction; -import java.util.*; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.ext.Provider; +import java.util.List; +import java.util.Map; +import java.util.Properties; + import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ActionReportResultJsonProvider.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ActionReportResultJsonProvider.java index 4bd97913aef..765c45595a7 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ActionReportResultJsonProvider.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ActionReportResultJsonProvider.java @@ -19,6 +19,7 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.ext.Provider; + import org.glassfish.admin.rest.results.ActionReportResult; import org.glassfish.admin.rest.utils.xml.RestActionReporter; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ActionReportResultXmlProvider.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ActionReportResultXmlProvider.java index 17cef55fec2..49d4f26e64c 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ActionReportResultXmlProvider.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ActionReportResultXmlProvider.java @@ -17,9 +17,11 @@ package org.glassfish.admin.rest.provider; import com.sun.enterprise.v3.common.ActionReporter; + import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.ext.Provider; + import org.glassfish.admin.rest.results.ActionReportResult; /** diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ActionReportXmlProvider.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ActionReportXmlProvider.java index 166f42548d2..2913c8b4f31 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ActionReportXmlProvider.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ActionReportXmlProvider.java @@ -17,11 +17,19 @@ package org.glassfish.admin.rest.provider; import com.sun.enterprise.v3.common.ActionReporter; -import java.lang.reflect.Type; -import java.util.*; + import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.ext.Provider; + +import java.lang.reflect.Type; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + import org.glassfish.admin.rest.utils.xml.RestActionReporter; import org.glassfish.admin.rest.utils.xml.XmlArray; import org.glassfish.admin.rest.utils.xml.XmlMap; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/AdminCommandStateCmdResultJsonProvider.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/AdminCommandStateCmdResultJsonProvider.java index bff8a6eb025..cf60edaf1fc 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/AdminCommandStateCmdResultJsonProvider.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/AdminCommandStateCmdResultJsonProvider.java @@ -17,12 +17,15 @@ package org.glassfish.admin.rest.provider; import com.sun.enterprise.v3.common.ActionReporter; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; + import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.ext.Provider; + +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; import org.glassfish.admin.rest.composite.CompositeUtil; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/AdminCommandStateJsonProvider.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/AdminCommandStateJsonProvider.java index 15a1f9650c2..39f5a059a8a 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/AdminCommandStateJsonProvider.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/AdminCommandStateJsonProvider.java @@ -17,10 +17,13 @@ package org.glassfish.admin.rest.provider; import com.sun.enterprise.v3.common.ActionReporter; -import java.lang.reflect.Type; + import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.ext.Provider; + +import java.lang.reflect.Type; + import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; import org.glassfish.api.admin.AdminCommandState; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/CollectionWriter.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/CollectionWriter.java index 3ddd827e643..32ea1263789 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/CollectionWriter.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/CollectionWriter.java @@ -17,16 +17,16 @@ package org.glassfish.admin.rest.provider; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; + import java.util.Collection; import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; import org.glassfish.admin.rest.Constants; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.WebApplicationException; -import jakarta.ws.rs.core.Response; - /** * * @author jdlee diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/CommandModelStaxProvider.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/CommandModelStaxProvider.java index de579837864..809caf70ecf 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/CommandModelStaxProvider.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/CommandModelStaxProvider.java @@ -17,13 +17,17 @@ package org.glassfish.admin.rest.provider; import com.sun.enterprise.util.StringUtils; -import java.io.File; -import java.util.Properties; + import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.ext.Provider; + +import java.io.File; +import java.util.Properties; + import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; + import org.glassfish.api.Param; import org.glassfish.api.admin.CommandModel; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/GetResultListXmlProvider.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/GetResultListXmlProvider.java index 91c8195a8f8..a3b22927da3 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/GetResultListXmlProvider.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/GetResultListXmlProvider.java @@ -16,17 +16,25 @@ package org.glassfish.admin.rest.provider; -import org.glassfish.admin.rest.Constants; -import org.glassfish.admin.rest.results.GetResultList; -import org.jvnet.hk2.config.Dom; - import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.ext.Provider; + import java.util.List; import java.util.Map; -import static org.glassfish.admin.rest.provider.ProviderUtil.*; +import org.glassfish.admin.rest.Constants; +import org.glassfish.admin.rest.results.GetResultList; +import org.jvnet.hk2.config.Dom; + +import static org.glassfish.admin.rest.provider.ProviderUtil.KEY_CHILD_RESOURCE; +import static org.glassfish.admin.rest.provider.ProviderUtil.KEY_CHILD_RESOURCES; +import static org.glassfish.admin.rest.provider.ProviderUtil.KEY_COMMANDS; +import static org.glassfish.admin.rest.provider.ProviderUtil.KEY_ENTITY; +import static org.glassfish.admin.rest.provider.ProviderUtil.KEY_METHODS; +import static org.glassfish.admin.rest.provider.ProviderUtil.getEndXmlElement; +import static org.glassfish.admin.rest.provider.ProviderUtil.getStartXmlElement; +import static org.glassfish.admin.rest.provider.ProviderUtil.getXmlForMethodMetaData; /** * diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/JsonStringReaderWriter.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/JsonStringReaderWriter.java index 5f377167e8e..aec6c209307 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/JsonStringReaderWriter.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/JsonStringReaderWriter.java @@ -17,12 +17,6 @@ package org.glassfish.admin.rest.provider; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; - import jakarta.annotation.Priority; import jakarta.inject.Singleton; import jakarta.ws.rs.Consumes; @@ -31,6 +25,12 @@ import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.ext.Provider; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; + import org.glassfish.jersey.message.internal.AbstractMessageReaderWriterProvider; import static jakarta.ws.rs.Priorities.USER; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/MapWriter.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/MapWriter.java index 0caf8444643..65bc36779c6 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/MapWriter.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/MapWriter.java @@ -16,10 +16,12 @@ package org.glassfish.admin.rest.provider; -import java.util.Map; -import java.util.logging.Level; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; + +import java.util.Map; +import java.util.logging.Level; + import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; import org.glassfish.admin.rest.Constants; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/OptionsResultJsonProvider.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/OptionsResultJsonProvider.java index 547c7c83cfb..10c12257d1d 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/OptionsResultJsonProvider.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/OptionsResultJsonProvider.java @@ -16,18 +16,19 @@ package org.glassfish.admin.rest.provider; -import org.codehaus.jettison.json.JSONArray; -import org.codehaus.jettison.json.JSONException; -import org.codehaus.jettison.json.JSONObject; -import org.glassfish.admin.rest.results.OptionsResult; - import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.ext.Provider; + import java.util.Iterator; import java.util.Set; import java.util.logging.Level; + +import org.codehaus.jettison.json.JSONArray; +import org.codehaus.jettison.json.JSONException; +import org.codehaus.jettison.json.JSONObject; import org.glassfish.admin.rest.RestLogging; +import org.glassfish.admin.rest.results.OptionsResult; /** * JSON provider for OptionsResult. diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/OptionsResultXmlProvider.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/OptionsResultXmlProvider.java index 52d8febc39b..3d49f3f5578 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/OptionsResultXmlProvider.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/OptionsResultXmlProvider.java @@ -16,15 +16,16 @@ package org.glassfish.admin.rest.provider; -import org.glassfish.admin.rest.Constants; -import org.glassfish.admin.rest.results.OptionsResult; - import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.ext.Provider; + import java.util.Iterator; import java.util.Set; +import org.glassfish.admin.rest.Constants; +import org.glassfish.admin.rest.results.OptionsResult; + import static org.glassfish.admin.rest.provider.ProviderUtil.getEndXmlElement; import static org.glassfish.admin.rest.provider.ProviderUtil.quote; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ParamsWithPayloadMultipartWriter.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ParamsWithPayloadMultipartWriter.java index ce83cc00888..ed69f863227 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ParamsWithPayloadMultipartWriter.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ParamsWithPayloadMultipartWriter.java @@ -19,11 +19,7 @@ import com.sun.enterprise.admin.remote.ParamsWithPayload; import com.sun.enterprise.admin.remote.writer.MultipartProprietaryWriter; import com.sun.enterprise.v3.common.ActionReporter; -import java.io.IOException; -import java.io.OutputStream; -import java.io.Writer; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; + import jakarta.ws.rs.Produces; import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.HttpHeaders; @@ -31,6 +27,13 @@ import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.ext.MessageBodyWriter; import jakarta.ws.rs.ext.Provider; + +import java.io.IOException; +import java.io.OutputStream; +import java.io.Writer; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; + import org.glassfish.api.ActionReport; /** diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ResponseBodyWriter.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ResponseBodyWriter.java index 9a9e59228d1..aebe404c8e4 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ResponseBodyWriter.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ResponseBodyWriter.java @@ -16,9 +16,11 @@ package org.glassfish.admin.rest.provider; -import java.util.logging.Level; import jakarta.ws.rs.Produces; import jakarta.ws.rs.ext.Provider; + +import java.util.logging.Level; + import org.codehaus.jettison.json.JSONException; import org.glassfish.admin.rest.Constants; import org.glassfish.admin.rest.RestLogging; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/FormReader.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/FormReader.java index 0ceecc572b5..37eb5ac3972 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/FormReader.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/FormReader.java @@ -16,6 +16,12 @@ package org.glassfish.admin.rest.readers; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.Provider; + import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -25,11 +31,6 @@ import java.net.URLDecoder; import java.util.HashMap; import java.util.StringTokenizer; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.ext.MessageBodyReader; -import jakarta.ws.rs.ext.Provider; /** * diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/InputObject.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/InputObject.java index 22c84cd3edd..04c4c5659fb 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/InputObject.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/InputObject.java @@ -18,6 +18,7 @@ import java.util.Iterator; import java.util.Map; + import org.glassfish.admin.rest.provider.ProviderUtil; /** diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/JsonHashMapProvider.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/JsonHashMapProvider.java index 8ba0994f959..c941a047eda 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/JsonHashMapProvider.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/JsonHashMapProvider.java @@ -16,20 +16,21 @@ package org.glassfish.admin.rest.readers; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.Provider; + import java.io.BufferedReader; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.InputStreamReader; import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.HashMap; import java.util.Iterator; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.ext.MessageBodyReader; -import jakarta.ws.rs.ext.Provider; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/JsonParameterMapProvider.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/JsonParameterMapProvider.java index 1fb7100d145..f0295a2efbe 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/JsonParameterMapProvider.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/JsonParameterMapProvider.java @@ -16,19 +16,20 @@ package org.glassfish.admin.rest.readers; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.Provider; + import java.io.BufferedReader; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.InputStreamReader; import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.Iterator; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.ext.MessageBodyReader; -import jakarta.ws.rs.ext.Provider; import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONObject; import org.glassfish.api.admin.ParameterMap; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/MultipartFDPayloadReader.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/MultipartFDPayloadReader.java index 4660e286dfd..f140261c87e 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/MultipartFDPayloadReader.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/MultipartFDPayloadReader.java @@ -18,10 +18,7 @@ import com.sun.enterprise.admin.remote.ParamsWithPayload; import com.sun.enterprise.admin.remote.reader.MultipartProprietaryReader; -import java.io.IOException; -import java.io.InputStream; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; + import jakarta.ws.rs.Consumes; import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.MediaType; @@ -29,6 +26,11 @@ import jakarta.ws.rs.ext.MessageBodyReader; import jakarta.ws.rs.ext.Provider; +import java.io.IOException; +import java.io.InputStream; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; + /** * * @author martinmares diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/ParameterMapFormReader.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/ParameterMapFormReader.java index 75657d3321e..afb04ac4880 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/ParameterMapFormReader.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/ParameterMapFormReader.java @@ -16,6 +16,12 @@ package org.glassfish.admin.rest.readers; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.Provider; + import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -24,11 +30,7 @@ import java.lang.reflect.Type; import java.net.URLDecoder; import java.util.StringTokenizer; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.ext.MessageBodyReader; -import jakarta.ws.rs.ext.Provider; + import org.glassfish.api.admin.ParameterMap; /** diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/RestModelListReader.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/RestModelListReader.java index a904d107434..a7425a38d83 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/RestModelListReader.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/RestModelListReader.java @@ -16,6 +16,15 @@ package org.glassfish.admin.rest.readers; +import jakarta.validation.ConstraintViolation; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.ext.MessageBodyReader; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -28,15 +37,6 @@ import java.util.Locale; import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.WebApplicationException; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.Response.Status; -import jakarta.ws.rs.ext.MessageBodyReader; - import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONObject; import org.glassfish.admin.rest.Constants; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/RestModelReader.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/RestModelReader.java index 9e88e8e392a..b81165d2909 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/RestModelReader.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/RestModelReader.java @@ -16,15 +16,6 @@ package org.glassfish.admin.rest.readers; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; -import java.util.Locale; -import java.util.Set; - import jakarta.validation.ConstraintViolation; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.Produces; @@ -36,6 +27,15 @@ import jakarta.ws.rs.ext.MessageBodyReader; import jakarta.ws.rs.ext.Provider; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.Locale; +import java.util.Set; + import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; import org.glassfish.admin.rest.Constants; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/XmlHashMapProvider.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/XmlHashMapProvider.java index d1d73d488eb..9cf978d09da 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/XmlHashMapProvider.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/XmlHashMapProvider.java @@ -16,17 +16,18 @@ package org.glassfish.admin.rest.readers; -import java.io.InputStream; -import java.io.IOException; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; -import java.util.HashMap; - import jakarta.ws.rs.Consumes; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.ext.MessageBodyReader; import jakarta.ws.rs.ext.Provider; + +import java.io.IOException; +import java.io.InputStream; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.HashMap; + import org.glassfish.admin.rest.provider.ProviderUtil; /** diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/XmlPropertyListReader.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/XmlPropertyListReader.java index d921aa3c9bd..5739cb6bd2d 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/XmlPropertyListReader.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/XmlPropertyListReader.java @@ -17,6 +17,14 @@ package org.glassfish.admin.rest.readers; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.Provider; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -25,13 +33,7 @@ import java.lang.reflect.Type; import java.util.List; import java.util.Map; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.WebApplicationException; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.ext.MessageBodyReader; -import jakarta.ws.rs.ext.Provider; + import org.glassfish.admin.rest.client.utils.MarshallingUtils; import org.glassfish.admin.rest.utils.Util; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/AbstractResource.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/AbstractResource.java index 52fa6b6d674..708610a4444 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/AbstractResource.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/AbstractResource.java @@ -16,12 +16,15 @@ package org.glassfish.admin.rest.resources; -import java.util.List; -import java.util.logging.Logger; import jakarta.inject.Inject; -import javax.security.auth.Subject; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.UriInfo; + +import java.util.List; +import java.util.logging.Logger; + +import javax.security.auth.Subject; + import org.glassfish.admin.rest.RestLogging; import org.glassfish.admin.rest.adapter.LocatorBridge; import org.glassfish.hk2.api.ServiceLocator; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/CommandResult.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/CommandResult.java index 8b1e2597f7a..a6ff4a24dce 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/CommandResult.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/CommandResult.java @@ -18,6 +18,7 @@ import java.util.Map; import java.util.Properties; + import org.glassfish.admin.rest.composite.RestModel; /** diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/LeafResource.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/LeafResource.java index c48560a0123..40ba37b8f84 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/LeafResource.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/LeafResource.java @@ -16,30 +16,30 @@ package org.glassfish.admin.rest.resources; -import java.util.HashMap; -import java.util.Map; -import java.util.TreeMap; +import com.sun.enterprise.util.LocalStringManagerImpl; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DefaultValue; import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; import jakarta.ws.rs.GET; import jakarta.ws.rs.OPTIONS; import jakarta.ws.rs.POST; import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + +import java.util.HashMap; +import java.util.Map; +import java.util.TreeMap; import org.glassfish.admin.rest.provider.MethodMetaData; import org.glassfish.admin.rest.results.ActionReportResult; import org.glassfish.admin.rest.results.OptionsResult; -import org.glassfish.admin.rest.utils.xml.RestActionReporter; - -import com.sun.enterprise.util.LocalStringManagerImpl; import org.glassfish.admin.rest.utils.ResourceUtil; import org.glassfish.admin.rest.utils.Util; +import org.glassfish.admin.rest.utils.xml.RestActionReporter; import org.jvnet.hk2.config.Dom; import static org.glassfish.admin.rest.utils.Util.decode; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/SessionResource.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/SessionResource.java index 9c674f0e0ac..9661ca8371b 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/SessionResource.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/SessionResource.java @@ -16,13 +16,13 @@ package org.glassfish.admin.rest.resources; -import org.glassfish.admin.rest.utils.ResourceUtil; -import org.glassfish.api.ActionReport; - import jakarta.ws.rs.DELETE; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriInfo; + +import org.glassfish.admin.rest.utils.ResourceUtil; +import org.glassfish.api.ActionReport; import org.glassfish.common.util.admin.RestSessionManager; /** diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/SessionsResource.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/SessionsResource.java index 149551631e3..91b94bbf8bb 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/SessionsResource.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/SessionsResource.java @@ -38,6 +38,7 @@ import org.glassfish.grizzly.http.server.Request; import org.glassfish.internal.api.RemoteAdminAccessException; import org.glassfish.jersey.internal.util.collection.Ref; + import static jakarta.ws.rs.core.Response.Status.FORBIDDEN; import static jakarta.ws.rs.core.Response.Status.OK; import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/StaticResource.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/StaticResource.java index 6c31fa5b05e..02434c59905 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/StaticResource.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/StaticResource.java @@ -16,14 +16,14 @@ package org.glassfish.admin.rest.resources; -import java.io.InputStream; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; - import jakarta.ws.rs.PathParam; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.ResponseBuilder; +import java.io.InputStream; + /** * @author Ludovic Champenois ludo@dev.java.net */ diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateCommandDeleteResource.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateCommandDeleteResource.java index 714ff41d3fe..85f81495084 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateCommandDeleteResource.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateCommandDeleteResource.java @@ -16,8 +16,6 @@ package org.glassfish.admin.rest.resources; -import java.util.List; - import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; @@ -26,14 +24,15 @@ import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; + +import java.util.List; + import org.codehaus.jettison.json.JSONException; import org.glassfish.admin.rest.Constants; import org.glassfish.admin.rest.results.ActionReportResult; - -import org.glassfish.jersey.media.sse.SseFeature; - import org.glassfish.admin.rest.utils.ResourceUtil; import org.glassfish.api.admin.ParameterMap; +import org.glassfish.jersey.media.sse.SseFeature; /** * diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateCommandGetResource.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateCommandGetResource.java index a8e41c0ca39..2e8d549d183 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateCommandGetResource.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateCommandGetResource.java @@ -16,13 +16,13 @@ package org.glassfish.admin.rest.resources; -import org.glassfish.api.admin.ParameterMap; - import jakarta.ws.rs.GET; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; + import org.glassfish.admin.rest.Constants; +import org.glassfish.api.admin.ParameterMap; import org.glassfish.jersey.media.sse.SseFeature; /** diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateCommandPostResource.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateCommandPostResource.java index dbfe1ff3f89..3062f7f2f28 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateCommandPostResource.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateCommandPostResource.java @@ -17,13 +17,6 @@ package org.glassfish.admin.rest.resources; -import java.io.File; -import java.io.InputStream; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.logging.Level; - import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; @@ -32,11 +25,18 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; + +import java.io.File; +import java.io.InputStream; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.logging.Level; + import org.codehaus.jettison.json.JSONException; import org.glassfish.admin.rest.Constants; import org.glassfish.admin.rest.RestLogging; import org.glassfish.admin.rest.results.ActionReportResult; - import org.glassfish.admin.rest.utils.ResourceUtil; import org.glassfish.admin.rest.utils.Util; import org.glassfish.api.admin.ParameterMap; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/admin/CommandResource.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/admin/CommandResource.java index 8a9b30aed6e..167008c3d62 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/admin/CommandResource.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/admin/CommandResource.java @@ -29,19 +29,42 @@ import com.sun.enterprise.v3.common.ActionReporter; import com.sun.enterprise.v3.common.PlainTextActionReporter; import com.sun.enterprise.v3.common.PropsFileActionReporter; + +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.CookieParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.EntityTag; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; + import java.io.BufferedReader; import java.io.IOException; import java.net.HttpURLConnection; import java.util.logging.Level; -import jakarta.inject.Inject; + import javax.security.auth.Subject; -import jakarta.ws.rs.*; -import jakarta.ws.rs.core.*; -import jakarta.ws.rs.core.Response.ResponseBuilder; + import org.glassfish.admin.rest.RestLogging; import org.glassfish.admin.rest.utils.SseCommandHelper; import org.glassfish.api.ActionReport; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.CommandModel; +import org.glassfish.api.admin.CommandRunner; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.Payload; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.api.Globals; import org.glassfish.jersey.internal.util.collection.Ref; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/composite/JobResource.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/composite/JobResource.java index c657628a441..78f0f491927 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/composite/JobResource.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/composite/JobResource.java @@ -17,13 +17,16 @@ package org.glassfish.admin.rest.resources.composite; import com.sun.enterprise.v3.admin.commands.ListJobsCommand; -import java.util.Collection; -import java.util.List; -import java.util.Map; + import jakarta.ws.rs.GET; import jakarta.ws.rs.PathParam; import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.Response; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + import org.glassfish.admin.rest.composite.CompositeResource; import org.glassfish.admin.rest.model.RestModelResponseBody; import org.glassfish.admin.rest.utils.StringUtil; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/composite/JobsResource.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/composite/JobsResource.java index 1f7b7239186..065e86692fa 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/composite/JobsResource.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/composite/JobsResource.java @@ -17,18 +17,21 @@ package org.glassfish.admin.rest.resources.composite; import com.sun.enterprise.v3.admin.commands.ListJobsCommand; -import java.util.Collection; -import java.util.List; -import java.util.Map; + import jakarta.ws.rs.DefaultValue; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.QueryParam; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + import org.glassfish.admin.rest.composite.CompositeResource; import org.glassfish.admin.rest.composite.CompositeUtil; import org.glassfish.admin.rest.model.RestCollectionResponseBody; -import org.glassfish.api.ActionReport; import org.glassfish.admin.rest.utils.StringUtil; +import org.glassfish.api.ActionReport; import org.glassfish.api.admin.ParameterMap; import org.jvnet.hk2.annotations.Service; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/ConfigModelComparator.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/ConfigModelComparator.java index 331c86569f7..3efa8a8da9b 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/ConfigModelComparator.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/ConfigModelComparator.java @@ -17,10 +17,10 @@ package org.glassfish.admin.rest.utils; import java.io.Serializable; -import org.jvnet.hk2.config.ConfigModel; - import java.util.Comparator; +import org.jvnet.hk2.config.ConfigModel; + public class ConfigModelComparator implements Comparator, Serializable { @Override public int compare(ConfigModel o1, ConfigModel o2) { diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/DetachedCommandHelper.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/DetachedCommandHelper.java index 86b4146f2cf..cb6750a797c 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/DetachedCommandHelper.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/DetachedCommandHelper.java @@ -18,9 +18,11 @@ import com.sun.enterprise.admin.remote.AdminCommandStateImpl; import com.sun.enterprise.v3.admin.JobManagerService; + import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.logging.Level; + import org.glassfish.admin.rest.RestLogging; import org.glassfish.api.admin.AdminCommandEventBroker; import org.glassfish.api.admin.AdminCommandState; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/DomConfigurator.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/DomConfigurator.java index 0576fd94487..bc70b9b5638 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/DomConfigurator.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/DomConfigurator.java @@ -17,10 +17,10 @@ package org.glassfish.admin.rest.utils; import java.io.Serializable; -import org.jvnet.hk2.config.Dom; - import java.util.Comparator; +import org.jvnet.hk2.config.Dom; + public class DomConfigurator implements Comparator, Serializable { @Override diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/JsonFilter.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/JsonFilter.java index 5c3fbaa3e87..ced98223e1a 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/JsonFilter.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/JsonFilter.java @@ -18,17 +18,17 @@ import com.sun.enterprise.util.LocalStringManagerImpl; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; + import java.util.ArrayList; -import java.util.Iterator; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Locale; -import java.util.Stack; import java.util.Set; - -import jakarta.ws.rs.WebApplicationException; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.Response.Status; +import java.util.Stack; import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/JsonUtil.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/JsonUtil.java index e8af644210a..14432a697ea 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/JsonUtil.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/JsonUtil.java @@ -23,6 +23,7 @@ import java.util.Locale; import java.util.Map; import java.util.Set; + import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/Proxy.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/Proxy.java index e2cb35d574f..a0ab894b137 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/Proxy.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/Proxy.java @@ -20,11 +20,11 @@ import jakarta.ws.rs.core.UriBuilder; import jakarta.ws.rs.core.UriInfo; -import org.glassfish.hk2.api.ServiceLocator; - import java.net.URL; import java.util.Properties; +import org.glassfish.hk2.api.ServiceLocator; + /** * Implements * diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/ProxyImpl.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/ProxyImpl.java index 518e1f593c5..0735956c7c2 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/ProxyImpl.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/ProxyImpl.java @@ -21,14 +21,8 @@ import com.sun.enterprise.config.serverbeans.SecureAdmin; import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.security.ssl.SSLUtils; -import jakarta.ws.rs.ProcessingException; - -import java.net.MalformedURLException; -import java.net.URI; -import java.net.URL; -import java.util.Map; -import java.util.Properties; +import jakarta.ws.rs.ProcessingException; import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.ClientBuilder; @@ -39,6 +33,12 @@ import jakarta.ws.rs.core.UriBuilder; import jakarta.ws.rs.core.UriInfo; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URL; +import java.util.Map; +import java.util.Properties; + import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSession; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/SseCommandHelper.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/SseCommandHelper.java index 41b45582d4f..d1d314c5251 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/SseCommandHelper.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/SseCommandHelper.java @@ -20,9 +20,12 @@ import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.v3.admin.JobManagerService; import com.sun.enterprise.v3.common.PropsFileActionReporter; + +import jakarta.ws.rs.core.MediaType; + import java.io.IOException; import java.util.logging.Level; -import jakarta.ws.rs.core.MediaType; + import org.glassfish.admin.rest.RestLogging; import org.glassfish.admin.rest.resources.admin.CommandResource; import org.glassfish.api.ActionReport; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/StringUtil.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/StringUtil.java index 7e9ee3f59d1..4ee07fe9b03 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/StringUtil.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/StringUtil.java @@ -19,6 +19,7 @@ import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; + import org.glassfish.api.ActionReport; import org.glassfish.api.ActionReport.MessagePart; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/Util.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/Util.java index 45d9bd01a5b..39068ac233f 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/Util.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/Util.java @@ -18,19 +18,24 @@ package org.glassfish.admin.rest.utils; import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.PathSegment; +import jakarta.ws.rs.core.UriInfo; + import java.io.BufferedOutputStream; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import org.glassfish.admin.rest.provider.ProviderUtil; - -import jakarta.ws.rs.client.Client; -import jakarta.ws.rs.core.UriInfo; import java.io.UnsupportedEncodingException; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.net.URLDecoder; +import java.nio.file.Files; +import java.nio.file.Path; import java.text.SimpleDateFormat; import java.util.Collection; import java.util.Date; @@ -39,14 +44,12 @@ import java.util.Locale; import java.util.Map; import java.util.logging.Level; + import javax.security.auth.Subject; -import jakarta.ws.rs.core.PathSegment; -import jakarta.ws.rs.client.ClientBuilder; -import jakarta.ws.rs.core.HttpHeaders; -import java.nio.file.Files; -import java.nio.file.Path; + import org.glassfish.admin.rest.Constants; import org.glassfish.admin.rest.RestLogging; +import org.glassfish.admin.rest.provider.ProviderUtil; import org.glassfish.admin.rest.utils.xml.RestActionReporter; import org.glassfish.admin.restconnector.RestConfig; import org.glassfish.api.ActionReport.MessagePart; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/xml/RestActionReporter.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/xml/RestActionReporter.java index 3a74090f5b3..00f811b1a98 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/xml/RestActionReporter.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/xml/RestActionReporter.java @@ -17,6 +17,7 @@ package org.glassfish.admin.rest.utils.xml; import com.sun.enterprise.v3.common.ActionReporter; + import java.io.IOException; import java.io.OutputStream; import java.util.Properties; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/xml/XmlArray.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/xml/XmlArray.java index fcd2670e371..cb4d1e2d993 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/xml/XmlArray.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/xml/XmlArray.java @@ -18,6 +18,7 @@ import java.util.ArrayList; import java.util.List; + import org.w3c.dom.Document; import org.w3c.dom.Node; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/xml/XmlMap.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/xml/XmlMap.java index 9b7e37f36db..dba8b66e672 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/xml/XmlMap.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/xml/XmlMap.java @@ -19,6 +19,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; + import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/xml/XmlObject.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/xml/XmlObject.java index 88fc9a2ba3a..4070b7a6d30 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/xml/XmlObject.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/xml/XmlObject.java @@ -20,6 +20,7 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; + import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.OutputKeys; import javax.xml.transform.Result; @@ -28,6 +29,7 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; + import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/wadl/RestModelSchemaResource.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/wadl/RestModelSchemaResource.java index ec9731d1201..0a9419c1d4e 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/wadl/RestModelSchemaResource.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/wadl/RestModelSchemaResource.java @@ -16,6 +16,12 @@ package org.glassfish.admin.rest.wadl; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.SchemaOutputResolver; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.lang.reflect.Method; @@ -27,12 +33,9 @@ import java.util.Set; import java.util.TreeSet; import java.util.logging.Level; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.xml.bind.JAXBContext; -import jakarta.xml.bind.JAXBException; -import jakarta.xml.bind.SchemaOutputResolver; + import javax.xml.transform.stream.StreamResult; + import org.glassfish.admin.rest.RestLogging; import org.glassfish.admin.rest.composite.LegacyCompositeResource; import org.glassfish.admin.rest.composite.RestModel; diff --git a/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/ActionReportTest.java b/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/ActionReportTest.java index 59225181894..f5116469e76 100644 --- a/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/ActionReportTest.java +++ b/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/ActionReportTest.java @@ -18,6 +18,8 @@ import com.sun.enterprise.v3.common.ActionReporter; +import jakarta.ws.rs.core.MediaType; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.Properties; @@ -28,8 +30,6 @@ import org.glassfish.api.ActionReport.MessagePart; import org.junit.jupiter.api.Test; -import jakarta.ws.rs.core.MediaType; - import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/ProgressStatusEventTest.java b/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/ProgressStatusEventTest.java index 8aacb7a7c42..a86db6f9b72 100644 --- a/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/ProgressStatusEventTest.java +++ b/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/ProgressStatusEventTest.java @@ -19,6 +19,8 @@ import com.sun.enterprise.admin.remote.reader.ProgressStatusEventJsonProprietaryReader; +import jakarta.ws.rs.core.MediaType; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -31,8 +33,6 @@ import org.glassfish.api.admin.progress.ProgressStatusEventSet; import org.junit.jupiter.api.Test; -import jakarta.ws.rs.core.MediaType; - import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/composite/CompositeUtilTest.java b/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/composite/CompositeUtilTest.java index b6728cccd82..ab2db618606 100644 --- a/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/composite/CompositeUtilTest.java +++ b/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/composite/CompositeUtilTest.java @@ -19,6 +19,8 @@ import com.sun.enterprise.config.serverbeans.Cluster; import com.sun.enterprise.config.serverbeans.customvalidators.ReferenceConstraint; +import jakarta.validation.ConstraintViolation; + import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.Locale; @@ -29,8 +31,6 @@ import org.glassfish.admin.rest.model.BaseModel; import org.junit.jupiter.api.Test; -import jakarta.validation.ConstraintViolation; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.StringStartsWith.startsWith; import static org.junit.jupiter.api.Assertions.assertAll; diff --git a/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/composite/ModelExtensionTest.java b/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/composite/ModelExtensionTest.java index 584a3196213..def3ae068fa 100644 --- a/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/composite/ModelExtensionTest.java +++ b/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/composite/ModelExtensionTest.java @@ -16,14 +16,10 @@ package org.glassfish.admin.rest.composite; -import java.util.ArrayList; -import java.util.List; import jakarta.ws.rs.GET; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import java.util.ArrayList; +import java.util.List; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; @@ -37,6 +33,11 @@ import org.glassfish.admin.rest.model.RelatedModel; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + /** * @author jdlee */ diff --git a/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/composite/resource/DummiesResource.java b/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/composite/resource/DummiesResource.java index 6c9c68784bb..40cd897a7b1 100644 --- a/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/composite/resource/DummiesResource.java +++ b/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/composite/resource/DummiesResource.java @@ -22,6 +22,7 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriInfo; + import org.glassfish.admin.rest.composite.LegacyCompositeResource; import org.glassfish.admin.rest.composite.RestCollection; import org.glassfish.admin.rest.composite.metadata.HelpText; diff --git a/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/composite/resource/DummyResource.java b/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/composite/resource/DummyResource.java index 1ea3b777d6d..adf6010ab80 100644 --- a/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/composite/resource/DummyResource.java +++ b/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/composite/resource/DummyResource.java @@ -22,6 +22,7 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriInfo; + import org.glassfish.admin.rest.composite.LegacyCompositeResource; import org.glassfish.admin.rest.model.BaseModel; diff --git a/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/composite/resource/DummyUriInfo.java b/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/composite/resource/DummyUriInfo.java index 906276b491d..30c172a3fb4 100644 --- a/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/composite/resource/DummyUriInfo.java +++ b/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/composite/resource/DummyUriInfo.java @@ -16,6 +16,12 @@ package org.glassfish.admin.rest.composite.resource; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.PathSegment; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilderException; +import jakarta.ws.rs.core.UriInfo; + import java.lang.reflect.Method; import java.net.URI; import java.net.URISyntaxException; @@ -24,12 +30,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.PathSegment; -import jakarta.ws.rs.core.UriBuilder; -import jakarta.ws.rs.core.UriBuilderException; -import jakarta.ws.rs.core.UriInfo; - /** * This Dummy class is meant to do the bare minimum to make the tests pass. It is not meant as a full-featured implementation * of UriInfo. Attempts to use it as such will likely fail. diff --git a/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/model/BaseModel.java b/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/model/BaseModel.java index e01672cafd4..315ef49de32 100644 --- a/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/model/BaseModel.java +++ b/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/model/BaseModel.java @@ -16,10 +16,12 @@ package org.glassfish.admin.rest.model; -import java.util.List; import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; + +import java.util.List; + import org.glassfish.admin.rest.composite.RestModel; import org.glassfish.admin.rest.composite.metadata.AttributeReference; import org.glassfish.admin.rest.composite.metadata.CreateOnly; diff --git a/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/ArrayValue.java b/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/ArrayValue.java index d5ed87be84f..612caa4059c 100644 --- a/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/ArrayValue.java +++ b/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/ArrayValue.java @@ -21,7 +21,12 @@ import org.codehaus.jettison.json.JSONArray; -import static org.glassfish.admin.rest.testing.Common.*; +import static org.glassfish.admin.rest.testing.Common.booleanVal; +import static org.glassfish.admin.rest.testing.Common.doubleVal; +import static org.glassfish.admin.rest.testing.Common.intVal; +import static org.glassfish.admin.rest.testing.Common.longVal; +import static org.glassfish.admin.rest.testing.Common.nilVal; +import static org.glassfish.admin.rest.testing.Common.stringVal; public class ArrayValue extends Value { private boolean ignoreExtra; diff --git a/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/Common.java b/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/Common.java index cee046e93ef..e16841a6748 100644 --- a/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/Common.java +++ b/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/Common.java @@ -16,9 +16,10 @@ package org.glassfish.admin.rest.testing; -import java.util.Iterator; import jakarta.ws.rs.core.Response.Status; +import java.util.Iterator; + import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONObject; diff --git a/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/DataVerifier.java b/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/DataVerifier.java index 80c08068a82..dcfdf7f4d80 100644 --- a/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/DataVerifier.java +++ b/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/DataVerifier.java @@ -16,15 +16,15 @@ package org.glassfish.admin.rest.testing; -import org.codehaus.jettison.json.JSONArray; -import org.codehaus.jettison.json.JSONException; -import org.codehaus.jettison.json.JSONObject; - -import java.util.Map; import java.util.List; +import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.codehaus.jettison.json.JSONArray; +import org.codehaus.jettison.json.JSONException; +import org.codehaus.jettison.json.JSONObject; + public class DataVerifier { private Environment env; private ObjectValue objectWant; diff --git a/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/ObjectValue.java b/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/ObjectValue.java index d72eb67d946..8b477ba6a4d 100644 --- a/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/ObjectValue.java +++ b/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/ObjectValue.java @@ -17,12 +17,17 @@ package org.glassfish.admin.rest.testing; import java.util.HashMap; -import java.util.Set; import java.util.Map; +import java.util.Set; import org.codehaus.jettison.json.JSONObject; -import static org.glassfish.admin.rest.testing.Common.*; +import static org.glassfish.admin.rest.testing.Common.booleanVal; +import static org.glassfish.admin.rest.testing.Common.doubleVal; +import static org.glassfish.admin.rest.testing.Common.intVal; +import static org.glassfish.admin.rest.testing.Common.longVal; +import static org.glassfish.admin.rest.testing.Common.nilVal; +import static org.glassfish.admin.rest.testing.Common.stringVal; public class ObjectValue extends Value { private boolean ignoreExtra; diff --git a/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/ResourceInvoker.java b/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/ResourceInvoker.java index ebb7e41b464..dbcf6fafbf4 100644 --- a/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/ResourceInvoker.java +++ b/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/ResourceInvoker.java @@ -16,18 +16,17 @@ package org.glassfish.admin.rest.testing; -import java.util.HashMap; -import java.util.Map; - import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.ClientBuilder; import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.client.Invocation.Builder; import jakarta.ws.rs.client.WebTarget; -import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature; +import java.util.HashMap; +import java.util.Map; import org.codehaus.jettison.json.JSONObject; +import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature; public abstract class ResourceInvoker { diff --git a/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/Response.java b/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/Response.java index 7baf183be3f..d268d112dda 100644 --- a/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/Response.java +++ b/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/Response.java @@ -18,7 +18,9 @@ import org.codehaus.jettison.json.JSONObject; -import static org.glassfish.admin.rest.testing.Common.*; +import static org.glassfish.admin.rest.testing.Common.HEADER_LOCATION; +import static org.glassfish.admin.rest.testing.Common.HEADER_X_LOCATION; +import static org.glassfish.admin.rest.testing.Common.PROP_ITEM; public class Response { private String method; diff --git a/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/ResponseVerifier.java b/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/ResponseVerifier.java index f9b57dc5050..30c99607735 100644 --- a/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/ResponseVerifier.java +++ b/nucleus/admin/rest/rest-testing/src/main/java/org/glassfish/admin/rest/testing/ResponseVerifier.java @@ -23,7 +23,8 @@ import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONObject; -import static org.glassfish.admin.rest.testing.Common.*; +import static org.glassfish.admin.rest.testing.Common.HEADER_LOCATION; +import static org.glassfish.admin.rest.testing.Common.HEADER_X_LOCATION; public class ResponseVerifier { private Environment env; diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/DomainConfig.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/DomainConfig.java index a20906377fb..22ac9a17698 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/DomainConfig.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/DomainConfig.java @@ -16,14 +16,13 @@ package com.sun.enterprise.admin.servermgmt; -import java.util.HashMap; -import java.util.Properties; - -import java.util.Map; - import com.sun.enterprise.universal.glassfish.ASenvPropertyReader; import com.sun.enterprise.util.SystemPropertyConstants; + +import java.util.HashMap; import java.util.Locale; +import java.util.Map; +import java.util.Properties; /** * This class defines the keys that are used to create the domain config object. Almost all the methods of diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/FileValidator.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/FileValidator.java index 9c3b5866e6d..66633decd68 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/FileValidator.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/FileValidator.java @@ -16,10 +16,10 @@ package com.sun.enterprise.admin.servermgmt; -import java.io.File; - -import com.sun.enterprise.util.io.FileUtils; import com.sun.enterprise.util.i18n.StringManager; +import com.sun.enterprise.util.io.FileUtils; + +import java.io.File; /** * This class performs the file related validations such as diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/KeystoreManager.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/KeystoreManager.java index cec62b8ff23..9a0ebfe1a42 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/KeystoreManager.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/KeystoreManager.java @@ -17,13 +17,16 @@ package com.sun.enterprise.admin.servermgmt; -import static com.sun.enterprise.admin.servermgmt.SLogger.BAD_DELETE_TEMP_CERT_FILE; -import static com.sun.enterprise.admin.servermgmt.SLogger.UNHANDLED_EXCEPTION; -import static com.sun.enterprise.admin.servermgmt.SLogger.getLogger; -import static com.sun.enterprise.admin.servermgmt.domain.DomainConstants.KEYSTORE_FILE; -import static com.sun.enterprise.admin.servermgmt.domain.DomainConstants.TRUSTSTORE_FILE; -import static java.util.logging.Level.SEVERE; -import static java.util.logging.Level.WARNING; +import com.sun.enterprise.admin.servermgmt.pe.PEFileLayout; +import com.sun.enterprise.universal.glassfish.ASenvPropertyReader; +import com.sun.enterprise.universal.io.SmartFile; +import com.sun.enterprise.universal.process.ProcessManager; +import com.sun.enterprise.universal.process.ProcessManagerException; +import com.sun.enterprise.universal.process.ProcessUtils; +import com.sun.enterprise.util.OS; +import com.sun.enterprise.util.SystemPropertyConstants; +import com.sun.enterprise.util.i18n.StringManager; +import com.sun.enterprise.util.net.NetUtils; import java.io.File; import java.io.FileInputStream; @@ -35,16 +38,13 @@ import java.util.List; import java.util.regex.Pattern; -import com.sun.enterprise.admin.servermgmt.pe.PEFileLayout; -import com.sun.enterprise.universal.glassfish.ASenvPropertyReader; -import com.sun.enterprise.universal.io.SmartFile; -import com.sun.enterprise.universal.process.ProcessManager; -import com.sun.enterprise.universal.process.ProcessManagerException; -import com.sun.enterprise.universal.process.ProcessUtils; -import com.sun.enterprise.util.OS; -import com.sun.enterprise.util.SystemPropertyConstants; -import com.sun.enterprise.util.i18n.StringManager; -import com.sun.enterprise.util.net.NetUtils; +import static com.sun.enterprise.admin.servermgmt.SLogger.BAD_DELETE_TEMP_CERT_FILE; +import static com.sun.enterprise.admin.servermgmt.SLogger.UNHANDLED_EXCEPTION; +import static com.sun.enterprise.admin.servermgmt.SLogger.getLogger; +import static com.sun.enterprise.admin.servermgmt.domain.DomainConstants.KEYSTORE_FILE; +import static com.sun.enterprise.admin.servermgmt.domain.DomainConstants.TRUSTSTORE_FILE; +import static java.util.logging.Level.SEVERE; +import static java.util.logging.Level.WARNING; /** * @author kebbs diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/MasterPasswordFileManager.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/MasterPasswordFileManager.java index 0de59051f5f..d9441c476fb 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/MasterPasswordFileManager.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/MasterPasswordFileManager.java @@ -26,6 +26,7 @@ import com.sun.enterprise.security.store.PasswordAdapter; import com.sun.enterprise.util.i18n.StringManager; import com.sun.enterprise.util.io.FileUtils; + import java.io.File; /** diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/PortValidator.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/PortValidator.java index 5c6c596825d..a23bae517c7 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/PortValidator.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/PortValidator.java @@ -23,7 +23,6 @@ package com.sun.enterprise.admin.servermgmt; import com.sun.enterprise.util.i18n.StringManager; - import com.sun.enterprise.util.net.NetUtils; /** diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/RepositoryConfig.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/RepositoryConfig.java index e48d38fdb63..32569913260 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/RepositoryConfig.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/RepositoryConfig.java @@ -21,14 +21,13 @@ */ package com.sun.enterprise.admin.servermgmt; -import java.util.HashMap; -import java.io.File; -import java.util.Map; - +import com.sun.enterprise.universal.glassfish.ASenvPropertyReader; import com.sun.enterprise.util.SystemPropertyConstants; - import com.sun.enterprise.util.io.FileUtils; -import com.sun.enterprise.universal.glassfish.ASenvPropertyReader; + +import java.io.File; +import java.util.HashMap; +import java.util.Map; /** * This class represents a repository configuration. A repository can be either a domain, a node diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/RepositoryManager.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/RepositoryManager.java index f0a99a359f7..817bd835c58 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/RepositoryManager.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/RepositoryManager.java @@ -24,7 +24,6 @@ import com.sun.enterprise.security.store.PasswordAdapter; import com.sun.enterprise.util.OS; - //import javax.management.remote.JMXAuthenticator; //import com.sun.enterprise.admin.server.core.jmx.auth.ASJMXAuthenticator; //import com.sun.enterprise.admin.server.core.jmx.auth.ASLoginDriverImpl; @@ -37,6 +36,7 @@ import com.sun.enterprise.util.SystemPropertyConstants; import com.sun.enterprise.util.i18n.StringManager; import com.sun.enterprise.util.io.FileUtils; + //import com.sun.enterprise.admin.common.Status; //import com.sun.enterprise.util.system.GFSystem; import java.io.File; diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/RepositoryNameValidator.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/RepositoryNameValidator.java index 8d87fff7054..919ed870c9f 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/RepositoryNameValidator.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/RepositoryNameValidator.java @@ -16,13 +16,15 @@ package com.sun.enterprise.admin.servermgmt; -import javax.xml.parsers.*; -import org.xml.sax.*; +import com.sun.enterprise.util.i18n.StringManager; + import java.io.ByteArrayInputStream; import javax.management.ObjectName; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; -import com.sun.enterprise.util.i18n.StringManager; +import org.xml.sax.InputSource; /** * Validates the repository name. A repository name must be a - valid file name, - valid xml CDATA value & - valid diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/SLogger.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/SLogger.java index 210d7c76d07..d96b4b89568 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/SLogger.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/SLogger.java @@ -17,6 +17,7 @@ package com.sun.enterprise.admin.servermgmt; import java.util.logging.Logger; + import org.glassfish.logging.annotation.LogMessageInfo; import org.glassfish.logging.annotation.LogMessagesResourceBundle; import org.glassfish.logging.annotation.LoggerInfo; diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/UpgradeFilesystem.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/UpgradeFilesystem.java index 4d33b1c6b6b..99da4a5a5bd 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/UpgradeFilesystem.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/UpgradeFilesystem.java @@ -17,13 +17,17 @@ package com.sun.enterprise.admin.servermgmt; import com.sun.enterprise.util.SystemPropertyConstants; + import java.io.File; import java.util.logging.Level; + import org.glassfish.api.admin.config.ConfigurationUpgrade; import org.glassfish.hk2.api.PostConstruct; import org.jvnet.hk2.annotations.Service; -import static com.sun.enterprise.admin.servermgmt.SLogger.*; +import static com.sun.enterprise.admin.servermgmt.SLogger.BAD_RENAME_CERT_FILE; +import static com.sun.enterprise.admin.servermgmt.SLogger.RENAME_CERT_FILE; +import static com.sun.enterprise.admin.servermgmt.SLogger.getLogger; /** * Startup service to update the filesystem from v2 to the v3 format diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/V2ToV3ConfigUpgrade.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/V2ToV3ConfigUpgrade.java index d72e5a07561..22cb841c387 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/V2ToV3ConfigUpgrade.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/V2ToV3ConfigUpgrade.java @@ -19,10 +19,17 @@ import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Configs; import com.sun.enterprise.config.serverbeans.JavaConfig; + +import jakarta.inject.Inject; + import java.beans.PropertyVetoException; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; import java.util.logging.Level; -import jakarta.inject.Inject; + import org.glassfish.api.admin.config.ConfigurationUpgrade; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.PostConstruct; @@ -31,7 +38,8 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import static com.sun.enterprise.admin.servermgmt.SLogger.*; +import static com.sun.enterprise.admin.servermgmt.SLogger.JVM_OPTION_UPGRADE_FAILURE; +import static com.sun.enterprise.admin.servermgmt.SLogger.getLogger; /** * Change the jvm-options from v2 to v3 diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/V2ToV3ConfigUpgradeTester.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/V2ToV3ConfigUpgradeTester.java index e74f89f8134..38d8374ac56 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/V2ToV3ConfigUpgradeTester.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/V2ToV3ConfigUpgradeTester.java @@ -22,21 +22,22 @@ package com.sun.enterprise.admin.servermgmt; import com.sun.enterprise.config.serverbeans.JavaConfig; + +import jakarta.inject.Inject; + import java.util.ArrayList; import java.util.Collection; + import org.glassfish.api.ActionReport; import org.glassfish.api.ActionReport.ExitCode; +import org.glassfish.api.admin.AccessRequired.AccessCheck; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.AdminCommandSecurity; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; - import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import org.glassfish.api.admin.AccessRequired.AccessCheck; -import org.glassfish.api.admin.AdminCommandSecurity; - @Service(name = "test-upgrade", metadata = "mode=debug") @PerLookup public class V2ToV3ConfigUpgradeTester implements AdminCommand, AdminCommandSecurity.AccessCheckProvider { diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/ChangeAdminPasswordCommand.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/ChangeAdminPasswordCommand.java index 5fe0cb1671f..9817def2c10 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/ChangeAdminPasswordCommand.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/ChangeAdminPasswordCommand.java @@ -22,20 +22,25 @@ import com.sun.enterprise.admin.launcher.GFLauncherFactory; import com.sun.enterprise.admin.launcher.GFLauncherInfo; import com.sun.enterprise.admin.remote.RemoteRestAdminCommand; -import java.io.Console; -import org.jvnet.hk2.annotations.*; -import org.glassfish.api.admin.*; import com.sun.enterprise.config.serverbeans.SecureAdmin; -import com.sun.enterprise.util.SystemPropertyConstants; import com.sun.enterprise.universal.i18n.LocalStringsImpl; import com.sun.enterprise.universal.xml.MiniXmlParserException; +import com.sun.enterprise.util.SystemPropertyConstants; import com.sun.enterprise.util.net.NetUtils; + +import java.io.Console; import java.io.IOException; import java.net.ConnectException; + import org.glassfish.api.I18n; import org.glassfish.api.Param; +import org.glassfish.api.admin.CommandException; +import org.glassfish.api.admin.CommandValidationException; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.hk2.api.PerLookup; import org.glassfish.security.common.FileRealmHelper; +import org.jvnet.hk2.annotations.Service; /** * The change-admin-password command. The remote command implementation presents a different interface (set of options) diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/ChangeMasterPasswordCommand.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/ChangeMasterPasswordCommand.java index ebc716bbbcf..f53a6432c26 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/ChangeMasterPasswordCommand.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/ChangeMasterPasswordCommand.java @@ -17,21 +17,22 @@ package com.sun.enterprise.admin.servermgmt.cli; import com.sun.enterprise.admin.cli.CLICommand; -import com.sun.enterprise.util.io.DomainDirs; import com.sun.enterprise.universal.i18n.LocalStringsImpl; -import org.glassfish.api.Param; -import org.glassfish.api.admin.CommandException; - -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; -import org.glassfish.hk2.api.ServiceLocator; +import com.sun.enterprise.util.io.DomainDirs; import jakarta.inject.Inject; + import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; +import org.glassfish.api.Param; +import org.glassfish.api.admin.CommandException; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; +import org.jvnet.hk2.annotations.Service; + /** * The change-master-password command. This is a command which can operate on both the DAS and the node The master * password is the password that is used to encrypt the DAS (and instances) keystore. Therefore the DAS and associated diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/CreateDomainCommand.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/CreateDomainCommand.java index aea6d42d57d..e1076b8b6f4 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/CreateDomainCommand.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/CreateDomainCommand.java @@ -22,19 +22,28 @@ import com.sun.appserv.server.util.Version; import com.sun.enterprise.admin.cli.CLICommand; import com.sun.enterprise.admin.cli.CLIConstants; -import com.sun.enterprise.admin.servermgmt.*; +import com.sun.enterprise.admin.servermgmt.DomainConfig; +import com.sun.enterprise.admin.servermgmt.DomainException; +import com.sun.enterprise.admin.servermgmt.DomainsManager; +import com.sun.enterprise.admin.servermgmt.KeystoreManager; +import com.sun.enterprise.admin.servermgmt.RepositoryManager; import com.sun.enterprise.admin.servermgmt.domain.DomainBuilder; import com.sun.enterprise.admin.servermgmt.pe.PEDomainsManager; import com.sun.enterprise.admin.util.CommandModelData.ParamModelData; -import static com.sun.enterprise.config.util.PortConstants.*; import com.sun.enterprise.universal.i18n.LocalStringsImpl; import com.sun.enterprise.util.SystemPropertyConstants; import com.sun.enterprise.util.io.FileUtils; import com.sun.enterprise.util.net.NetUtils; + import java.io.Console; import java.io.File; -import java.util.*; +import java.util.Collection; +import java.util.LinkedHashSet; +import java.util.Properties; +import java.util.Set; +import java.util.UUID; import java.util.logging.Level; + import org.glassfish.api.Param; import org.glassfish.api.admin.CommandException; import org.glassfish.api.admin.CommandModel.ParamModel; @@ -43,6 +52,19 @@ import org.glassfish.security.common.FileRealmHelper; import org.jvnet.hk2.annotations.Service; +import static com.sun.enterprise.config.util.PortConstants.DEFAULT_INSTANCE_PORT; +import static com.sun.enterprise.config.util.PortConstants.PORTBASE_ADMINPORT_SUFFIX; +import static com.sun.enterprise.config.util.PortConstants.PORTBASE_DEBUG_SUFFIX; +import static com.sun.enterprise.config.util.PortConstants.PORTBASE_HTTPSSL_SUFFIX; +import static com.sun.enterprise.config.util.PortConstants.PORTBASE_IIOPMUTUALAUTH_SUFFIX; +import static com.sun.enterprise.config.util.PortConstants.PORTBASE_IIOPSSL_SUFFIX; +import static com.sun.enterprise.config.util.PortConstants.PORTBASE_IIOP_SUFFIX; +import static com.sun.enterprise.config.util.PortConstants.PORTBASE_INSTANCE_SUFFIX; +import static com.sun.enterprise.config.util.PortConstants.PORTBASE_JMS_SUFFIX; +import static com.sun.enterprise.config.util.PortConstants.PORTBASE_JMX_SUFFIX; +import static com.sun.enterprise.config.util.PortConstants.PORTBASE_OSGI_SUFFIX; +import static com.sun.enterprise.config.util.PortConstants.PORT_MAX_VAL; + /** * This is a local command that creates a domain. */ diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/CreateServiceCommand.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/CreateServiceCommand.java index fd73d12f84f..79eb61688c1 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/CreateServiceCommand.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/CreateServiceCommand.java @@ -16,25 +16,26 @@ package com.sun.enterprise.admin.servermgmt.cli; -import com.sun.enterprise.admin.util.ServerDirsSelector; -import com.sun.enterprise.util.OS; -import com.sun.enterprise.util.io.FileUtils; -import java.io.*; -import java.util.logging.*; - -import org.glassfish.hk2.api.PerLookup; -import org.glassfish.api.Param; -import org.glassfish.api.admin.*; -import com.sun.enterprise.admin.cli.*; -import com.sun.enterprise.admin.servermgmt.services.ServiceFactory; -import com.sun.enterprise.admin.servermgmt.services.Service; +import com.sun.enterprise.admin.cli.CLICommand; import com.sun.enterprise.admin.servermgmt.services.AppserverServiceType; import com.sun.enterprise.admin.servermgmt.services.PlatformServicesInfo; +import com.sun.enterprise.admin.servermgmt.services.Service; +import com.sun.enterprise.admin.servermgmt.services.ServiceFactory; +import com.sun.enterprise.admin.util.ServerDirsSelector; import com.sun.enterprise.universal.i18n.LocalStringsImpl; import com.sun.enterprise.universal.io.SmartFile; +import com.sun.enterprise.util.OS; import com.sun.enterprise.util.SystemPropertyConstants; +import com.sun.enterprise.util.io.FileUtils; import com.sun.enterprise.util.io.ServerDirs; +import java.io.File; +import java.util.logging.Level; + +import org.glassfish.api.Param; +import org.glassfish.api.admin.CommandException; +import org.glassfish.hk2.api.PerLookup; + /** * Create a "service" in the operating system to start this domain automatically. */ diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/DeleteServiceCommand.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/DeleteServiceCommand.java index 5fb19c0d2c5..6f7512de9d7 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/DeleteServiceCommand.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/DeleteServiceCommand.java @@ -16,24 +16,25 @@ package com.sun.enterprise.admin.servermgmt.cli; -import com.sun.enterprise.admin.util.ServerDirsSelector; -import com.sun.enterprise.util.OS; -import com.sun.enterprise.util.io.FileUtils; -import java.io.*; -import java.util.logging.*; - -import org.glassfish.hk2.api.PerLookup; -import org.glassfish.api.Param; -import org.glassfish.api.admin.*; -import com.sun.enterprise.admin.cli.*; -import com.sun.enterprise.admin.servermgmt.services.ServiceFactory; -import com.sun.enterprise.admin.servermgmt.services.Service; +import com.sun.enterprise.admin.cli.CLICommand; import com.sun.enterprise.admin.servermgmt.services.AppserverServiceType; import com.sun.enterprise.admin.servermgmt.services.PlatformServicesInfo; +import com.sun.enterprise.admin.servermgmt.services.Service; +import com.sun.enterprise.admin.servermgmt.services.ServiceFactory; +import com.sun.enterprise.admin.util.ServerDirsSelector; import com.sun.enterprise.universal.i18n.LocalStringsImpl; import com.sun.enterprise.universal.io.SmartFile; +import com.sun.enterprise.util.OS; +import com.sun.enterprise.util.io.FileUtils; import com.sun.enterprise.util.io.ServerDirs; +import java.io.File; +import java.util.logging.Level; + +import org.glassfish.api.Param; +import org.glassfish.api.admin.CommandException; +import org.glassfish.hk2.api.PerLookup; + /** * Delete a "service" in the operating system. * diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/DomainXmlVerifier.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/DomainXmlVerifier.java index 5ed21e56128..4a64ac9d8a1 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/DomainXmlVerifier.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/DomainXmlVerifier.java @@ -16,21 +16,21 @@ package com.sun.enterprise.admin.servermgmt.cli; -import java.util.ArrayList; -import java.util.WeakHashMap; -import org.jvnet.hk2.config.ConfigBeanProxy; -import org.jvnet.hk2.config.Dom; - // config imports import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.universal.i18n.LocalStringsImpl; import com.sun.enterprise.util.Result; import java.io.PrintStream; +import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.WeakHashMap; + +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Dom; /** * Does basic level verification of domain.xml. This is helpful as there is no DTD to validate the domain's config i.e. diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/LocalDomainCommand.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/LocalDomainCommand.java index a05cf75cf4e..dd8511675a0 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/LocalDomainCommand.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/LocalDomainCommand.java @@ -18,10 +18,12 @@ import com.sun.enterprise.util.io.DomainDirs; import com.sun.enterprise.util.io.ServerDirs; -import java.io.*; + +import java.io.File; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.CommandException; +import org.glassfish.api.admin.CommandValidationException; /** * A class that's supposed to capture all the behavior common to operation on a "local" domain. It's supposed to act as diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/MonitorCommand.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/MonitorCommand.java index 11adf23f6bd..8d25780efc5 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/MonitorCommand.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/MonitorCommand.java @@ -17,14 +17,20 @@ package com.sun.enterprise.admin.servermgmt.cli; import com.sun.enterprise.admin.cli.CLICommand; -import java.io.*; -import java.util.*; -import org.jvnet.hk2.annotations.*; +import com.sun.enterprise.universal.i18n.LocalStringsImpl; + +import java.io.BufferedReader; +import java.io.File; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.List; +import java.util.Timer; + import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.CommandException; +import org.glassfish.api.admin.CommandValidationException; import org.glassfish.hk2.api.PerLookup; - -import com.sun.enterprise.universal.i18n.LocalStringsImpl; +import org.jvnet.hk2.annotations.Service; /** * A local Monitor Command (this will call the remote 'monitor' command). The reason for having to implement this as diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/MonitorTask.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/MonitorTask.java index f64d9f1270a..b3a21144962 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/MonitorTask.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/MonitorTask.java @@ -19,14 +19,20 @@ import com.sun.enterprise.admin.cli.Environment; import com.sun.enterprise.admin.cli.ProgramOptions; import com.sun.enterprise.admin.cli.remote.RemoteCLICommand; -import java.util.TimerTask; +import com.sun.enterprise.universal.i18n.LocalStringsImpl; + +import java.io.File; import java.util.Timer; +import java.util.TimerTask; import java.util.logging.Logger; -import java.io.File; -import org.glassfish.api.admin.*; -import com.sun.enterprise.universal.i18n.LocalStringsImpl; -import static com.sun.enterprise.admin.servermgmt.SLogger.*; +import org.glassfish.api.admin.CommandException; +import org.glassfish.api.admin.CommandValidationException; + +import static com.sun.enterprise.admin.servermgmt.SLogger.MONITOR_MEMORY_TITLE; +import static com.sun.enterprise.admin.servermgmt.SLogger.MONITOR_TITLE; +import static com.sun.enterprise.admin.servermgmt.SLogger.MONITOR_UPTIME_TITLE; +import static com.sun.enterprise.admin.servermgmt.SLogger.getLogger; public class MonitorTask extends TimerTask { private String type = null; diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/StartDomainCommand.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/StartDomainCommand.java index 8e3ec8bcf87..f5f5ddebb5e 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/StartDomainCommand.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/StartDomainCommand.java @@ -34,6 +34,8 @@ import java.util.Arrays; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.IntStream; import org.glassfish.api.Param; import org.glassfish.api.admin.CommandException; @@ -51,9 +53,6 @@ import static java.util.logging.Level.FINER; import static org.glassfish.api.admin.RuntimeType.DAS; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - /** * The start-domain command. * diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/StartServerCommand.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/StartServerCommand.java index a9858e2a89b..26e4e360bbd 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/StartServerCommand.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/StartServerCommand.java @@ -18,7 +18,9 @@ import com.sun.enterprise.admin.launcher.GFLauncherException; import com.sun.enterprise.universal.xml.MiniXmlParserException; + import java.util.List; + import org.glassfish.api.admin.RuntimeType; /** diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/StartServerHelper.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/StartServerHelper.java index 3e1ddab68a3..fa8df2aed17 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/StartServerHelper.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/StartServerHelper.java @@ -38,6 +38,7 @@ import java.util.function.Supplier; import org.glassfish.api.admin.CommandException; + import static com.sun.enterprise.admin.cli.CLIConstants.DEATH_TIMEOUT_MS; import static com.sun.enterprise.admin.cli.CLIConstants.MASTER_PASSWORD; import static com.sun.enterprise.admin.cli.CLIConstants.WAIT_FOR_DAS_TIME_MS; diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/domain/DomainInfoManager.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/domain/DomainInfoManager.java index 62877145ba6..9827ee976c3 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/domain/DomainInfoManager.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/domain/DomainInfoManager.java @@ -16,16 +16,6 @@ package com.sun.enterprise.admin.servermgmt.domain; -import java.io.File; -import java.io.FileOutputStream; -import java.util.logging.Level; -import java.util.logging.Logger; - -import jakarta.xml.bind.JAXBContext; -import jakarta.xml.bind.Marshaller; - -import org.glassfish.api.logging.LogHelper; - import com.sun.enterprise.admin.servermgmt.SLogger; import com.sun.enterprise.admin.servermgmt.xml.domaininfo.DomainInfo; import com.sun.enterprise.admin.servermgmt.xml.domaininfo.ObjectFactory; @@ -33,6 +23,16 @@ import com.sun.enterprise.admin.servermgmt.xml.templateinfo.TemplateInfo; import com.sun.enterprise.util.SystemPropertyConstants; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Marshaller; + +import java.io.File; +import java.io.FileOutputStream; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.glassfish.api.logging.LogHelper; + public class DomainInfoManager { private static final Logger _logger = SLogger.getLogger(); diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/domain/DomainPortValidator.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/domain/DomainPortValidator.java index 625228edc44..7150dfae683 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/domain/DomainPortValidator.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/domain/DomainPortValidator.java @@ -17,17 +17,17 @@ package com.sun.enterprise.admin.servermgmt.domain; +import com.sun.enterprise.admin.servermgmt.DomainConfig; +import com.sun.enterprise.admin.servermgmt.DomainException; +import com.sun.enterprise.admin.servermgmt.SLogger; +import com.sun.enterprise.util.net.NetUtils; + import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; import static java.text.MessageFormat.format; -import com.sun.enterprise.admin.servermgmt.DomainConfig; -import com.sun.enterprise.admin.servermgmt.DomainException; -import com.sun.enterprise.admin.servermgmt.SLogger; -import com.sun.enterprise.util.net.NetUtils; - public class DomainPortValidator { /* These properties are public interfaces, handle with care */ diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/domain/DomainSecurity.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/domain/DomainSecurity.java index 57b0ab47436..d7cbc6af9be 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/domain/DomainSecurity.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/domain/DomainSecurity.java @@ -17,18 +17,18 @@ package com.sun.enterprise.admin.servermgmt.domain; -import static com.sun.enterprise.admin.servermgmt.domain.DomainConstants.KEYSTORE_FILE; -import static com.sun.enterprise.admin.servermgmt.domain.DomainConstants.TRUSTSTORE_FILE; +import com.sun.enterprise.admin.servermgmt.DomainConfig; +import com.sun.enterprise.admin.servermgmt.MasterPasswordFileManager; +import com.sun.enterprise.admin.servermgmt.RepositoryException; +import com.sun.enterprise.security.store.PasswordAdapter; import java.io.File; import java.io.IOException; import org.glassfish.security.common.FileRealmHelper; -import com.sun.enterprise.admin.servermgmt.DomainConfig; -import com.sun.enterprise.admin.servermgmt.MasterPasswordFileManager; -import com.sun.enterprise.admin.servermgmt.RepositoryException; -import com.sun.enterprise.security.store.PasswordAdapter; +import static com.sun.enterprise.admin.servermgmt.domain.DomainConstants.KEYSTORE_FILE; +import static com.sun.enterprise.admin.servermgmt.domain.DomainConstants.TRUSTSTORE_FILE; public class DomainSecurity extends MasterPasswordFileManager { diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/logging/UpgradeLogging.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/logging/UpgradeLogging.java index cfd4ce7ae64..5a894246e42 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/logging/UpgradeLogging.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/logging/UpgradeLogging.java @@ -19,15 +19,21 @@ import com.sun.common.util.logging.LoggingConfigImpl; import com.sun.enterprise.admin.servermgmt.RepositoryConfig; import com.sun.enterprise.admin.servermgmt.pe.PEFileLayout; -import com.sun.enterprise.config.serverbeans.*; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Configs; +import com.sun.enterprise.config.serverbeans.LogService; +import com.sun.enterprise.config.serverbeans.ModuleLogLevels; import com.sun.enterprise.util.io.FileUtils; + +import jakarta.inject.Inject; + import java.beans.PropertyVetoException; import java.io.File; import java.io.IOException; import java.util.HashMap; import java.util.Map; import java.util.logging.Level; -import jakarta.inject.Inject; + import org.glassfish.api.admin.config.ConfigurationUpgrade; import org.glassfish.hk2.api.PostConstruct; import org.jvnet.hk2.annotations.Service; @@ -35,7 +41,10 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import static com.sun.enterprise.admin.servermgmt.SLogger.*; +import static com.sun.enterprise.admin.servermgmt.SLogger.FAIL_CREATE_LOG_PROPS; +import static com.sun.enterprise.admin.servermgmt.SLogger.FAIL_UPDATE_LOG_PROPS; +import static com.sun.enterprise.admin.servermgmt.SLogger.FAIL_UPGRADE_LOG_SERVICE; +import static com.sun.enterprise.admin.servermgmt.SLogger.getLogger; /** * Startup service to update existing domain.xml to move log-service entries to logging.properties file. diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/pe/PEDomainConfigValidator.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/pe/PEDomainConfigValidator.java index 09f213c5d07..42e49ef2c86 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/pe/PEDomainConfigValidator.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/pe/PEDomainConfigValidator.java @@ -23,6 +23,7 @@ import com.sun.enterprise.admin.servermgmt.PortValidator; import com.sun.enterprise.admin.servermgmt.StringValidator; import com.sun.enterprise.util.i18n.StringManager; + import java.util.HashSet; import java.util.Iterator; import java.util.Map; diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/pe/PEFileLayout.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/pe/PEFileLayout.java index 23f55bc3d3a..6ef555fadbc 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/pe/PEFileLayout.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/pe/PEFileLayout.java @@ -17,19 +17,17 @@ package com.sun.enterprise.admin.servermgmt.pe; -import java.util.HashMap; -import java.util.Locale; -import java.io.File; - -import com.sun.enterprise.util.OS; -import com.sun.enterprise.util.io.FileUtils; -import com.sun.enterprise.util.i18n.StringManager; - -import com.sun.enterprise.admin.servermgmt.RepositoryException; import com.sun.enterprise.admin.servermgmt.RepositoryConfig; +import com.sun.enterprise.admin.servermgmt.RepositoryException; +import com.sun.enterprise.security.store.PasswordAdapter; +import com.sun.enterprise.util.OS; import com.sun.enterprise.util.SystemPropertyConstants; +import com.sun.enterprise.util.i18n.StringManager; +import com.sun.enterprise.util.io.FileUtils; -import com.sun.enterprise.security.store.PasswordAdapter; +import java.io.File; +import java.util.HashMap; +import java.util.Locale; import java.util.Map; import static java.text.MessageFormat.format; diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/pe/PEScriptsTokens.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/pe/PEScriptsTokens.java index 4f7b9e9587f..ccea1ab4100 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/pe/PEScriptsTokens.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/pe/PEScriptsTokens.java @@ -16,9 +16,9 @@ package com.sun.enterprise.admin.servermgmt.pe; +import com.sun.enterprise.admin.servermgmt.DomainConfig; import com.sun.enterprise.admin.util.TokenValue; import com.sun.enterprise.admin.util.TokenValueSet; -import com.sun.enterprise.admin.servermgmt.DomainConfig; /** * This class defines the tokens required by the startserv & stopserv scripts. diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/NonSMFServiceAdapter.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/NonSMFServiceAdapter.java index 395aaf4368f..57595b8fad7 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/NonSMFServiceAdapter.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/NonSMFServiceAdapter.java @@ -18,7 +18,8 @@ import com.sun.enterprise.universal.PropertiesDecoder; import com.sun.enterprise.util.io.ServerDirs; -import java.io.*; + +import java.io.File; import java.util.Map; /** diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/PlatformServicesInfo.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/PlatformServicesInfo.java index 4ca98ddd587..22d30f47081 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/PlatformServicesInfo.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/PlatformServicesInfo.java @@ -21,9 +21,11 @@ import com.sun.enterprise.util.StringUtils; import com.sun.enterprise.util.SystemPropertyConstants; import com.sun.enterprise.util.io.ServerDirs; + import java.io.File; import java.util.Date; -import static com.sun.enterprise.admin.servermgmt.services.Constants.*; + +import static com.sun.enterprise.admin.servermgmt.services.Constants.SERVICE_NAME_PREFIX; /** * A place to keep platform services info... diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/Service.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/Service.java index c554dc333fb..4db319f2539 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/Service.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/Service.java @@ -17,6 +17,7 @@ package com.sun.enterprise.admin.servermgmt.services; import com.sun.enterprise.util.io.ServerDirs; + import java.util.Map; /** diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/ServiceAdapter.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/ServiceAdapter.java index ba962f98644..40fdc8addf1 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/ServiceAdapter.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/ServiceAdapter.java @@ -20,9 +20,31 @@ import com.sun.enterprise.util.OS; import com.sun.enterprise.util.StringUtils; import com.sun.enterprise.util.io.ServerDirs; -import java.io.*; -import java.util.*; -import static com.sun.enterprise.admin.servermgmt.services.Constants.*; + +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +import static com.sun.enterprise.admin.servermgmt.services.Constants.AS_ADMIN_PATH_TN; +import static com.sun.enterprise.admin.servermgmt.services.Constants.CFG_LOCATION_TN; +import static com.sun.enterprise.admin.servermgmt.services.Constants.CREDENTIALS_TN; +import static com.sun.enterprise.admin.servermgmt.services.Constants.DATE_CREATED_TN; +import static com.sun.enterprise.admin.servermgmt.services.Constants.DRYRUN_PREPEND; +import static com.sun.enterprise.admin.servermgmt.services.Constants.ENTITY_NAME_TN; +import static com.sun.enterprise.admin.servermgmt.services.Constants.FQSN_TN; +import static com.sun.enterprise.admin.servermgmt.services.Constants.LOCATION_ARGS_RESTART_TN; +import static com.sun.enterprise.admin.servermgmt.services.Constants.LOCATION_ARGS_START_TN; +import static com.sun.enterprise.admin.servermgmt.services.Constants.LOCATION_ARGS_STOP_TN; +import static com.sun.enterprise.admin.servermgmt.services.Constants.OS_USER_TN; +import static com.sun.enterprise.admin.servermgmt.services.Constants.RESTART_COMMAND_TN; +import static com.sun.enterprise.admin.servermgmt.services.Constants.SERVICE_NAME_TN; +import static com.sun.enterprise.admin.servermgmt.services.Constants.SERVICE_TYPE_TN; +import static com.sun.enterprise.admin.servermgmt.services.Constants.START_COMMAND_TN; +import static com.sun.enterprise.admin.servermgmt.services.Constants.STOP_COMMAND_TN; +import static com.sun.enterprise.admin.servermgmt.services.Constants.TRACE_PREPEND; /** * @author bnevins diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/ServicesUtils.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/ServicesUtils.java index 028ebf13fa0..859a60cdd10 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/ServicesUtils.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/services/ServicesUtils.java @@ -19,8 +19,15 @@ import com.sun.enterprise.admin.util.LineTokenReplacer; import com.sun.enterprise.admin.util.TokenValue; import com.sun.enterprise.admin.util.TokenValueSet; -import java.io.*; -import java.util.*; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Date; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; /** * diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/AttributePreprocessor.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/AttributePreprocessor.java index e7c7a5d225a..a8b3221d7ff 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/AttributePreprocessor.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/AttributePreprocessor.java @@ -16,6 +16,9 @@ package com.sun.enterprise.admin.servermgmt.stringsubs; +import com.sun.enterprise.admin.servermgmt.xml.stringsubs.ChangePair; +import com.sun.enterprise.admin.servermgmt.xml.stringsubs.FileEntry; + /** * An object to pre-process the input string. This input string can either b */ diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/StringSubstitutionFactory.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/StringSubstitutionFactory.java index 688c7a197a9..14ca0344859 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/StringSubstitutionFactory.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/StringSubstitutionFactory.java @@ -16,10 +16,10 @@ package com.sun.enterprise.admin.servermgmt.stringsubs; -import java.io.InputStream; - import com.sun.enterprise.admin.servermgmt.stringsubs.impl.StringSubstitutionEngine; +import java.io.InputStream; + /** * Factory class to create {@link StringSubstitutor} object. */ diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/StringSubstitutor.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/StringSubstitutor.java index c6d27e03d39..c3e6c4b4086 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/StringSubstitutor.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/StringSubstitutor.java @@ -16,9 +16,6 @@ package com.sun.enterprise.admin.servermgmt.stringsubs; -import java.io.File; -import java.util.List; - import com.sun.enterprise.admin.servermgmt.xml.stringsubs.Archive; import com.sun.enterprise.admin.servermgmt.xml.stringsubs.Component; import com.sun.enterprise.admin.servermgmt.xml.stringsubs.FileEntry; @@ -27,6 +24,9 @@ import com.sun.enterprise.admin.servermgmt.xml.stringsubs.PropertyType; import com.sun.enterprise.admin.servermgmt.xml.stringsubs.StringsubsDefinition; +import java.io.File; +import java.util.List; + /** * An object which allows to set the custom behavior for string substitution operation and facilitate String * substitution process. diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/SubstitutableFactory.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/SubstitutableFactory.java index fde0218e1e8..1b459d5f9c1 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/SubstitutableFactory.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/SubstitutableFactory.java @@ -16,11 +16,11 @@ package com.sun.enterprise.admin.servermgmt.stringsubs; -import java.util.List; - import com.sun.enterprise.admin.servermgmt.xml.stringsubs.Archive; import com.sun.enterprise.admin.servermgmt.xml.stringsubs.FileEntry; +import java.util.List; + /** * Factory to retrieve all the {@link Substitutable} entries from a {@link FileEntry} or an {@link Archive}. *

      diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/ArchiveEntryWrapper.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/ArchiveEntryWrapper.java index bd0d5334fe7..2ed8a1d7515 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/ArchiveEntryWrapper.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/ArchiveEntryWrapper.java @@ -16,12 +16,12 @@ package com.sun.enterprise.admin.servermgmt.stringsubs.impl; -import java.util.List; - import com.sun.enterprise.admin.servermgmt.stringsubs.Substitutable; import com.sun.enterprise.admin.servermgmt.xml.stringsubs.Archive; import com.sun.enterprise.admin.servermgmt.xml.stringsubs.Group; +import java.util.List; + /** * Wraps the processing of an {@link Archive} of a {@link Group}. */ diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/ArchiveEntryWrapperImpl.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/ArchiveEntryWrapperImpl.java index 06f45e65070..c7a0f0aa2d6 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/ArchiveEntryWrapperImpl.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/ArchiveEntryWrapperImpl.java @@ -16,6 +16,11 @@ package com.sun.enterprise.admin.servermgmt.stringsubs.impl; +import com.sun.enterprise.admin.servermgmt.SLogger; +import com.sun.enterprise.admin.servermgmt.xml.stringsubs.Archive; +import com.sun.enterprise.admin.servermgmt.xml.stringsubs.MemberEntry; +import com.sun.enterprise.universal.i18n.LocalStringsImpl; + import java.io.BufferedOutputStream; import java.io.File; import java.io.FileInputStream; @@ -38,11 +43,6 @@ import org.glassfish.api.logging.LogHelper; -import com.sun.enterprise.admin.servermgmt.SLogger; -import com.sun.enterprise.admin.servermgmt.xml.stringsubs.Archive; -import com.sun.enterprise.admin.servermgmt.xml.stringsubs.MemberEntry; -import com.sun.enterprise.universal.i18n.LocalStringsImpl; - /** * Handles the operation related with an archive string substitution process. i.e extracting the substitutable entries * from jar and rebuilding the jar after substitution operation. diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/ArchiveMember.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/ArchiveMember.java index 6918d0bb41a..8d09414f858 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/ArchiveMember.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/ArchiveMember.java @@ -16,12 +16,12 @@ package com.sun.enterprise.admin.servermgmt.stringsubs.impl; -import java.io.Reader; -import java.io.Writer; - import com.sun.enterprise.admin.servermgmt.stringsubs.Substitutable; import com.sun.enterprise.admin.servermgmt.xml.stringsubs.MemberEntry; +import java.io.Reader; +import java.io.Writer; + /** * Creates {@link Reader} and {@link Writer} for the {@link MemberEntry} of an archive, that has to undergo string * substitution. diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/ArchiveMemberHandler.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/ArchiveMemberHandler.java index 1eaf048ee77..10b03cb1f7e 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/ArchiveMemberHandler.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/ArchiveMemberHandler.java @@ -16,13 +16,13 @@ package com.sun.enterprise.admin.servermgmt.stringsubs.impl; +import com.sun.enterprise.admin.servermgmt.xml.stringsubs.MemberEntry; + import java.io.File; import java.io.FileNotFoundException; import java.io.Reader; import java.io.Writer; -import com.sun.enterprise.admin.servermgmt.xml.stringsubs.MemberEntry; - /** * Handles the creation of {@link Reader} and {@link Writer} for a {@link MemberEntry} of an archive. * diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/AttributePreprocessorImpl.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/AttributePreprocessorImpl.java index 3fc3a7d5eda..4f805810de0 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/AttributePreprocessorImpl.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/AttributePreprocessorImpl.java @@ -16,10 +16,10 @@ package com.sun.enterprise.admin.servermgmt.stringsubs.impl; -import java.util.Map; - import com.sun.enterprise.admin.servermgmt.stringsubs.AttributePreprocessor; +import java.util.Map; + /** * Implementation of {@link AttributePreprocessor} */ diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/FileEntryFactory.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/FileEntryFactory.java index 4005ce7b403..b85252dfcc8 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/FileEntryFactory.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/FileEntryFactory.java @@ -16,6 +16,11 @@ package com.sun.enterprise.admin.servermgmt.stringsubs.impl; +import com.sun.enterprise.admin.servermgmt.SLogger; +import com.sun.enterprise.admin.servermgmt.stringsubs.Substitutable; +import com.sun.enterprise.admin.servermgmt.xml.stringsubs.FileEntry; +import com.sun.enterprise.universal.i18n.LocalStringsImpl; + import java.io.File; import java.io.FileNotFoundException; import java.util.ArrayList; @@ -28,11 +33,6 @@ import org.glassfish.api.logging.LogHelper; -import com.sun.enterprise.admin.servermgmt.SLogger; -import com.sun.enterprise.admin.servermgmt.stringsubs.Substitutable; -import com.sun.enterprise.admin.servermgmt.xml.stringsubs.FileEntry; -import com.sun.enterprise.universal.i18n.LocalStringsImpl; - /** * Factory class to get the files that has to undergo string substitution. */ diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/FileLister.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/FileLister.java index 43bf64fa714..177a3aa1e94 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/FileLister.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/FileLister.java @@ -16,6 +16,9 @@ package com.sun.enterprise.admin.servermgmt.stringsubs.impl; +import com.sun.enterprise.admin.servermgmt.SLogger; +import com.sun.enterprise.universal.i18n.LocalStringsImpl; + import java.io.File; import java.io.FilenameFilter; import java.util.LinkedList; @@ -24,9 +27,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.admin.servermgmt.SLogger; -import com.sun.enterprise.universal.i18n.LocalStringsImpl; - /** * Class to retrieve all the matching files for a given input path. It also handles the processing of wild-card in the * given path. diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/FileSubstitutionHandler.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/FileSubstitutionHandler.java index 909ec134537..5933085d99c 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/FileSubstitutionHandler.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/FileSubstitutionHandler.java @@ -16,6 +16,10 @@ package com.sun.enterprise.admin.servermgmt.stringsubs.impl; +import com.sun.enterprise.admin.servermgmt.SLogger; +import com.sun.enterprise.admin.servermgmt.stringsubs.Substitutable; +import com.sun.enterprise.universal.i18n.LocalStringsImpl; + import java.io.File; import java.io.FileNotFoundException; import java.io.Reader; @@ -23,10 +27,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.admin.servermgmt.SLogger; -import com.sun.enterprise.admin.servermgmt.stringsubs.Substitutable; -import com.sun.enterprise.universal.i18n.LocalStringsImpl; - /** * Abstract class initialize the input file for the string substitution. The sub-classes provides the way to create the * {@link Reader} and {@link Writer} for the input & output file. diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/ModeProcessor.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/ModeProcessor.java index 9bee5c1b7a7..6341c5c57b1 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/ModeProcessor.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/ModeProcessor.java @@ -16,15 +16,15 @@ package com.sun.enterprise.admin.servermgmt.stringsubs.impl; -import java.io.File; -import java.util.logging.Level; -import java.util.logging.Logger; - import com.sun.enterprise.admin.servermgmt.SLogger; import com.sun.enterprise.admin.servermgmt.xml.stringsubs.ChangePairRef; import com.sun.enterprise.admin.servermgmt.xml.stringsubs.Group; import com.sun.enterprise.admin.servermgmt.xml.stringsubs.ModeType; +import java.io.File; +import java.util.logging.Level; +import java.util.logging.Logger; + /** * This class provides method to process {@link ModeType}. The ModeType is predefined set of values use to alter the * substitution containing forward or backward slash in the after value. This attribute can be applied to {@link Group} diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/StringSubstitutionEngine.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/StringSubstitutionEngine.java index b024debfdbb..13b7b3c6e6a 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/StringSubstitutionEngine.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/StringSubstitutionEngine.java @@ -16,19 +16,6 @@ package com.sun.enterprise.admin.servermgmt.stringsubs.impl; -import java.io.File; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.glassfish.api.logging.LogHelper; - import com.sun.enterprise.admin.servermgmt.SLogger; import com.sun.enterprise.admin.servermgmt.stringsubs.AttributePreprocessor; import com.sun.enterprise.admin.servermgmt.stringsubs.StringSubstitutionException; @@ -50,6 +37,19 @@ import com.sun.enterprise.admin.servermgmt.xml.stringsubs.StringsubsDefinition; import com.sun.enterprise.universal.i18n.LocalStringsImpl; +import java.io.File; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.glassfish.api.logging.LogHelper; + /** * A class to encapsulate string-subs definition. Parse, validate and performs String substitution for the given * string-subs.xml. diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/StringSubstitutionParser.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/StringSubstitutionParser.java index 44ff1c5d8a1..355273974dc 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/StringSubstitutionParser.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/StringSubstitutionParser.java @@ -16,6 +16,16 @@ package com.sun.enterprise.admin.servermgmt.stringsubs.impl; +import com.sun.enterprise.admin.servermgmt.SLogger; +import com.sun.enterprise.admin.servermgmt.stringsubs.StringSubstitutionException; +import com.sun.enterprise.admin.servermgmt.xml.stringsubs.StringsubsDefinition; +import com.sun.enterprise.universal.i18n.LocalStringsImpl; + +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; + import java.io.IOException; import java.io.InputStream; import java.net.URL; @@ -23,10 +33,6 @@ import java.util.logging.Logger; import javax.xml.XMLConstants; -import jakarta.xml.bind.JAXBContext; -import jakarta.xml.bind.JAXBElement; -import jakarta.xml.bind.JAXBException; -import jakarta.xml.bind.Unmarshaller; import javax.xml.transform.sax.SAXSource; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; @@ -34,11 +40,6 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import com.sun.enterprise.admin.servermgmt.SLogger; -import com.sun.enterprise.admin.servermgmt.stringsubs.StringSubstitutionException; -import com.sun.enterprise.admin.servermgmt.xml.stringsubs.StringsubsDefinition; -import com.sun.enterprise.universal.i18n.LocalStringsImpl; - /** * This class parses the string substitution XML. */ diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/StringSubstitutionProperties.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/StringSubstitutionProperties.java index 45cce16069c..f2d4944e5f3 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/StringSubstitutionProperties.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/StringSubstitutionProperties.java @@ -16,14 +16,14 @@ package com.sun.enterprise.admin.servermgmt.stringsubs.impl; +import com.sun.enterprise.admin.servermgmt.SLogger; + import java.io.IOException; import java.io.InputStream; import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.admin.servermgmt.SLogger; - /** * Load and retrieves the string substitution properties. */ diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/SubstituableFactoryImpl.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/SubstituableFactoryImpl.java index f24efc0e59b..4e713e7d396 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/SubstituableFactoryImpl.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/SubstituableFactoryImpl.java @@ -16,17 +16,17 @@ package com.sun.enterprise.admin.servermgmt.stringsubs.impl; -import java.io.IOException; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - import com.sun.enterprise.admin.servermgmt.SLogger; import com.sun.enterprise.admin.servermgmt.stringsubs.Substitutable; import com.sun.enterprise.admin.servermgmt.stringsubs.SubstitutableFactory; import com.sun.enterprise.admin.servermgmt.xml.stringsubs.Archive; import com.sun.enterprise.admin.servermgmt.xml.stringsubs.FileEntry; +import java.io.IOException; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + /** * Default {@link SubstitutableFactory} implementation to retrieve the {@link Substitutable} entries from a * {@link FileEntry} or an {@link Archive}. diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/SubstitutionAlgorithmFactory.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/SubstitutionAlgorithmFactory.java index 9a5e8581120..32ac25f2e2c 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/SubstitutionAlgorithmFactory.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/SubstitutionAlgorithmFactory.java @@ -16,11 +16,11 @@ package com.sun.enterprise.admin.servermgmt.stringsubs.impl; -import java.util.Map; - import com.sun.enterprise.admin.servermgmt.stringsubs.SubstitutionAlgorithm; import com.sun.enterprise.admin.servermgmt.stringsubs.impl.algorithm.RadixTreeSubstitutionAlgo; +import java.util.Map; + /** * A factory to retrieve the algorithm used to perform String substitution. */ diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/SubstitutionFileUtil.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/SubstitutionFileUtil.java index 44fbb4edb72..798af800324 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/SubstitutionFileUtil.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/SubstitutionFileUtil.java @@ -16,14 +16,14 @@ package com.sun.enterprise.admin.servermgmt.stringsubs.impl; +import com.sun.enterprise.admin.servermgmt.SLogger; +import com.sun.enterprise.universal.i18n.LocalStringsImpl; + import java.io.File; import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.admin.servermgmt.SLogger; -import com.sun.enterprise.universal.i18n.LocalStringsImpl; - /** * Utility class for the substitutable files. */ diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/RadixTree.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/RadixTree.java index b7e1d0f85db..5a1e4388fd3 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/RadixTree.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/RadixTree.java @@ -16,12 +16,12 @@ package com.sun.enterprise.admin.servermgmt.stringsubs.impl.algorithm; -import java.util.logging.Level; -import java.util.logging.Logger; - import com.sun.enterprise.admin.servermgmt.SLogger; import com.sun.enterprise.universal.i18n.LocalStringsImpl; +import java.util.logging.Level; +import java.util.logging.Logger; + /** * This class implements the operation of a radix tree. A radix tree is a specialized set data structure based on the * tree/trie that is used to store a set of strings. The key for nodes of a radix tree are labeled with one or more diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/RadixTreeNode.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/RadixTreeNode.java index 18fd295a390..b4b5ff4ddf2 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/RadixTreeNode.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/RadixTreeNode.java @@ -16,6 +16,9 @@ package com.sun.enterprise.admin.servermgmt.stringsubs.impl.algorithm; +import com.sun.enterprise.admin.servermgmt.SLogger; +import com.sun.enterprise.universal.i18n.LocalStringsImpl; + import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -24,9 +27,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.admin.servermgmt.SLogger; -import com.sun.enterprise.universal.i18n.LocalStringsImpl; - /** * Node for {@link RadixTree}. */ diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/RadixTreeSubstitutionAlgo.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/RadixTreeSubstitutionAlgo.java index dba5893223c..3cba2bd4bd5 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/RadixTreeSubstitutionAlgo.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/RadixTreeSubstitutionAlgo.java @@ -16,16 +16,16 @@ package com.sun.enterprise.admin.servermgmt.stringsubs.impl.algorithm; -import java.io.IOException; -import java.io.Reader; -import java.io.Writer; -import java.util.Map; - import com.sun.enterprise.admin.servermgmt.stringsubs.StringSubstitutionException; import com.sun.enterprise.admin.servermgmt.stringsubs.Substitutable; import com.sun.enterprise.admin.servermgmt.stringsubs.SubstitutionAlgorithm; import com.sun.enterprise.universal.i18n.LocalStringsImpl; +import java.io.IOException; +import java.io.Reader; +import java.io.Writer; +import java.util.Map; + /** * Perform's string substitution by constructing the {@link RadixTree} of change-value pair. * diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/StringReplacementAlgo.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/StringReplacementAlgo.java index c7d51e3055f..ed7af07968a 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/StringReplacementAlgo.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/StringReplacementAlgo.java @@ -16,16 +16,16 @@ package com.sun.enterprise.admin.servermgmt.stringsubs.impl.algorithm; +import com.sun.enterprise.admin.servermgmt.stringsubs.StringSubstitutionException; +import com.sun.enterprise.admin.servermgmt.stringsubs.Substitutable; +import com.sun.enterprise.admin.servermgmt.stringsubs.SubstitutionAlgorithm; + import java.io.IOException; import java.io.Reader; import java.io.Writer; import java.util.Iterator; import java.util.Map; -import com.sun.enterprise.admin.servermgmt.stringsubs.StringSubstitutionException; -import com.sun.enterprise.admin.servermgmt.stringsubs.Substitutable; -import com.sun.enterprise.admin.servermgmt.stringsubs.SubstitutionAlgorithm; - /** * Perform's String substitution by replacing the matching target sequence with the specified literal replacement * sequence. diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/template/TemplateInfoHolder.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/template/TemplateInfoHolder.java index 1fbf9d3169c..61d65532518 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/template/TemplateInfoHolder.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/template/TemplateInfoHolder.java @@ -16,24 +16,25 @@ package com.sun.enterprise.admin.servermgmt.template; +import com.sun.enterprise.admin.servermgmt.DomainException; +import com.sun.enterprise.admin.servermgmt.xml.templateinfo.TemplateInfo; +import com.sun.enterprise.universal.i18n.LocalStringsImpl; + +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.Unmarshaller; + import java.io.IOException; import java.io.InputStream; import java.net.URL; import javax.xml.XMLConstants; -import jakarta.xml.bind.JAXBContext; -import jakarta.xml.bind.JAXBElement; -import jakarta.xml.bind.Unmarshaller; import javax.xml.transform.sax.SAXSource; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import org.xml.sax.InputSource; -import com.sun.enterprise.admin.servermgmt.DomainException; -import com.sun.enterprise.admin.servermgmt.xml.templateinfo.TemplateInfo; -import com.sun.enterprise.universal.i18n.LocalStringsImpl; - public class TemplateInfoHolder { private static final LocalStringsImpl _strings = new LocalStringsImpl(TemplateInfoHolder.class); diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/util/DomainXmlSAXParser.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/util/DomainXmlSAXParser.java index d57ab66f303..8999f156979 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/util/DomainXmlSAXParser.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/util/DomainXmlSAXParser.java @@ -16,13 +16,14 @@ package com.sun.enterprise.admin.servermgmt.util; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; + import org.xml.sax.Attributes; +import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import org.xml.sax.EntityResolver; import org.xml.sax.helpers.DefaultHandler; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; public class DomainXmlSAXParser extends DefaultHandler { private static final String PROPERTY = "property"; diff --git a/nucleus/admin/server-mgmt/src/test/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/ModeProcessorTest.java b/nucleus/admin/server-mgmt/src/test/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/ModeProcessorTest.java index ff5f2fc9473..a986a578734 100644 --- a/nucleus/admin/server-mgmt/src/test/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/ModeProcessorTest.java +++ b/nucleus/admin/server-mgmt/src/test/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/ModeProcessorTest.java @@ -16,6 +16,8 @@ package com.sun.enterprise.admin.servermgmt.stringsubs.impl; +import com.sun.enterprise.admin.servermgmt.xml.stringsubs.ModeType; + import java.io.File; import org.junit.jupiter.api.Test; @@ -24,8 +26,6 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import com.sun.enterprise.admin.servermgmt.xml.stringsubs.ModeType; - /** * Unit test for {@link ModeProcessor} functionality. */ diff --git a/nucleus/admin/server-mgmt/src/test/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/StringSubstitutionParserTest.java b/nucleus/admin/server-mgmt/src/test/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/StringSubstitutionParserTest.java index 7c49d08eab2..0b08f7f4c86 100644 --- a/nucleus/admin/server-mgmt/src/test/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/StringSubstitutionParserTest.java +++ b/nucleus/admin/server-mgmt/src/test/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/StringSubstitutionParserTest.java @@ -16,6 +16,10 @@ package com.sun.enterprise.admin.servermgmt.stringsubs.impl; +import com.sun.enterprise.admin.servermgmt.stringsubs.StringSubstitutionException; +import com.sun.enterprise.admin.servermgmt.test.ServerMgmgtTestFiles; +import com.sun.enterprise.admin.servermgmt.xml.stringsubs.StringsubsDefinition; + import java.io.IOException; import java.io.InputStream; @@ -28,10 +32,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.fail; -import com.sun.enterprise.admin.servermgmt.stringsubs.StringSubstitutionException; -import com.sun.enterprise.admin.servermgmt.test.ServerMgmgtTestFiles; -import com.sun.enterprise.admin.servermgmt.xml.stringsubs.StringsubsDefinition; - /** * Unit test class to test {@link StringSubstitutionParser} functionality. */ diff --git a/nucleus/admin/server-mgmt/src/test/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/RadixTreeSubstitutionAlgorithmTest.java b/nucleus/admin/server-mgmt/src/test/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/RadixTreeSubstitutionAlgorithmTest.java index 95fdd506997..3073903e71f 100644 --- a/nucleus/admin/server-mgmt/src/test/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/RadixTreeSubstitutionAlgorithmTest.java +++ b/nucleus/admin/server-mgmt/src/test/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/RadixTreeSubstitutionAlgorithmTest.java @@ -16,10 +16,10 @@ package com.sun.enterprise.admin.servermgmt.stringsubs.impl.algorithm; -import java.util.Map; - import com.sun.enterprise.admin.servermgmt.stringsubs.SubstitutionAlgorithm; +import java.util.Map; + /** * Unit test class for {@link RadixTreeSubstitutionAlgo}. */ diff --git a/nucleus/admin/server-mgmt/src/test/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/RadixTreeTest.java b/nucleus/admin/server-mgmt/src/test/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/RadixTreeTest.java index acdb2b24c05..0c69c67c84f 100644 --- a/nucleus/admin/server-mgmt/src/test/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/RadixTreeTest.java +++ b/nucleus/admin/server-mgmt/src/test/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/RadixTreeTest.java @@ -16,11 +16,11 @@ package com.sun.enterprise.admin.servermgmt.stringsubs.impl.algorithm; -import org.junit.jupiter.api.TestMethodOrder; -import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/nucleus/admin/server-mgmt/src/test/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/StringReplacementAlgorithmTest.java b/nucleus/admin/server-mgmt/src/test/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/StringReplacementAlgorithmTest.java index 23bae002a86..94161748670 100644 --- a/nucleus/admin/server-mgmt/src/test/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/StringReplacementAlgorithmTest.java +++ b/nucleus/admin/server-mgmt/src/test/java/com/sun/enterprise/admin/servermgmt/stringsubs/impl/algorithm/StringReplacementAlgorithmTest.java @@ -16,10 +16,10 @@ package com.sun.enterprise.admin.servermgmt.stringsubs.impl.algorithm; -import java.util.Map; - import com.sun.enterprise.admin.servermgmt.stringsubs.SubstitutionAlgorithm; +import java.util.Map; + /** * Unit test class for {@link StringReplacementAlgo}. * Class provides the algorithm to be used for test case execution diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/commands/DeleteSsl.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/commands/DeleteSsl.java index 6fc626c283a..cd8f7d53207 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/commands/DeleteSsl.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/commands/DeleteSsl.java @@ -16,30 +16,36 @@ package com.sun.enterprise.admin.commands; -import org.glassfish.internal.api.Target; -import com.sun.enterprise.config.serverbeans.*; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.JmxConnector; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.grizzly.config.dom.NetworkListeners; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import java.beans.PropertyVetoException; import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; - -import org.jvnet.hk2.annotations.Service; +import org.glassfish.grizzly.config.dom.NetworkListeners; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Target; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; -import jakarta.inject.Named; -import java.beans.PropertyVetoException; - /** * Delete Ssl command * diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/commands/ProtocolSslConfigHandler.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/commands/ProtocolSslConfigHandler.java index e84f2c5f7ca..2cbf676737a 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/commands/ProtocolSslConfigHandler.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/commands/ProtocolSslConfigHandler.java @@ -17,6 +17,7 @@ package com.sun.enterprise.admin.commands; import com.sun.enterprise.util.LocalStringManagerImpl; + import org.glassfish.api.ActionReport; import org.glassfish.grizzly.config.dom.NetworkConfig; import org.glassfish.grizzly.config.dom.Protocol; diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/event/AdminCommandEventBrokerImpl.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/event/AdminCommandEventBrokerImpl.java index 59587af9329..ca9e7623ee4 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/event/AdminCommandEventBrokerImpl.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/event/AdminCommandEventBrokerImpl.java @@ -18,6 +18,7 @@ import com.sun.enterprise.admin.util.AdminLoggerInfo; import com.sun.enterprise.util.StringUtils; + import java.util.ArrayList; import java.util.IdentityHashMap; import java.util.Iterator; @@ -25,6 +26,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Pattern; + import org.glassfish.api.admin.AdminCommandEventBroker; /** diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/progress/CommandProgressImpl.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/progress/CommandProgressImpl.java index 85221fb1d80..b452be31b7a 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/progress/CommandProgressImpl.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/progress/CommandProgressImpl.java @@ -18,8 +18,10 @@ package com.sun.enterprise.admin.progress; import com.sun.enterprise.util.StringUtils; + import java.io.Serializable; import java.util.Date; + import org.glassfish.api.admin.AdminCommandEventBroker; import org.glassfish.api.admin.CommandProgress; import org.glassfish.api.admin.progress.ProgressStatusBase; diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/progress/ProgressStatusClient.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/progress/ProgressStatusClient.java index f67ea350483..912c384a26b 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/progress/ProgressStatusClient.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/progress/ProgressStatusClient.java @@ -18,8 +18,10 @@ import com.sun.enterprise.universal.i18n.LocalStringsImpl; import com.sun.enterprise.util.StringUtils; + import java.util.HashMap; import java.util.Map; + import org.glassfish.api.admin.CommandProgress; import org.glassfish.api.admin.ProgressStatus; import org.glassfish.api.admin.progress.ProgressStatusBase; diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/AdminCommandStateImpl.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/AdminCommandStateImpl.java index 223aabc71ce..86e18154553 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/AdminCommandStateImpl.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/AdminCommandStateImpl.java @@ -17,6 +17,7 @@ package com.sun.enterprise.admin.remote; import java.io.Serializable; + import org.glassfish.api.ActionReport; import org.glassfish.api.admin.AdminCommandState; diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/GeneratedManPageManager.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/GeneratedManPageManager.java index 059f2a88abb..f744615a745 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/GeneratedManPageManager.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/GeneratedManPageManager.java @@ -18,7 +18,9 @@ import com.sun.enterprise.universal.NameValue; import com.sun.enterprise.universal.glassfish.AdminCommandResponse; -import java.util.*; + +import java.util.LinkedList; +import java.util.List; /** * diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/ManifestManager.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/ManifestManager.java index ef2032abfcc..21340170cf2 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/ManifestManager.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/ManifestManager.java @@ -16,14 +16,16 @@ package com.sun.enterprise.admin.remote; -import java.io.*; +import com.sun.enterprise.universal.glassfish.AdminCommandResponse; +import com.sun.enterprise.util.StringUtils; + +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; import java.net.URLDecoder; -import java.util.*; -import java.util.logging.Logger; +import java.util.Map; import java.util.logging.Level; - -import com.sun.enterprise.util.StringUtils; -import com.sun.enterprise.universal.glassfish.AdminCommandResponse; +import java.util.logging.Logger; /** * diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/PlainTextManager.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/PlainTextManager.java index 7641c215c9e..5e3ee81e491 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/PlainTextManager.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/PlainTextManager.java @@ -16,8 +16,8 @@ package com.sun.enterprise.admin.remote; -import com.sun.enterprise.universal.i18n.LocalStringsImpl; import com.sun.enterprise.universal.collections.ManifestUtils; +import com.sun.enterprise.universal.i18n.LocalStringsImpl; /** * diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/RemoteResponseManager.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/RemoteResponseManager.java index 122f8aeba73..c70fb767dca 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/RemoteResponseManager.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/RemoteResponseManager.java @@ -17,7 +17,8 @@ package com.sun.enterprise.admin.remote; -import static com.sun.enterprise.util.StringUtils.ok; +import com.sun.enterprise.universal.i18n.LocalStringsImpl; +import com.sun.enterprise.util.io.FileUtils; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -27,8 +28,7 @@ import java.util.Map; import java.util.logging.Logger; -import com.sun.enterprise.universal.i18n.LocalStringsImpl; -import com.sun.enterprise.util.io.FileUtils; +import static com.sun.enterprise.util.StringUtils.ok; /** * This class is responsible for handling the Remote Server response. Note that an unusul paradigm is used here. Success diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/RestPayloadImpl.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/RestPayloadImpl.java index 376073af50b..a3bdcaa39ad 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/RestPayloadImpl.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/RestPayloadImpl.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.Locale; import java.util.Properties; + import org.glassfish.admin.payload.PayloadImpl; import org.glassfish.api.admin.Payload; import org.jvnet.mimepull.Header; diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/reader/CliActionReport.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/reader/CliActionReport.java index d86ede9b0a4..eaa473841a2 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/reader/CliActionReport.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/reader/CliActionReport.java @@ -20,7 +20,12 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.util.*; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Queue; + import org.glassfish.api.ActionReport; /** diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/reader/ParamsWithPayloadJsonProprietaryReader.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/reader/ParamsWithPayloadJsonProprietaryReader.java index c315a7af41a..fcbb0be93df 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/reader/ParamsWithPayloadJsonProprietaryReader.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/reader/ParamsWithPayloadJsonProprietaryReader.java @@ -18,6 +18,7 @@ package com.sun.enterprise.admin.remote.reader; import com.sun.enterprise.admin.remote.ParamsWithPayload; + import java.io.IOException; import java.io.InputStream; import java.net.HttpURLConnection; diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/sse/GfSseEventReceiverProprietaryReader.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/sse/GfSseEventReceiverProprietaryReader.java index d3bd3a6f4ed..56253831a48 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/sse/GfSseEventReceiverProprietaryReader.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/sse/GfSseEventReceiverProprietaryReader.java @@ -17,6 +17,7 @@ package com.sun.enterprise.admin.remote.sse; import com.sun.enterprise.admin.remote.reader.ProprietaryReader; + import java.io.IOException; import java.io.InputStream; diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/sse/GfSseInboundEvent.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/sse/GfSseInboundEvent.java index 4b70844df61..5a0d14b59b7 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/sse/GfSseInboundEvent.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/sse/GfSseInboundEvent.java @@ -18,6 +18,7 @@ import com.sun.enterprise.admin.remote.reader.ProprietaryReader; import com.sun.enterprise.admin.remote.reader.ProprietaryReaderFactory; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/writer/MultipartProprietaryWriter.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/writer/MultipartProprietaryWriter.java index 54c5701fff9..62c730b5b98 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/writer/MultipartProprietaryWriter.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/writer/MultipartProprietaryWriter.java @@ -18,6 +18,7 @@ import com.sun.enterprise.admin.remote.ParamsWithPayload; import com.sun.enterprise.util.StringUtils; + import java.io.BufferedWriter; import java.io.IOException; import java.io.OutputStream; @@ -29,6 +30,7 @@ import java.util.Locale; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; + import org.glassfish.api.ActionReport; import org.glassfish.api.admin.ParameterMap; import org.glassfish.api.admin.Payload; diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/writer/ParameterMapFormProprietaryWriter.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/writer/ParameterMapFormProprietaryWriter.java index fed25d5124b..a97b4af381e 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/writer/ParameterMapFormProprietaryWriter.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/writer/ParameterMapFormProprietaryWriter.java @@ -17,11 +17,13 @@ package com.sun.enterprise.admin.remote.writer; import com.sun.enterprise.admin.remote.ParamsWithPayload; + import java.io.IOException; import java.net.HttpURLConnection; import java.net.URLEncoder; import java.util.List; import java.util.Map; + import org.glassfish.api.admin.ParameterMap; /** diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AdminCallbackHandler.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AdminCallbackHandler.java index 4ac76b8d755..8e4bb9b92f2 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AdminCallbackHandler.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AdminCallbackHandler.java @@ -28,6 +28,7 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; + import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.NameCallback; diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AdminIndicatorPrincipal.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AdminIndicatorPrincipal.java index ecd673b73f9..42a5ddd6181 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AdminIndicatorPrincipal.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AdminIndicatorPrincipal.java @@ -17,6 +17,7 @@ package com.sun.enterprise.admin.util; import java.security.Principal; + import org.glassfish.security.services.api.authorization.AuthorizationAdminConstants; /** diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AdminLocalPasswordPrincipal.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AdminLocalPasswordPrincipal.java index bb58251ab64..6ef2a90bdf8 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AdminLocalPasswordPrincipal.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AdminLocalPasswordPrincipal.java @@ -17,6 +17,7 @@ package com.sun.enterprise.admin.util; import java.security.Principal; + import org.glassfish.security.services.api.authorization.AuthorizationAdminConstants; /** diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AdminLoginModule.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AdminLoginModule.java index 6a4b11a9c22..d1e48783862 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AdminLoginModule.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AdminLoginModule.java @@ -21,6 +21,8 @@ import com.sun.enterprise.config.serverbeans.SecureAdmin; import com.sun.enterprise.config.serverbeans.SecureAdminPrincipal; +import jakarta.inject.Inject; + import java.io.Serializable; import java.security.Principal; import java.util.ArrayList; @@ -29,11 +31,16 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.inject.Inject; + import javax.security.auth.Subject; -import javax.security.auth.callback.*; +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.callback.NameCallback; +import javax.security.auth.callback.PasswordCallback; +import javax.security.auth.callback.TextInputCallback; import javax.security.auth.login.LoginException; import javax.security.auth.spi.LoginModule; + import org.glassfish.common.util.admin.AdminAuthenticator; import org.glassfish.common.util.admin.AuthTokenManager; import org.glassfish.common.util.admin.RestSessionManager; diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AsadminTrustManager.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AsadminTrustManager.java index c11887562d4..1d9bb96ae27 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AsadminTrustManager.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AsadminTrustManager.java @@ -18,6 +18,7 @@ import com.sun.enterprise.security.store.AsadminTruststore; import com.sun.enterprise.universal.i18n.LocalStringsImpl; + import java.io.Console; import java.io.IOException; import java.security.cert.CertificateException; @@ -25,6 +26,7 @@ import java.text.DateFormat; import java.util.Date; import java.util.Map; + import javax.net.ssl.X509TrustManager; /** diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CachedCommandModel.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CachedCommandModel.java index 1acfa99864a..3e27be53b56 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CachedCommandModel.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CachedCommandModel.java @@ -17,11 +17,14 @@ package com.sun.enterprise.admin.util; import com.sun.enterprise.util.StringUtils; + +import jakarta.xml.bind.DatatypeConverter; + import java.security.MessageDigest; import java.util.Comparator; import java.util.SortedSet; import java.util.TreeSet; -import jakarta.xml.bind.DatatypeConverter; + import org.glassfish.api.Param; import org.glassfish.api.admin.CommandModel; diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/ClusterOperationUtil.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/ClusterOperationUtil.java index a8c8ea59696..8fbbe20baac 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/ClusterOperationUtil.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/ClusterOperationUtil.java @@ -21,16 +21,26 @@ import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; + import java.io.File; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.function.Consumer; import java.util.logging.Level; import java.util.logging.Logger; + import org.glassfish.api.ActionReport; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.FailurePolicy; +import org.glassfish.api.admin.InstanceCommandResult; +import org.glassfish.api.admin.InstanceState; +import org.glassfish.api.admin.ParameterMap; import org.glassfish.config.support.CommandTarget; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.api.Target; diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandModelData.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandModelData.java index fe79df1c93d..2630cb1515a 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandModelData.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandModelData.java @@ -20,6 +20,7 @@ import java.util.Collection; import java.util.LinkedHashMap; import java.util.Map; + import org.glassfish.api.Param; import org.glassfish.api.ParamDefaultCalculator; import org.glassfish.api.admin.CommandModel; diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandSecurityChecker.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandSecurityChecker.java index 133af0bcf25..3af935a3566 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandSecurityChecker.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandSecurityChecker.java @@ -16,21 +16,36 @@ package com.sun.enterprise.admin.util; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import java.io.UnsupportedEncodingException; import java.lang.reflect.Field; import java.net.URI; import java.net.URISyntaxException; import java.security.PrivilegedAction; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import jakarta.inject.Inject; -import jakarta.inject.Singleton; + import javax.security.auth.Subject; -import org.glassfish.api.admin.*; + +import org.glassfish.api.admin.AccessRequired; import org.glassfish.api.admin.AccessRequired.AccessCheck; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.AdminCommandSecurity; +import org.glassfish.api.admin.AuthorizationPreprocessor; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.hk2.api.IterableProvider; import org.glassfish.hk2.api.PostConstruct; import org.glassfish.hk2.api.ServiceLocator; diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandThreadPool.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandThreadPool.java index a91ed13cacc..bea5acb666c 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandThreadPool.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandThreadPool.java @@ -19,22 +19,27 @@ import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.ServerTags; -import org.glassfish.grizzly.config.dom.NetworkConfig; -import org.glassfish.grizzly.config.dom.NetworkListener; + +import jakarta.inject.Inject; + +import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.FutureTask; +import java.util.concurrent.ThreadFactory; +import java.util.logging.Logger; + import org.glassfish.api.StartupRunLevel; import org.glassfish.api.admin.InstanceCommand; import org.glassfish.api.admin.InstanceCommandResult; import org.glassfish.api.admin.ServerEnvironment; - -import org.jvnet.hk2.annotations.Service; +import org.glassfish.grizzly.config.dom.NetworkConfig; +import org.glassfish.grizzly.config.dom.NetworkListener; import org.glassfish.hk2.api.PostConstruct; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.hk2.runlevel.RunLevel; - -import jakarta.inject.Inject; -import java.util.List; -import java.util.concurrent.*; -import java.util.logging.Logger; +import org.jvnet.hk2.annotations.Service; /** * This singleton service creates and holds the command pool used to execute commands diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/GenericAdminAuthenticator.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/GenericAdminAuthenticator.java index b8126511e3d..d59f7ed9e4a 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/GenericAdminAuthenticator.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/GenericAdminAuthenticator.java @@ -17,6 +17,19 @@ package com.sun.enterprise.admin.util; +import com.sun.enterprise.config.serverbeans.AdminService; +import com.sun.enterprise.config.serverbeans.AuthRealm; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.SecureAdmin; +import com.sun.enterprise.config.serverbeans.SecurityService; +import com.sun.enterprise.security.SecurityContext; +import com.sun.enterprise.security.auth.realm.file.FileRealm; +import com.sun.enterprise.security.auth.realm.file.FileRealmUser; +import com.sun.enterprise.util.net.NetUtils; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.io.File; import java.io.IOException; import java.rmi.server.RemoteServer; @@ -47,19 +60,6 @@ import org.jvnet.hk2.annotations.Optional; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.AdminService; -import com.sun.enterprise.config.serverbeans.AuthRealm; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.SecureAdmin; -import com.sun.enterprise.config.serverbeans.SecurityService; -import com.sun.enterprise.security.SecurityContext; -import com.sun.enterprise.security.auth.realm.file.FileRealm; -import com.sun.enterprise.security.auth.realm.file.FileRealmUser; -import com.sun.enterprise.util.net.NetUtils; - -import jakarta.inject.Inject; -import jakarta.inject.Named; - /** * Implementation of {@link AdminAccessController} that delegates to LoginContextDriver. * diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/HttpConnectorAddress.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/HttpConnectorAddress.java index 134259897eb..a9795aa61f5 100755 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/HttpConnectorAddress.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/HttpConnectorAddress.java @@ -16,16 +16,18 @@ package com.sun.enterprise.admin.util; +import com.sun.enterprise.universal.GFBase64Encoder; + import java.io.IOException; -import java.net.URL; import java.net.MalformedURLException; +import java.net.URL; import java.net.URLConnection; -import com.sun.enterprise.universal.GFBase64Encoder; -import javax.net.ssl.SSLSocketFactory; + +import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLContext; -import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLSession; +import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManager; public final class HttpConnectorAddress { diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/InstanceCommandExecutor.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/InstanceCommandExecutor.java index 194453896d3..ea00e81dcf5 100755 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/InstanceCommandExecutor.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/InstanceCommandExecutor.java @@ -20,10 +20,16 @@ import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.StringUtils; + import java.util.Map; import java.util.logging.Logger; + import org.glassfish.api.ActionReport; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.CommandException; +import org.glassfish.api.admin.FailurePolicy; +import org.glassfish.api.admin.InstanceCommand; +import org.glassfish.api.admin.InstanceCommandResult; +import org.glassfish.api.admin.ParameterMap; import org.glassfish.hk2.api.ServiceLocator; /** diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/InstanceRestCommandExecutor.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/InstanceRestCommandExecutor.java index a14480e6be3..4c934a082f6 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/InstanceRestCommandExecutor.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/InstanceRestCommandExecutor.java @@ -19,15 +19,21 @@ import com.sun.enterprise.admin.remote.ServerRemoteRestAdminCommand; import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.StringUtils; + import java.util.List; import java.util.Map; import java.util.Properties; import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.ActionReport.MessagePart; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.CommandException; +import org.glassfish.api.admin.FailurePolicy; +import org.glassfish.api.admin.InstanceCommand; +import org.glassfish.api.admin.InstanceCommandResult; +import org.glassfish.api.admin.ParameterMap; import org.glassfish.hk2.api.ServiceLocator; -import com.sun.enterprise.util.StringUtils; /** * diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/InstanceStateFileProcessor.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/InstanceStateFileProcessor.java index 4df83e1defd..977a5b272eb 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/InstanceStateFileProcessor.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/InstanceStateFileProcessor.java @@ -16,19 +16,30 @@ package com.sun.enterprise.admin.util; -import javax.xml.parsers.ParserConfigurationException; -import org.glassfish.api.admin.InstanceState; -import org.w3c.dom.*; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileOutputStream; +import java.io.FileWriter; +import java.io.IOException; +import java.io.OutputStream; +import java.util.HashMap; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.OutputKeys; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import java.io.*; -import java.util.HashMap; + +import org.glassfish.api.admin.InstanceState; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.w3c.dom.Text; import org.xml.sax.SAXException; /** diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/InstanceStateService.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/InstanceStateService.java index 7c4176030c1..482a576fd14 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/InstanceStateService.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/InstanceStateService.java @@ -17,15 +17,16 @@ package com.sun.enterprise.admin.util; import com.sun.enterprise.config.serverbeans.Server; + +import java.util.List; +import java.util.concurrent.Future; + import org.glassfish.api.admin.InstanceCommand; import org.glassfish.api.admin.InstanceCommandResult; import org.glassfish.api.admin.InstanceState; import org.glassfish.api.admin.ParameterMap; import org.jvnet.hk2.annotations.Contract; -import java.util.List; -import java.util.concurrent.Future; - /** * Interface for service that parses the instance state file. * diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/InstanceStateServiceImpl.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/InstanceStateServiceImpl.java index e7890433c46..c9910cbf2b9 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/InstanceStateServiceImpl.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/InstanceStateServiceImpl.java @@ -18,6 +18,9 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Server; + +import jakarta.inject.Inject; + import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -26,9 +29,13 @@ import java.util.concurrent.Future; import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.inject.Inject; + import org.glassfish.api.StartupRunLevel; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.InstanceCommand; +import org.glassfish.api.admin.InstanceCommandResult; +import org.glassfish.api.admin.InstanceState; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.hk2.runlevel.RunLevel; import org.jvnet.hk2.annotations.Service; diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/JvmOptionsHelper.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/JvmOptionsHelper.java index a475c09ad60..89927e1e014 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/JvmOptionsHelper.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/JvmOptionsHelper.java @@ -20,7 +20,13 @@ package com.sun.enterprise.admin.util; import com.sun.enterprise.util.i18n.StringManager; -import java.util.*; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.Set; /** * A helper class to facilitate the add/delete/get jvm options. diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/LineTokenReplacer.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/LineTokenReplacer.java index 035ee336a32..a11be7584e9 100755 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/LineTokenReplacer.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/LineTokenReplacer.java @@ -16,18 +16,17 @@ package com.sun.enterprise.admin.util; -import java.io.File; -import java.io.Reader; -import java.io.FileReader; -import java.io.FileWriter; import java.io.BufferedReader; import java.io.BufferedWriter; +import java.io.File; import java.io.FileOutputStream; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; import java.io.OutputStreamWriter; +import java.io.Reader; import java.nio.charset.Charset; -import java.io.*; - /** */ public final class LineTokenReplacer { diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/NamedResourceManager.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/NamedResourceManager.java index 34be0fcbde5..5fe270006e2 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/NamedResourceManager.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/NamedResourceManager.java @@ -16,6 +16,8 @@ package com.sun.enterprise.admin.util; +import jakarta.inject.Singleton; + import java.lang.reflect.Array; import java.lang.reflect.Field; import java.util.ArrayList; @@ -25,7 +27,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Pattern; -import jakarta.inject.Singleton; + import org.glassfish.api.admin.NamedResource; import org.jvnet.hk2.annotations.Service; diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/NucleusAuthorizationPreprocessor.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/NucleusAuthorizationPreprocessor.java index 7b817250a11..3c90364ce0a 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/NucleusAuthorizationPreprocessor.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/NucleusAuthorizationPreprocessor.java @@ -17,7 +17,9 @@ package com.sun.enterprise.admin.util; import java.util.Map; + import javax.security.auth.Subject; + import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AuthorizationPreprocessor; import org.glassfish.hk2.api.Rank; diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/RemoteInstanceCommandHelper.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/RemoteInstanceCommandHelper.java index c6fa6514d81..92b9b4fed71 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/RemoteInstanceCommandHelper.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/RemoteInstanceCommandHelper.java @@ -16,11 +16,13 @@ package com.sun.enterprise.admin.util; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.config.serverbeans.Servers; import com.sun.enterprise.util.StringUtils; -import com.sun.enterprise.config.serverbeans.*; -import org.glassfish.hk2.api.ServiceLocator; -import java.util.*; +import java.util.List; + +import org.glassfish.hk2.api.ServiceLocator; /** * @author Byron Nevins diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/ServerDirsSelector.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/ServerDirsSelector.java index e9eb7ad80c7..cf3d066aa03 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/ServerDirsSelector.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/ServerDirsSelector.java @@ -19,8 +19,10 @@ import com.sun.enterprise.util.io.DomainDirs; import com.sun.enterprise.util.io.InstanceDirs; import com.sun.enterprise.util.io.ServerDirs; + import java.io.File; import java.io.IOException; + import org.glassfish.api.admin.CommandException; /** diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/cache/AdminCacheUtils.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/cache/AdminCacheUtils.java index e226ac9deae..7de62170fd9 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/cache/AdminCacheUtils.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/cache/AdminCacheUtils.java @@ -19,6 +19,7 @@ import java.util.HashMap; import java.util.Map; import java.util.regex.Pattern; + import org.jvnet.hk2.annotations.Service; /** diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/cache/CommandModelDataProvider.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/cache/CommandModelDataProvider.java index 71badafcb97..697a69a702d 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/cache/CommandModelDataProvider.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/cache/CommandModelDataProvider.java @@ -19,8 +19,16 @@ import com.sun.enterprise.admin.util.CachedCommandModel; import com.sun.enterprise.admin.util.CommandModelData; import com.sun.enterprise.admin.util.CommandModelData.ParamModelData; -import java.io.*; + +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.OutputStreamWriter; import java.nio.charset.Charset; + import org.glassfish.api.Param; import org.glassfish.api.admin.CommandModel; import org.jvnet.hk2.annotations.Service; diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/cache/DataProvider.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/cache/DataProvider.java index e449142bc76..3aa05a1191f 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/cache/DataProvider.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/cache/DataProvider.java @@ -19,6 +19,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; + import org.jvnet.hk2.annotations.Contract; /** diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/jmx/AttributeListUtils.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/jmx/AttributeListUtils.java index 240cf470635..1ae6b392296 100755 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/jmx/AttributeListUtils.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/jmx/AttributeListUtils.java @@ -27,7 +27,13 @@ */ package com.sun.enterprise.admin.util.jmx; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Locale; +import java.util.Map; +import java.util.StringTokenizer; + import javax.management.Attribute; import javax.management.AttributeList; diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/proxy/ProxyClass.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/proxy/ProxyClass.java index b6659788e7c..f007d10298f 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/proxy/ProxyClass.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/proxy/ProxyClass.java @@ -16,9 +16,9 @@ package com.sun.enterprise.admin.util.proxy; +import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.lang.reflect.InvocationHandler; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/test/TokenReplacementTester.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/test/TokenReplacementTester.java index 13d97b20849..bf9f2754bb4 100755 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/test/TokenReplacementTester.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/test/TokenReplacementTester.java @@ -20,8 +20,8 @@ import com.sun.enterprise.admin.util.TokenValue; import com.sun.enterprise.admin.util.TokenValueSet; -import java.io.FileReader; import java.io.BufferedReader; +import java.io.FileReader; import java.util.StringTokenizer; /** diff --git a/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/CreateResourceRef.java b/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/CreateResourceRef.java index c17c9cd4529..4ebfcdc98e3 100644 --- a/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/CreateResourceRef.java +++ b/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/CreateResourceRef.java @@ -28,6 +28,7 @@ import com.sun.enterprise.config.serverbeans.Resources; import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.config.serverbeans.ServerResource; + import jakarta.inject.Inject; import java.beans.PropertyVetoException; diff --git a/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/ListResourceRefs.java b/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/ListResourceRefs.java index a9e45e337af..e76e3b4d814 100644 --- a/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/ListResourceRefs.java +++ b/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/ListResourceRefs.java @@ -23,29 +23,30 @@ import com.sun.enterprise.config.serverbeans.Resources; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + import java.util.ArrayList; import java.util.Collection; import java.util.List; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.I18n; +import org.glassfish.api.Param; import org.glassfish.api.admin.AccessRequired; +import org.glassfish.api.admin.AccessRequired.AccessCheck; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.AdminCommandSecurity; import org.glassfish.api.admin.CommandLock; -import org.glassfish.api.I18n; -import org.glassfish.api.Param; -import org.glassfish.api.ActionReport; import org.glassfish.api.admin.ExecuteOn; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; -import org.jvnet.hk2.annotations.Service; - import org.glassfish.hk2.api.PerLookup; - -import jakarta.inject.Inject; -import org.glassfish.api.admin.AccessRequired.AccessCheck; -import org.glassfish.api.admin.AdminCommandSecurity; +import org.jvnet.hk2.annotations.Service; /** * List Resource Refs Command diff --git a/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/ResourceConfigCreator.java b/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/ResourceConfigCreator.java index 1a83cfa4314..a10b3d011f8 100644 --- a/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/ResourceConfigCreator.java +++ b/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/ResourceConfigCreator.java @@ -16,7 +16,11 @@ package org.glassfish.admin.cli.resources; -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Created by IntelliJ IDEA. User: naman Date: 30/7/12 Time: 3:31 PM To change this template use File | Settings | File diff --git a/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/UniqueResourceNameConstraint.java b/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/UniqueResourceNameConstraint.java index 5e5478e35c1..ca0f80dc3bc 100644 --- a/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/UniqueResourceNameConstraint.java +++ b/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/UniqueResourceNameConstraint.java @@ -18,11 +18,14 @@ import jakarta.validation.Constraint; import jakarta.validation.Payload; + import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; /** diff --git a/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/UniqueResourceNameValidator.java b/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/UniqueResourceNameValidator.java index 6c380df159b..c94dfe22362 100644 --- a/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/UniqueResourceNameValidator.java +++ b/nucleus/admin/util/src/main/java/org/glassfish/admin/cli/resources/UniqueResourceNameValidator.java @@ -19,12 +19,12 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Resource; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.internal.api.Globals; - import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Globals; + /** * Created with IntelliJ IDEA. User: naman Date: 2/8/12 Time: 4:11 PM To change this template use File | Settings | File * Templates. From 88e90b8be98b269af45c0f1271a733164bc81299 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sat, 10 Aug 2024 22:38:59 +0200 Subject: [PATCH 08/40] Imports: Removed extra separation in security module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../main/java/com/sun/enterprise/security/PolicyLoader.java | 3 --- .../com/sun/enterprise/security/audit/BaseAuditManager.java | 6 ------ 2 files changed, 9 deletions(-) diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/PolicyLoader.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/PolicyLoader.java index 5993d04bbba..96b59530556 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/PolicyLoader.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/PolicyLoader.java @@ -17,7 +17,6 @@ package com.sun.enterprise.security; -//V3:Commented import com.sun.enterprise.server.ApplicationServer; import com.sun.enterprise.config.serverbeans.JaccProvider; import com.sun.enterprise.config.serverbeans.SecurityService; import com.sun.enterprise.util.i18n.StringManager; @@ -35,8 +34,6 @@ import java.util.logging.Logger; import org.glassfish.api.admin.ServerEnvironment; -//V3:Commented import com.sun.enterprise.config.serverbeans.ElementProperty; -//V3:Commented import com.sun.enterprise.config.ConfigContext; import org.glassfish.hk2.api.IterableProvider; import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.types.Property; diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/audit/BaseAuditManager.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/audit/BaseAuditManager.java index a20fb2c7fb3..2ac788b233e 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/audit/BaseAuditManager.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/audit/BaseAuditManager.java @@ -40,12 +40,6 @@ import java.util.logging.Logger; import org.glassfish.api.admin.ServerEnvironment; -/*V3:Commented -import com.sun.enterprise.config.serverbeans.ServerBeansFactory; -import com.sun.enterprise.config.serverbeans.ElementProperty; -import com.sun.enterprise.config.ConfigContext; -import com.sun.enterprise.server.ApplicationServer; - */ import org.glassfish.internal.api.ServerContext; import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.types.Property; From 820b8df35cfce2715d8c9b2474a934c0e002e50e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sat, 10 Aug 2024 22:45:46 +0200 Subject: [PATCH 09/40] Imports: cluster modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../cluster/BootstrapSecureAdminCommand.java | 17 +++-- .../admin/cluster/ClusterCommandHelper.java | 4 +- .../v3/admin/cluster/CopyConfigCommand.java | 20 +++--- .../admin/cluster/CreateInstanceCommand.java | 32 +++++++--- .../cluster/CreateNodeConfigCommand.java | 25 +++++--- .../cluster/CreateNodeImplicitCommand.java | 16 +++-- .../cluster/CreateRemoteNodeCommand.java | 25 +++++--- .../v3/admin/cluster/DeleteConfigCommand.java | 25 +++++--- .../admin/cluster/DeleteInstanceCommand.java | 29 ++++++--- .../cluster/DeleteNodeRemoteCommand.java | 30 +++++---- .../admin/cluster/DeleteNodeSshCommand.java | 14 +++-- .../v3/admin/cluster/ExportSyncBundle.java | 34 +++++++--- .../v3/admin/cluster/GetHealthCommand.java | 29 +++++---- .../cluster/GlassFishClusterExecutor.java | 21 ++++++- .../v3/admin/cluster/InstanceDirUtils.java | 4 +- .../InstanceRegisterInstanceCommand.java | 38 ++++++------ .../v3/admin/cluster/ListClustersCommand.java | 36 +++++++---- .../v3/admin/cluster/ListConfigsCommand.java | 24 ++++--- .../admin/cluster/ListInstancesCommand.java | 32 ++++++++-- .../v3/admin/cluster/ListNodesCommand.java | 16 ++--- .../admin/cluster/ListNodesConfigCommand.java | 16 ++--- .../v3/admin/cluster/ListNodesHelper.java | 11 ++-- .../v3/admin/cluster/ListNodesSshCommand.java | 16 ++--- .../admin/cluster/NodeAgentConfigUpgrade.java | 26 ++++---- .../admin/cluster/PingNodeRemoteCommand.java | 12 ++-- .../v3/admin/cluster/PingNodeSshCommand.java | 11 +++- .../cluster/PostRegisterInstanceCommand.java | 26 +++++--- .../PostUnregisterInstanceCommand.java | 24 ++++--- .../admin/cluster/RestartInstanceCommand.java | 30 ++++++--- .../v3/admin/cluster/StartClusterCommand.java | 24 ++++--- .../v3/admin/cluster/StopClusterCommand.java | 22 +++++-- .../v3/admin/cluster/StopInstanceCommand.java | 27 +++++--- .../v3/admin/cluster/SynchronizeFiles.java | 40 +++++++----- .../v3/admin/cluster/UpdateNodeCommand.java | 29 ++++++--- .../cluster/UpdateNodeConfigCommand.java | 22 ++++--- .../cluster/UpdateNodeRemoteCommand.java | 19 ++++-- .../admin/cluster/UpdateNodeSshCommand.java | 11 +++- .../v3/admin/cluster/ValidateNodeCommand.java | 39 +++++++----- .../cluster/CreateLocalInstanceCommand.java | 20 +++--- .../CreateLocalInstanceFilesystemCommand.java | 16 +++-- .../cli/cluster/CreateNodeAgentCommand.java | 7 ++- .../cli/cluster/DeleteInstanceFilesystem.java | 6 +- .../cli/cluster/InstallNodeBaseCommand.java | 21 ++++--- .../admin/cli/cluster/InstallNodeCommand.java | 2 +- .../cli/cluster/LocalInstanceCommand.java | 24 ++++--- .../cli/cluster/UninstallNodeBaseCommand.java | 6 +- .../cli/cluster/UninstallNodeCommand.java | 2 +- .../admin/cli/cluster/ValidateDasOptions.java | 7 +-- .../cli/cluster/ValidateMulticastCommand.java | 10 +-- .../enterprise/util/cluster/InstanceInfo.java | 9 +-- .../sun/enterprise/util/cluster/NodeInfo.java | 2 +- .../enterprise/util/cluster/SyncRequest.java | 6 +- .../org/glassfish/gms/GMSAdapterImpl.java | 62 +++++++++---------- .../org/glassfish/gms/GMSConfigUpgrade.java | 1 + .../GMSAnnounceAfterStartClusterCommand.java | 28 ++++++--- .../GMSAnnounceAfterStopClusterCommand.java | 17 +++-- .../GMSAnnounceBeforeStartClusterCommand.java | 42 +++++++------ .../GMSAnnounceBeforeStopClusterCommand.java | 39 +++++++----- .../admin/GMSAnnounceSupplementalInfo.java | 4 +- .../glassfish/gms/bootstrap/GMSAdapter.java | 3 +- .../gms/bootstrap/HealthHistory.java | 24 ++++--- .../cluster/ssh/connect/NodeRunnerSsh.java | 17 +++-- .../ssh/launcher/JavaSystemJschLogger.java | 1 + .../glassfish/cluster/ssh/util/SSHUtil.java | 9 ++- 64 files changed, 801 insertions(+), 460 deletions(-) diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/BootstrapSecureAdminCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/BootstrapSecureAdminCommand.java index 3ea7f20af4c..21d1e1f7a03 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/BootstrapSecureAdminCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/BootstrapSecureAdminCommand.java @@ -17,15 +17,24 @@ package com.sun.enterprise.v3.admin.cluster; import com.sun.enterprise.config.serverbeans.Domain; + +import jakarta.inject.Inject; + import java.io.File; import java.io.IOException; -import org.glassfish.api.ActionReport; -import org.glassfish.api.admin.*; -import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; +import org.glassfish.api.ActionReport; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.Payload; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.PostConstruct; +import org.jvnet.hk2.annotations.Service; /** * Bootstraps secure admin on a new instance by downloading the minimum files diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ClusterCommandHelper.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ClusterCommandHelper.java index 69b7ecad3f3..aed90d956f5 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ClusterCommandHelper.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ClusterCommandHelper.java @@ -24,6 +24,7 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.v3.admin.adapter.AdminEndpointDecider; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -32,8 +33,9 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import java.util.logging.Logger; import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.ActionReport.ExitCode; import org.glassfish.api.admin.AdminCommandContext; diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CopyConfigCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CopyConfigCommand.java index a6ce7043369..facf9ff3e0b 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CopyConfigCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CopyConfigCommand.java @@ -17,24 +17,26 @@ package com.sun.enterprise.v3.admin.cluster; -import com.sun.enterprise.config.serverbeans.*; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Configs; +import com.sun.enterprise.config.serverbeans.CopyConfig; import com.sun.enterprise.util.LocalStringManagerImpl; + +import java.beans.PropertyVetoException; +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.admin.AdminCommandContext; - -import org.jvnet.hk2.annotations.Service; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoint.OpType; +import org.glassfish.api.admin.RestEndpoints; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import java.beans.PropertyVetoException; -import java.util.logging.Logger; -import org.glassfish.api.admin.RestEndpoint; -import org.glassfish.api.admin.RestEndpoint.OpType; -import org.glassfish.api.admin.RestEndpoints; - /** * This is a remote command that copies a config to a destination config. * Usage: copy-config diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateInstanceCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateInstanceCommand.java index c4ce829ee71..c2fb8df5cd9 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateInstanceCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateInstanceCommand.java @@ -16,15 +16,21 @@ package com.sun.enterprise.v3.admin.cluster; -import com.sun.enterprise.config.serverbeans.*; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Node; +import com.sun.enterprise.config.serverbeans.Nodes; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.config.serverbeans.Servers; import com.sun.enterprise.universal.glassfish.ASenvPropertyReader; -import com.sun.enterprise.util.SystemPropertyConstants; -import com.sun.enterprise.util.StringUtils; import com.sun.enterprise.util.ExceptionUtil; -import java.io.IOException; -import org.glassfish.api.ActionReport; +import com.sun.enterprise.util.StringUtils; +import com.sun.enterprise.util.SystemPropertyConstants; import com.sun.enterprise.util.io.InstanceDirs; + +import jakarta.inject.Inject; + import java.io.File; +import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -32,18 +38,26 @@ import java.util.Map; import java.util.Properties; import java.util.logging.Level; +import java.util.logging.Logger; + +import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandRunner; import org.glassfish.api.admin.CommandRunner.CommandInvocation; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.hk2.api.IterableProvider; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.api.ServerContext; - import org.jvnet.hk2.annotations.Service; -import java.util.logging.Logger; -import jakarta.inject.Inject; /** * Remote AdminCommand to create an instance. This command is run only on DAS. diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeConfigCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeConfigCommand.java index a93ba6b9a79..bceadb2c04e 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeConfigCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeConfigCommand.java @@ -17,21 +17,30 @@ package com.sun.enterprise.v3.admin.cluster; import com.sun.enterprise.config.serverbeans.Nodes; -import org.glassfish.api.ActionReport; import com.sun.enterprise.universal.glassfish.TokenResolver; import com.sun.enterprise.util.StringUtils; +import com.sun.enterprise.util.net.NetUtils; + +import jakarta.inject.Inject; + +import java.io.File; +import java.util.HashMap; +import java.util.Map; + +import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandRunner; import org.glassfish.api.admin.CommandRunner.CommandInvocation; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.hk2.api.PerLookup; - import org.jvnet.hk2.annotations.Service; -import java.util.Map; -import java.util.HashMap; -import com.sun.enterprise.util.net.NetUtils; -import java.io.File; -import jakarta.inject.Inject; /** * Remote AdminCommand to create a config node. This command is run only on DAS. diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeImplicitCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeImplicitCommand.java index 1b1b837373a..d2f3a5e3c94 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeImplicitCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeImplicitCommand.java @@ -18,16 +18,22 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Nodes; + +import jakarta.inject.Inject; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandRunner; import org.glassfish.api.admin.CommandRunner.CommandInvocation; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.hk2.api.PerLookup; - -import jakarta.inject.Inject; - - import org.jvnet.hk2.annotations.Service; /** diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateRemoteNodeCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateRemoteNodeCommand.java index 83c759f6b40..9a43f9ab5a1 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateRemoteNodeCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateRemoteNodeCommand.java @@ -16,24 +16,31 @@ package com.sun.enterprise.v3.admin.cluster; -import com.sun.enterprise.util.cluster.RemoteType; +import com.sun.enterprise.config.serverbeans.Nodes; import com.sun.enterprise.universal.process.ProcessManager; import com.sun.enterprise.universal.process.ProcessManagerException; +import com.sun.enterprise.util.StringUtils; import com.sun.enterprise.util.SystemPropertyConstants; -import java.util.*; -import java.util.logging.*; -import java.io.*; +import com.sun.enterprise.util.cluster.RemoteType; + +import jakarta.inject.Inject; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; -import com.sun.enterprise.util.StringUtils; -import com.sun.enterprise.config.serverbeans.*; import org.glassfish.api.ActionReport; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandRunner; import org.glassfish.api.admin.CommandRunner.CommandInvocation; +import org.glassfish.api.admin.CommandValidationException; +import org.glassfish.api.admin.ParameterMap; import org.glassfish.hk2.api.ServiceLocator; -import jakarta.inject.Inject; - /** * Refactored from CreateNodeSshCommand.java on 9/10/11 * Note the use of "protected" visibility is one of those rare times when it is actually diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteConfigCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteConfigCommand.java index 2999630a036..fd20537b90b 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteConfigCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteConfigCommand.java @@ -18,23 +18,30 @@ -import java.beans.PropertyVetoException; -import java.util.List; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Configs; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.util.LocalStringManagerImpl; import jakarta.inject.Inject; +import java.beans.PropertyVetoException; +import java.util.List; -import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.config.*; -import org.glassfish.api.Param; import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; -import org.glassfish.api.admin.*; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; import org.glassfish.api.admin.config.ReferenceContainer; import org.glassfish.hk2.api.PerLookup; - -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.config.serverbeans.*; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.ConfigSupport; +import org.jvnet.hk2.config.SingleConfigCode; +import org.jvnet.hk2.config.TransactionFailure; /** * This is a remote command that deletes a destination config. diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteInstanceCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteInstanceCommand.java index 645f1b79e71..c98d8027dbf 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteInstanceCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteInstanceCommand.java @@ -16,23 +16,34 @@ package com.sun.enterprise.v3.admin.cluster; -import com.sun.enterprise.config.serverbeans.*; +import com.sun.enterprise.config.serverbeans.Node; +import com.sun.enterprise.config.serverbeans.Nodes; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.config.serverbeans.Servers; import com.sun.enterprise.util.StringUtils; + +import jakarta.inject.Inject; + +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandRunner; import org.glassfish.api.admin.CommandRunner.CommandInvocation; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; - -import jakarta.inject.Inject; - - import org.jvnet.hk2.annotations.Service; -import java.util.logging.Logger; -import java.util.List; -import java.util.ArrayList; /** * Remote AdminCommand to delete an instance. This command is run only on DAS. diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteNodeRemoteCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteNodeRemoteCommand.java index c18c0d73264..e86bd375bf8 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteNodeRemoteCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteNodeRemoteCommand.java @@ -16,27 +16,33 @@ package com.sun.enterprise.v3.admin.cluster; -import java.util.List; +import com.sun.enterprise.config.serverbeans.Node; +import com.sun.enterprise.config.serverbeans.Nodes; +import com.sun.enterprise.config.serverbeans.SshAuth; +import com.sun.enterprise.config.serverbeans.SshConnector; +import com.sun.enterprise.universal.process.ProcessManager; +import com.sun.enterprise.universal.process.ProcessManagerException; +import com.sun.enterprise.util.StringUtils; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + +import java.io.File; import java.util.ArrayList; -import java.util.logging.Logger; +import java.util.List; import java.util.logging.Level; -import java.io.File; +import java.util.logging.Logger; -import com.sun.enterprise.util.StringUtils; -import com.sun.enterprise.util.SystemPropertyConstants; -import com.sun.enterprise.config.serverbeans.*; import org.glassfish.api.ActionReport; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandRunner; import org.glassfish.api.admin.CommandRunner.CommandInvocation; -import jakarta.inject.Inject; - +import org.glassfish.api.admin.ParameterMap; import org.glassfish.hk2.api.IterableProvider; import org.glassfish.hk2.api.ServiceLocator; -import com.sun.enterprise.universal.process.ProcessManager; -import com.sun.enterprise.universal.process.ProcessManagerException; - /** * Remote AdminCommand to delete a config node. This command is run only on DAS. * diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteNodeSshCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteNodeSshCommand.java index c0c3dfbaac5..535c66c4a0b 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteNodeSshCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteNodeSshCommand.java @@ -16,13 +16,19 @@ package com.sun.enterprise.v3.admin.cluster; -import java.util.*; +import com.sun.enterprise.config.serverbeans.Nodes; + +import java.util.ArrayList; +import java.util.List; -import com.sun.enterprise.config.serverbeans.*; import org.glassfish.api.I18n; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.hk2.api.PerLookup; - import org.jvnet.hk2.annotations.Service; diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ExportSyncBundle.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ExportSyncBundle.java index 71cd6269083..e323d6a50e1 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ExportSyncBundle.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ExportSyncBundle.java @@ -16,24 +16,42 @@ package com.sun.enterprise.v3.admin.cluster; -import com.sun.enterprise.config.serverbeans.*; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Clusters; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.config.serverbeans.Servers; import com.sun.enterprise.universal.io.SmartFile; import com.sun.enterprise.util.cluster.SyncRequest; -import java.io.*; -import java.net.*; -import java.util.*; -import java.util.logging.*; + import jakarta.inject.Inject; + +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.net.URI; +import java.util.List; +import java.util.Properties; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.admin.payload.PayloadImpl; import org.glassfish.api.ActionReport; import org.glassfish.api.ActionReport.ExitCode; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.Payload; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Optional; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; /** * Usage: diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/GetHealthCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/GetHealthCommand.java index 18c609897e4..1e4c1edcf19 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/GetHealthCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/GetHealthCommand.java @@ -18,30 +18,33 @@ import com.sun.enterprise.config.serverbeans.Cluster; import com.sun.enterprise.config.serverbeans.Domain; + +import jakarta.inject.Inject; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Properties; +import java.util.SortedSet; +import java.util.TreeSet; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.gms.bootstrap.GMSAdapter; import org.glassfish.gms.bootstrap.GMSAdapterService; import org.glassfish.gms.bootstrap.HealthHistory; -import jakarta.inject.Inject; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Properties; -import java.util.SortedSet; -import java.util.TreeSet; -import java.util.logging.Level; -import java.util.logging.Logger; -import org.glassfish.api.admin.*; +import org.jvnet.hk2.annotations.Service; /** * The get-health command that lists the health status of diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/GlassFishClusterExecutor.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/GlassFishClusterExecutor.java index 612ad0df068..59485d8df59 100755 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/GlassFishClusterExecutor.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/GlassFishClusterExecutor.java @@ -21,11 +21,26 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.util.LocalStringManagerImpl; -import java.util.*; -import java.util.concurrent.ExecutorService; + import jakarta.inject.Inject; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.concurrent.ExecutorService; + import org.glassfish.api.ActionReport; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.ClusterExecutor; +import org.glassfish.api.admin.CommandModel; +import org.glassfish.api.admin.CommandModelProvider; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.InstanceState; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.common.util.admin.CommandModelImpl; import org.glassfish.config.support.CommandTarget; import org.glassfish.hk2.api.PostConstruct; diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/InstanceDirUtils.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/InstanceDirUtils.java index b29e40971d7..cb41daa715c 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/InstanceDirUtils.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/InstanceDirUtils.java @@ -17,13 +17,13 @@ package com.sun.enterprise.v3.admin.cluster; import com.sun.enterprise.config.serverbeans.Node; -import org.glassfish.internal.api.ServerContext; import com.sun.enterprise.util.io.InstanceDirs; - import java.io.File; import java.io.IOException; +import org.glassfish.internal.api.ServerContext; + final class InstanceDirUtils{ Node node; diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/InstanceRegisterInstanceCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/InstanceRegisterInstanceCommand.java index 60fbe3f1152..c3d92d59d20 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/InstanceRegisterInstanceCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/InstanceRegisterInstanceCommand.java @@ -16,34 +16,36 @@ package com.sun.enterprise.v3.admin.cluster; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Node; +import com.sun.enterprise.config.serverbeans.Nodes; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.config.serverbeans.ServerRef; +import com.sun.enterprise.config.serverbeans.Servers; +import com.sun.enterprise.config.serverbeans.SystemProperty; +import com.sun.enterprise.config.util.InstanceRegisterInstanceCommandParameters; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import java.beans.PropertyVetoException; import java.util.Map; + +import org.glassfish.api.ActionReport; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.RuntimeType; import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.api.ActionReport; -import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import jakarta.inject.Named; - import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import java.beans.PropertyVetoException; - -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.config.serverbeans.Cluster; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.Node; -import com.sun.enterprise.config.serverbeans.Nodes; -import com.sun.enterprise.config.serverbeans.Server; -import com.sun.enterprise.config.serverbeans.ServerRef; -import com.sun.enterprise.config.serverbeans.Servers; -import com.sun.enterprise.config.serverbeans.SystemProperty; -import com.sun.enterprise.config.util.InstanceRegisterInstanceCommandParameters; -import org.glassfish.api.admin.*; /** diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListClustersCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListClustersCommand.java index b47ba0ca122..d0fa0c9627e 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListClustersCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListClustersCommand.java @@ -17,9 +17,25 @@ package com.sun.enterprise.v3.admin.cluster; import com.sun.enterprise.admin.util.InstanceStateService; -import com.sun.enterprise.config.serverbeans.*; -import com.sun.enterprise.util.cluster.InstanceInfo; +import com.sun.enterprise.admin.util.RemoteInstanceCommandHelper; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Clusters; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Node; +import com.sun.enterprise.config.serverbeans.Nodes; +import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.util.StringUtils; +import com.sun.enterprise.util.cluster.InstanceInfo; + +import jakarta.inject.Inject; + +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -27,21 +43,15 @@ import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandLock; import org.glassfish.api.admin.InstanceState; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.config.ReferenceContainer; -import jakarta.inject.Inject; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; +import org.jvnet.hk2.annotations.Service; -import java.util.List; -import java.util.LinkedList; -import java.util.HashMap; -import java.util.Map; -import java.util.logging.Logger; -import static com.sun.enterprise.v3.admin.cluster.Constants.*; -import com.sun.enterprise.admin.util.RemoteInstanceCommandHelper; -import org.glassfish.api.admin.*; +import static com.sun.enterprise.v3.admin.cluster.Constants.PARTIALLY_RUNNING; +import static com.sun.enterprise.v3.admin.cluster.Constants.PARTIALLY_RUNNING_DISPLAY; /** * This is a remote command that lists the clusters. diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListConfigsCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListConfigsCommand.java index eda0460332f..ad4ac02e5f4 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListConfigsCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListConfigsCommand.java @@ -18,8 +18,18 @@ -import com.sun.enterprise.config.serverbeans.*; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Configs; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.util.StringUtils; + +import jakarta.inject.Inject; + +import java.util.LinkedList; +import java.util.List; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -27,18 +37,14 @@ import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandLock; import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.RuntimeType; import org.glassfish.api.admin.config.ReferenceContainer; -import org.glassfish.config.support.TargetType; import org.glassfish.config.support.CommandTarget; -import jakarta.inject.Inject; - -import org.jvnet.hk2.annotations.Service; +import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; - -import java.util.List; -import java.util.LinkedList; -import org.glassfish.api.admin.*; +import org.jvnet.hk2.annotations.Service; /** * This is a remote command that lists the configs. diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListInstancesCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListInstancesCommand.java index 36c2e96a125..2c5bc18678b 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListInstancesCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListInstancesCommand.java @@ -18,24 +18,46 @@ import com.sun.enterprise.admin.util.InstanceStateService; import com.sun.enterprise.admin.util.RemoteInstanceCommandHelper; -import com.sun.enterprise.config.serverbeans.*; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Node; +import com.sun.enterprise.config.serverbeans.Nodes; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.config.serverbeans.Servers; import com.sun.enterprise.util.StringUtils; import com.sun.enterprise.util.SystemPropertyConstants; import com.sun.enterprise.util.cluster.InstanceInfo; -import static com.sun.enterprise.v3.admin.cluster.Constants.*; -import java.util.*; -import java.util.logging.*; + import jakarta.inject.Inject; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Properties; +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.ActionReport.ExitCode; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.InstanceState; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.api.admin.config.ReferenceContainer; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; import org.jvnet.hk2.annotations.Service; +import static com.sun.enterprise.v3.admin.cluster.Constants.NONE; + /** * AdminCommand to list all instances and their states * diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesCommand.java index 77d901526cb..54c5fb5666d 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesCommand.java @@ -17,8 +17,13 @@ package com.sun.enterprise.v3.admin.cluster; import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.Servers; import com.sun.enterprise.config.serverbeans.Nodes; +import com.sun.enterprise.config.serverbeans.Servers; + +import jakarta.inject.Inject; + +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.ActionReport.ExitCode; import org.glassfish.api.I18n; @@ -26,13 +31,10 @@ import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandLock; -import jakarta.inject.Inject; - - -import org.jvnet.hk2.annotations.Service; -import java.util.logging.Logger; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; @Service(name = "list-nodes") @PerLookup diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesConfigCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesConfigCommand.java index 374cc8a3df2..78243186aa8 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesConfigCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesConfigCommand.java @@ -17,8 +17,13 @@ package com.sun.enterprise.v3.admin.cluster; import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.Servers; import com.sun.enterprise.config.serverbeans.Nodes; +import com.sun.enterprise.config.serverbeans.Servers; + +import jakarta.inject.Inject; + +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.ActionReport.ExitCode; import org.glassfish.api.I18n; @@ -26,13 +31,10 @@ import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandLock; -import jakarta.inject.Inject; - - -import org.jvnet.hk2.annotations.Service; -import java.util.logging.Logger; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; @Service(name = "list-nodes-config") @PerLookup diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesHelper.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesHelper.java index 7a4468e7ddb..ad07e4c65d3 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesHelper.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesHelper.java @@ -16,14 +16,15 @@ package com.sun.enterprise.v3.admin.cluster; -import com.sun.enterprise.config.serverbeans.Servers; -import com.sun.enterprise.config.serverbeans.Server; -import com.sun.enterprise.config.serverbeans.Nodes; import com.sun.enterprise.config.serverbeans.Node; +import com.sun.enterprise.config.serverbeans.Nodes; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.config.serverbeans.Servers; import com.sun.enterprise.util.cluster.NodeInfo; -import java.util.logging.Logger; -import java.util.List; + import java.util.LinkedList; +import java.util.List; +import java.util.logging.Logger; public class ListNodesHelper { diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesSshCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesSshCommand.java index 0f47122cb24..f2ffbdd91ea 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesSshCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesSshCommand.java @@ -16,8 +16,13 @@ package com.sun.enterprise.v3.admin.cluster; -import com.sun.enterprise.config.serverbeans.Servers; import com.sun.enterprise.config.serverbeans.Nodes; +import com.sun.enterprise.config.serverbeans.Servers; + +import jakarta.inject.Inject; + +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.ActionReport.ExitCode; import org.glassfish.api.I18n; @@ -25,13 +30,10 @@ import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandLock; -import jakarta.inject.Inject; - - -import org.jvnet.hk2.annotations.Service; -import java.util.logging.Logger; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; @Service(name = "list-nodes-ssh") @PerLookup diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/NodeAgentConfigUpgrade.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/NodeAgentConfigUpgrade.java index a88bdb15593..a0108e45687 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/NodeAgentConfigUpgrade.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/NodeAgentConfigUpgrade.java @@ -16,29 +16,31 @@ package com.sun.enterprise.v3.admin.cluster; -import java.beans.PropertyVetoException; -import java.util.*; -import java.util.logging.*; - import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.Server; -import com.sun.enterprise.config.serverbeans.Servers; +import com.sun.enterprise.config.serverbeans.JmxConnector; import com.sun.enterprise.config.serverbeans.Node; -import com.sun.enterprise.config.serverbeans.Nodes; import com.sun.enterprise.config.serverbeans.NodeAgent; import com.sun.enterprise.config.serverbeans.NodeAgents; -import com.sun.enterprise.config.serverbeans.JmxConnector; -import org.glassfish.api.admin.config.ConfigurationUpgrade; +import com.sun.enterprise.config.serverbeans.Nodes; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.config.serverbeans.Servers; + import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; +import java.beans.PropertyVetoException; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.glassfish.api.admin.config.ConfigurationUpgrade; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.PostConstruct; -import org.jvnet.hk2.config.types.Property; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; +import org.jvnet.hk2.config.Transaction; import org.jvnet.hk2.config.TransactionFailure; -import org.jvnet.hk2.config.*; +import org.jvnet.hk2.config.types.Property; /** diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PingNodeRemoteCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PingNodeRemoteCommand.java index 9398cca18eb..1c21b676aa2 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PingNodeRemoteCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PingNodeRemoteCommand.java @@ -16,15 +16,19 @@ package com.sun.enterprise.v3.admin.cluster; -import com.sun.enterprise.config.serverbeans.Nodes; import com.sun.enterprise.config.serverbeans.Node; +import com.sun.enterprise.config.serverbeans.Nodes; import com.sun.enterprise.util.StringUtils; -import org.glassfish.api.ActionReport; -import org.glassfish.api.Param; -import org.glassfish.api.admin.*; + import jakarta.inject.Inject; + import java.util.logging.Logger; +import org.glassfish.api.ActionReport; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandValidationException; import org.glassfish.hk2.api.ServiceLocator; /** diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PingNodeSshCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PingNodeSshCommand.java index 53849c96214..2ea620c3d27 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PingNodeSshCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PingNodeSshCommand.java @@ -17,10 +17,17 @@ package com.sun.enterprise.v3.admin.cluster; import com.sun.enterprise.config.serverbeans.Node; + import org.glassfish.api.I18n; -import org.glassfish.api.admin.*; -import org.jvnet.hk2.annotations.Service; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * Remote AdminCommand to validate the connection to an SSH node. diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PostRegisterInstanceCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PostRegisterInstanceCommand.java index 8a877ec5f4a..36f19365b93 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PostRegisterInstanceCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PostRegisterInstanceCommand.java @@ -18,21 +18,31 @@ import com.sun.enterprise.admin.util.ClusterOperationUtil; import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.config.util.InstanceRegisterInstanceCommandParameters; import com.sun.enterprise.config.util.RegisterInstanceCommandParameters; -import com.sun.enterprise.config.serverbeans.Server; -import java.util.logging.Logger; -import java.util.List; + +import jakarta.inject.Inject; + import java.util.ArrayList; +import java.util.List; +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; -import org.glassfish.api.admin.*; -import org.glassfish.internal.api.Target; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.FailurePolicy; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.Supplemental; import org.glassfish.common.util.admin.ParameterMapExtractor; -import jakarta.inject.Inject; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Target; +import org.jvnet.hk2.annotations.Service; /** * Causes InstanceRegisterInstanceCommand executions on the correct remote instances. diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PostUnregisterInstanceCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PostUnregisterInstanceCommand.java index 4d06c183ba8..cc7092a8aac 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PostUnregisterInstanceCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PostUnregisterInstanceCommand.java @@ -19,19 +19,29 @@ import com.sun.enterprise.admin.util.ClusterOperationUtil; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Server; -import java.util.logging.Logger; -import java.util.List; + +import jakarta.inject.Inject; + import java.util.ArrayList; +import java.util.List; +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; -import org.glassfish.internal.api.Target; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.FailurePolicy; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.Supplemental; import org.glassfish.common.util.admin.ParameterMapExtractor; -import jakarta.inject.Inject; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Target; +import org.jvnet.hk2.annotations.Service; /** * Causes InstanceRegisterInstanceCommand executions on the correct remote instances. diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/RestartInstanceCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/RestartInstanceCommand.java index fef82be8733..f57cc5627e1 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/RestartInstanceCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/RestartInstanceCommand.java @@ -18,23 +18,37 @@ import com.sun.enterprise.admin.remote.RemoteRestAdminCommand; import com.sun.enterprise.admin.remote.ServerRemoteRestAdminCommand; -import com.sun.enterprise.admin.util.*; +import com.sun.enterprise.admin.util.InstanceStateService; +import com.sun.enterprise.admin.util.RemoteInstanceCommandHelper; import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.util.ObjectAnalyzer; import com.sun.enterprise.util.StringUtils; -import java.util.logging.Logger; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.util.logging.Level; -import org.glassfish.api.*; -import org.glassfish.api.admin.*; +import java.util.logging.Logger; -import org.jvnet.hk2.annotations.Service; +import org.glassfish.api.ActionReport; +import org.glassfish.api.I18n; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandException; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; - -import jakarta.inject.Inject; -import jakarta.inject.Named; +import org.jvnet.hk2.annotations.Service; /** * diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StartClusterCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StartClusterCommand.java index c221c82fce3..85f44a2a746 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StartClusterCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StartClusterCommand.java @@ -18,20 +18,30 @@ package com.sun.enterprise.v3.admin.cluster; import com.sun.enterprise.config.serverbeans.Cluster; -import java.util.logging.Logger; +import com.sun.enterprise.config.serverbeans.Domain; -import org.glassfish.api.admin.*; import jakarta.inject.Inject; +import java.util.logging.Logger; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.api.I18n; -import org.glassfish.api.Param; import org.glassfish.api.ActionReport; import org.glassfish.api.ActionReport.ExitCode; +import org.glassfish.api.I18n; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandException; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.CommandRunner; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.Progress; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.hk2.api.PerLookup; - -import com.sun.enterprise.config.serverbeans.Domain; +import org.jvnet.hk2.annotations.Service; @I18n("start.cluster.command") @Service(name = "start-cluster") diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopClusterCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopClusterCommand.java index 3a9d741c10e..88079c6488f 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopClusterCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopClusterCommand.java @@ -18,18 +18,28 @@ package com.sun.enterprise.v3.admin.cluster; import com.sun.enterprise.config.serverbeans.Cluster; -import java.util.logging.Logger; +import com.sun.enterprise.config.serverbeans.Domain; + import jakarta.inject.Inject; +import java.util.logging.Logger; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.api.I18n; -import org.glassfish.api.Param; import org.glassfish.api.ActionReport; import org.glassfish.api.ActionReport.ExitCode; -import com.sun.enterprise.config.serverbeans.Domain; -import org.glassfish.api.admin.*; +import org.glassfish.api.I18n; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandException; +import org.glassfish.api.admin.CommandRunner; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.Progress; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; @I18n("stop.cluster.command") @Service(name="stop-cluster") diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopInstanceCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopInstanceCommand.java index 39f12bb2e0e..5fa75b54bcc 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopInstanceCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopInstanceCommand.java @@ -27,10 +27,28 @@ import com.sun.enterprise.module.ModulesRegistry; import com.sun.enterprise.util.StringUtils; import com.sun.enterprise.v3.admin.StopServer; + +import jakarta.inject.Inject; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.cluster.ssh.launcher.SSHLauncher; import org.glassfish.cluster.ssh.sftp.SFTPClient; import org.glassfish.hk2.api.IterableProvider; @@ -40,13 +58,6 @@ import org.glassfish.internal.api.ServerContext; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * AdminCommand to stop the instance * server. diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/SynchronizeFiles.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/SynchronizeFiles.java index ee0493599f7..bb2a3139007 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/SynchronizeFiles.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/SynchronizeFiles.java @@ -16,29 +16,35 @@ package com.sun.enterprise.v3.admin.cluster; -import java.io.*; -import java.util.logging.Logger; -import java.util.logging.Level; -import jakarta.xml.bind.*; - import com.sun.enterprise.admin.util.InstanceStateService; -import org.glassfish.api.admin.*; -import org.jvnet.hk2.annotations.Optional; -import org.jvnet.hk2.annotations.Service; +import com.sun.enterprise.config.serverbeans.Applications; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.config.serverbeans.Servers; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.cluster.SyncRequest; import jakarta.inject.Inject; -import org.glassfish.hk2.api.PerLookup; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Unmarshaller; + +import java.io.File; +import java.util.logging.Level; +import java.util.logging.Logger; -import org.glassfish.api.I18n; -import org.glassfish.api.Param; import org.glassfish.api.ActionReport; import org.glassfish.api.ActionReport.ExitCode; -import com.sun.enterprise.config.serverbeans.Applications; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.Servers; -import com.sun.enterprise.config.serverbeans.Server; -import com.sun.enterprise.util.cluster.SyncRequest; -import com.sun.enterprise.util.LocalStringManagerImpl; +import org.glassfish.api.I18n; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.InstanceState; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Optional; +import org.jvnet.hk2.annotations.Service; /** * Synchronize files. Accepts an XML document containing files diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeCommand.java index 363290232d1..67a3b516cc4 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeCommand.java @@ -16,31 +16,40 @@ package com.sun.enterprise.v3.admin.cluster; +import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Node; import com.sun.enterprise.config.serverbeans.Nodes; -import com.sun.enterprise.config.serverbeans.SshConnector; import com.sun.enterprise.config.serverbeans.SshAuth; -import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.SshConnector; import com.sun.enterprise.universal.glassfish.TokenResolver; import com.sun.enterprise.util.StringUtils; +import com.sun.enterprise.util.net.NetUtils; + +import jakarta.inject.Inject; + import java.beans.PropertyVetoException; import java.io.File; import java.util.HashMap; import java.util.Map; +import java.util.logging.Logger; -import com.sun.enterprise.util.net.NetUtils; import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.hk2.api.PerLookup; - -import jakarta.inject.Inject; - - import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.config.*; -import java.util.logging.Logger; +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.ConfigSupport; +import org.jvnet.hk2.config.SingleConfigCode; +import org.jvnet.hk2.config.Transaction; +import org.jvnet.hk2.config.TransactionFailure; /** * Remote AdminCommand to update a config node. This command is run only on DAS. diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeConfigCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeConfigCommand.java index 6f0ff3ced9f..f6dbfe49fb4 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeConfigCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeConfigCommand.java @@ -16,22 +16,30 @@ package com.sun.enterprise.v3.admin.cluster; -import com.sun.enterprise.util.StringUtils; import com.sun.enterprise.config.serverbeans.Node; import com.sun.enterprise.config.serverbeans.Nodes; +import com.sun.enterprise.util.StringUtils; + +import jakarta.inject.Inject; + +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandRunner; import org.glassfish.api.admin.CommandRunner.CommandInvocation; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; - -import jakarta.inject.Inject; - - import org.jvnet.hk2.annotations.Service; -import java.util.logging.Logger; /** * Remote AdminCommand to update a config node. diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeRemoteCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeRemoteCommand.java index d9bda89950e..34cc3f3ad8b 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeRemoteCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeRemoteCommand.java @@ -16,19 +16,26 @@ package com.sun.enterprise.v3.admin.cluster; -import com.sun.enterprise.util.cluster.RemoteType; -import com.sun.enterprise.util.StringUtils; import com.sun.enterprise.config.serverbeans.Node; import com.sun.enterprise.config.serverbeans.Nodes; -import com.sun.enterprise.config.serverbeans.SshConnector; import com.sun.enterprise.config.serverbeans.SshAuth; +import com.sun.enterprise.config.serverbeans.SshConnector; +import com.sun.enterprise.util.StringUtils; +import com.sun.enterprise.util.cluster.RemoteType; + +import jakarta.inject.Inject; + +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandRunner; import org.glassfish.api.admin.CommandRunner.CommandInvocation; +import org.glassfish.api.admin.CommandValidationException; +import org.glassfish.api.admin.ParameterMap; import org.glassfish.hk2.api.ServiceLocator; -import java.util.logging.Logger; -import jakarta.inject.Inject; /** * Remote AdminCommand to update a remote node. This command is run only on DAS. diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeSshCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeSshCommand.java index 3ad2bb7da29..2832439ec8d 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeSshCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeSshCommand.java @@ -16,13 +16,18 @@ package com.sun.enterprise.v3.admin.cluster; -import com.sun.enterprise.util.cluster.RemoteType; import com.sun.enterprise.config.serverbeans.Node; +import com.sun.enterprise.util.cluster.RemoteType; + import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.hk2.api.PerLookup; - import org.jvnet.hk2.annotations.Service; /** diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ValidateNodeCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ValidateNodeCommand.java index d35481df4b6..b9388e9daf5 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ValidateNodeCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ValidateNodeCommand.java @@ -16,28 +16,39 @@ package com.sun.enterprise.v3.admin.cluster; -import com.sun.enterprise.config.serverbeans.*; - +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Node; +import com.sun.enterprise.config.serverbeans.Nodes; +import com.sun.enterprise.config.serverbeans.SshAuth; +import com.sun.enterprise.config.serverbeans.SshConnector; import com.sun.enterprise.util.OS; import com.sun.enterprise.util.StringUtils; -import com.sun.enterprise.util.net.NetUtils; import com.sun.enterprise.util.io.FileUtils; -import org.glassfish.api.admin.CommandRunner.CommandInvocation; -import org.glassfish.api.ActionReport; -import org.glassfish.api.I18n; -import org.glassfish.api.Param; -import org.glassfish.api.admin.*; -import org.glassfish.hk2.api.PerLookup; +import com.sun.enterprise.util.net.NetUtils; import jakarta.inject.Inject; - -import org.jvnet.hk2.annotations.Service; -import java.util.logging.Logger; -import java.util.logging.Level; import java.io.File; -import java.util.Set; import java.util.HashSet; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.I18n; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandRunner; +import org.glassfish.api.admin.CommandRunner.CommandInvocation; +import org.glassfish.api.admin.CommandValidationException; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * Remote AdminCommand to validate a config Node. This command is run only on DAS. diff --git a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateLocalInstanceCommand.java b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateLocalInstanceCommand.java index 3ed2c69bba9..86e3fd50c04 100644 --- a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateLocalInstanceCommand.java +++ b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateLocalInstanceCommand.java @@ -16,6 +16,16 @@ package com.sun.enterprise.admin.cli.cluster; +import com.sun.enterprise.admin.cli.CLIConstants; +import com.sun.enterprise.admin.cli.remote.RemoteCLICommand; +import com.sun.enterprise.admin.servermgmt.KeystoreManager; +import com.sun.enterprise.admin.util.CommandModelData.ParamModelData; +import com.sun.enterprise.security.store.PasswordAdapter; +import com.sun.enterprise.universal.glassfish.TokenResolver; +import com.sun.enterprise.util.OS; +import com.sun.enterprise.util.SystemPropertyConstants; +import com.sun.enterprise.util.io.FileUtils; + import java.io.File; import java.io.IOException; import java.net.InetAddress; @@ -32,16 +42,6 @@ import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.admin.cli.CLIConstants; -import com.sun.enterprise.admin.cli.remote.RemoteCLICommand; -import com.sun.enterprise.admin.servermgmt.KeystoreManager; -import com.sun.enterprise.admin.util.CommandModelData.ParamModelData; -import com.sun.enterprise.security.store.PasswordAdapter; -import com.sun.enterprise.universal.glassfish.TokenResolver; -import com.sun.enterprise.util.OS; -import com.sun.enterprise.util.SystemPropertyConstants; -import com.sun.enterprise.util.io.FileUtils; - /** * This is a local command that calls the primitive remote _register-instance to add the diff --git a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateLocalInstanceFilesystemCommand.java b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateLocalInstanceFilesystemCommand.java index a9724a860d0..008f4396c23 100644 --- a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateLocalInstanceFilesystemCommand.java +++ b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateLocalInstanceFilesystemCommand.java @@ -16,19 +16,25 @@ package com.sun.enterprise.admin.cli.cluster; +import com.sun.enterprise.util.net.NetUtils; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.net.InetAddress; import java.net.UnknownHostException; -import java.util.*; -import org.jvnet.hk2.annotations.Service; +import java.util.Properties; + import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.CommandException; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; -import static com.sun.enterprise.admin.cli.CLIConstants.*; -import com.sun.enterprise.util.net.NetUtils; +import static com.sun.enterprise.admin.cli.CLIConstants.DEFAULT_HOSTNAME; +import static com.sun.enterprise.admin.cli.CLIConstants.K_DAS_HOST; +import static com.sun.enterprise.admin.cli.CLIConstants.K_DAS_IS_SECURE; +import static com.sun.enterprise.admin.cli.CLIConstants.K_DAS_PORT; +import static com.sun.enterprise.admin.cli.CLIConstants.K_DAS_PROTOCOL; /** * This is a local command that creates a local instance. diff --git a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateNodeAgentCommand.java b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateNodeAgentCommand.java index cb3e1e3b0ae..6e3878a9145 100644 --- a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateNodeAgentCommand.java +++ b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateNodeAgentCommand.java @@ -16,10 +16,11 @@ package com.sun.enterprise.admin.cli.cluster; -import org.glassfish.api.admin.*; -import org.glassfish.hk2.api.PerLookup; +import com.sun.enterprise.admin.cli.CLICommand; -import com.sun.enterprise.admin.cli.*; +import org.glassfish.api.admin.CommandException; +import org.glassfish.api.admin.CommandValidationException; +import org.glassfish.hk2.api.PerLookup; /** * This is a local command that creates a node agent. diff --git a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/DeleteInstanceFilesystem.java b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/DeleteInstanceFilesystem.java index 78c22c1e898..3924827ba8c 100644 --- a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/DeleteInstanceFilesystem.java +++ b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/DeleteInstanceFilesystem.java @@ -19,11 +19,11 @@ import com.sun.enterprise.universal.process.ProcessUtils; import com.sun.enterprise.util.StringUtils; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.CommandException; +import org.glassfish.api.admin.CommandValidationException; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; // TODO TODO diff --git a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/InstallNodeBaseCommand.java b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/InstallNodeBaseCommand.java index 1e165c35989..9150e483198 100644 --- a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/InstallNodeBaseCommand.java +++ b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/InstallNodeBaseCommand.java @@ -16,29 +16,32 @@ package com.sun.enterprise.admin.cli.cluster; -import java.util.logging.Level; import com.sun.enterprise.universal.io.SmartFile; import com.sun.enterprise.util.SystemPropertyConstants; import com.sun.enterprise.util.io.FileListerRelative; import com.sun.enterprise.util.io.FileUtils; import com.sun.enterprise.util.zip.ZipFileException; import com.sun.enterprise.util.zip.ZipWriter; -import java.io.*; -import org.glassfish.api.Param; -import org.glassfish.api.admin.CommandException; -import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.internal.api.Globals; +import jakarta.inject.Inject; import java.io.File; import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.StringWriter; import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; import java.util.List; +import java.util.logging.Level; + +import org.glassfish.api.Param; +import org.glassfish.api.admin.CommandException; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Globals; +import org.jvnet.hk2.annotations.Service; /** * @author Rajiv Mordani diff --git a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/InstallNodeCommand.java b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/InstallNodeCommand.java index 4fead358c97..2f19a06fb13 100644 --- a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/InstallNodeCommand.java +++ b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/InstallNodeCommand.java @@ -17,8 +17,8 @@ package com.sun.enterprise.admin.cli.cluster; -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * This class is needed for backwards compatibility. install-node will simply diff --git a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/LocalInstanceCommand.java b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/LocalInstanceCommand.java index 8e687e6047b..201b2bbf36d 100644 --- a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/LocalInstanceCommand.java +++ b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/LocalInstanceCommand.java @@ -17,24 +17,30 @@ package com.sun.enterprise.admin.cli.cluster; import com.sun.enterprise.admin.cli.remote.RemoteCLICommand; +import com.sun.enterprise.admin.servermgmt.cli.LocalServerCommand; +import com.sun.enterprise.universal.io.SmartFile; import com.sun.enterprise.util.StringUtils; +import com.sun.enterprise.util.SystemPropertyConstants; import com.sun.enterprise.util.io.FileUtils; import com.sun.enterprise.util.io.InstanceDirs; -import java.io.*; +import com.sun.enterprise.util.io.ServerDirs; +import com.sun.enterprise.util.net.NetUtils; + +import java.io.BufferedOutputStream; +import java.io.Console; import java.io.File; +import java.io.FileFilter; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; import java.net.InetAddress; import java.net.UnknownHostException; -import java.util.*; +import java.util.Properties; import java.util.logging.Level; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; - -import com.sun.enterprise.admin.servermgmt.cli.LocalServerCommand; -import com.sun.enterprise.util.SystemPropertyConstants; -import com.sun.enterprise.util.net.NetUtils; -import com.sun.enterprise.universal.io.SmartFile; -import com.sun.enterprise.util.io.ServerDirs; +import org.glassfish.api.admin.CommandException; +import org.glassfish.api.admin.CommandValidationException; /** * A base class for local commands that manage a local server instance. diff --git a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/UninstallNodeBaseCommand.java b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/UninstallNodeBaseCommand.java index 3a18c418208..7eba312585d 100644 --- a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/UninstallNodeBaseCommand.java +++ b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/UninstallNodeBaseCommand.java @@ -16,14 +16,14 @@ package com.sun.enterprise.admin.cli.cluster; -import org.glassfish.api.Param; -import org.glassfish.api.admin.CommandException; import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; +import org.glassfish.api.Param; +import org.glassfish.api.admin.CommandException; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.api.Globals; +import org.jvnet.hk2.annotations.Service; /** * diff --git a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/UninstallNodeCommand.java b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/UninstallNodeCommand.java index 541b80f6fc6..05b3e9fc5bc 100644 --- a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/UninstallNodeCommand.java +++ b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/UninstallNodeCommand.java @@ -17,8 +17,8 @@ package com.sun.enterprise.admin.cli.cluster; -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * This class is needed for backwards compatibility. uninstall-node will simply diff --git a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/ValidateDasOptions.java b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/ValidateDasOptions.java index e2ac8807645..6413ba75743 100644 --- a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/ValidateDasOptions.java +++ b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/ValidateDasOptions.java @@ -16,13 +16,12 @@ package com.sun.enterprise.admin.cli.cluster; -import java.io.*; +import java.io.File; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.CommandException; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * Validate DAS host, port, secure options. diff --git a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/ValidateMulticastCommand.java b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/ValidateMulticastCommand.java index 11bcfb46766..0ed4426b266 100644 --- a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/ValidateMulticastCommand.java +++ b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/ValidateMulticastCommand.java @@ -18,15 +18,15 @@ import com.sun.enterprise.admin.cli.CLICommand; import com.sun.enterprise.gms.tools.MulticastTester; -import org.glassfish.api.Param; -import org.glassfish.api.admin.CommandException; - -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; import java.util.ArrayList; import java.util.List; +import org.glassfish.api.Param; +import org.glassfish.api.admin.CommandException; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; + /** * asadmin local command that wraps the multicast validator tool * in shoal-gms-impl.jar diff --git a/nucleus/cluster/common/src/main/java/com/sun/enterprise/util/cluster/InstanceInfo.java b/nucleus/cluster/common/src/main/java/com/sun/enterprise/util/cluster/InstanceInfo.java index b83580d97a3..bf6df9f7c76 100644 --- a/nucleus/cluster/common/src/main/java/com/sun/enterprise/util/cluster/InstanceInfo.java +++ b/nucleus/cluster/common/src/main/java/com/sun/enterprise/util/cluster/InstanceInfo.java @@ -19,9 +19,12 @@ import com.sun.enterprise.admin.util.InstanceCommandExecutor; import com.sun.enterprise.admin.util.InstanceStateService; import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.universal.Duration; +import com.sun.enterprise.util.ColumnFormatter; import com.sun.enterprise.util.StringUtils; -import java.util.*; +import java.util.List; +import java.util.Properties; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.logging.Logger; @@ -30,10 +33,8 @@ import org.glassfish.api.admin.CommandException; import org.glassfish.api.admin.FailurePolicy; import org.glassfish.api.admin.InstanceCommandResult; -import org.glassfish.api.admin.ParameterMap; -import com.sun.enterprise.util.ColumnFormatter; -import com.sun.enterprise.universal.Duration; import org.glassfish.api.admin.InstanceState; +import org.glassfish.api.admin.ParameterMap; import org.glassfish.hk2.api.ServiceLocator; /** diff --git a/nucleus/cluster/common/src/main/java/com/sun/enterprise/util/cluster/NodeInfo.java b/nucleus/cluster/common/src/main/java/com/sun/enterprise/util/cluster/NodeInfo.java index dd3fa1e6659..07741c70b03 100644 --- a/nucleus/cluster/common/src/main/java/com/sun/enterprise/util/cluster/NodeInfo.java +++ b/nucleus/cluster/common/src/main/java/com/sun/enterprise/util/cluster/NodeInfo.java @@ -16,7 +16,7 @@ package com.sun.enterprise.util.cluster; -import java.util.*; +import java.util.List; public final class NodeInfo { diff --git a/nucleus/cluster/common/src/main/java/com/sun/enterprise/util/cluster/SyncRequest.java b/nucleus/cluster/common/src/main/java/com/sun/enterprise/util/cluster/SyncRequest.java index d44f1b471ab..cc036ab92c3 100644 --- a/nucleus/cluster/common/src/main/java/com/sun/enterprise/util/cluster/SyncRequest.java +++ b/nucleus/cluster/common/src/main/java/com/sun/enterprise/util/cluster/SyncRequest.java @@ -16,9 +16,11 @@ package com.sun.enterprise.util.cluster; -import java.util.*; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.*; +import java.util.ArrayList; +import java.util.List; /** * Request message to synchronize files. diff --git a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSAdapterImpl.java b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSAdapterImpl.java index 762dd057ca3..58367d9d23e 100644 --- a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSAdapterImpl.java +++ b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSAdapterImpl.java @@ -17,37 +17,6 @@ package org.glassfish.gms; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.util.HashSet; -import java.util.List; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.logging.Logger; -import org.glassfish.api.logging.LogLevel; - -import jakarta.inject.Inject; -import jakarta.inject.Named; - -import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.api.event.EventListener; -import org.glassfish.api.event.EventTypes; -import org.glassfish.api.event.Events; -import org.glassfish.gms.bootstrap.GMSAdapter; -import org.glassfish.gms.bootstrap.HealthHistory; -import org.glassfish.hk2.api.PerLookup; -import org.glassfish.hk2.api.PostConstruct; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.logging.annotation.LogMessageInfo; -import org.glassfish.logging.annotation.LogMessagesResourceBundle; -import org.glassfish.logging.annotation.LoggerInfo; -import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.config.Dom; -import org.jvnet.hk2.config.types.Property; - import com.sun.enterprise.config.serverbeans.Cluster; import com.sun.enterprise.config.serverbeans.Clusters; import com.sun.enterprise.config.serverbeans.Config; @@ -87,6 +56,37 @@ import com.sun.enterprise.mgmt.transport.grizzly.GrizzlyConfigConstants; import com.sun.enterprise.util.io.ServerDirs; +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.HashSet; +import java.util.List; +import java.util.Properties; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.logging.Logger; + +import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.api.event.EventListener; +import org.glassfish.api.event.EventTypes; +import org.glassfish.api.event.Events; +import org.glassfish.api.logging.LogLevel; +import org.glassfish.gms.bootstrap.GMSAdapter; +import org.glassfish.gms.bootstrap.HealthHistory; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.PostConstruct; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.logging.annotation.LogMessageInfo; +import org.glassfish.logging.annotation.LogMessagesResourceBundle; +import org.glassfish.logging.annotation.LoggerInfo; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.Dom; +import org.jvnet.hk2.config.types.Property; + /** * @author Sheetal.Vartak@Sun.COM */ diff --git a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSConfigUpgrade.java b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSConfigUpgrade.java index dea81f56efe..412de3990ac 100644 --- a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSConfigUpgrade.java +++ b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSConfigUpgrade.java @@ -23,6 +23,7 @@ import com.sun.enterprise.config.serverbeans.Configs; import com.sun.enterprise.config.serverbeans.FailureDetection; import com.sun.enterprise.config.serverbeans.GroupManagementService; + import jakarta.inject.Inject; import java.beans.PropertyVetoException; diff --git a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceAfterStartClusterCommand.java b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceAfterStartClusterCommand.java index 78c830766ec..a064d3f5a9b 100644 --- a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceAfterStartClusterCommand.java +++ b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceAfterStartClusterCommand.java @@ -18,23 +18,31 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.ee.cms.core.GMSConstants; + +import jakarta.inject.Inject; + +import java.util.LinkedList; +import java.util.List; +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandRunner; +import org.glassfish.api.admin.FailurePolicy; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.api.admin.Supplemental; +import org.glassfish.api.logging.LogLevel; import org.glassfish.gms.bootstrap.GMSAdapterService; -import jakarta.inject.Inject; - +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.logging.annotation.LogMessageInfo; import org.glassfish.logging.annotation.LogMessagesResourceBundle; import org.glassfish.logging.annotation.LoggerInfo; import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; -import org.glassfish.hk2.api.ServiceLocator; - -import java.util.LinkedList; -import java.util.List; -import org.glassfish.api.logging.LogLevel; -import java.util.logging.Logger; @Service(name = "_gms-announce-after-start-cluster-command") diff --git a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceAfterStopClusterCommand.java b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceAfterStopClusterCommand.java index f86449c69d6..32722d4a012 100644 --- a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceAfterStopClusterCommand.java +++ b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceAfterStopClusterCommand.java @@ -18,18 +18,23 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.ee.cms.core.GMSConstants; + +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; - +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.FailurePolicy; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.Supplemental; +import org.glassfish.api.logging.LogLevel; +import org.glassfish.hk2.api.PerLookup; import org.glassfish.logging.annotation.LogMessageInfo; import org.glassfish.logging.annotation.LogMessagesResourceBundle; import org.glassfish.logging.annotation.LoggerInfo; import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; - -import org.glassfish.api.logging.LogLevel; -import java.util.logging.Logger; @Service(name = "_gms-announce-after-stop-cluster-command") diff --git a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceBeforeStartClusterCommand.java b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceBeforeStartClusterCommand.java index 2203b47e665..53af0f3ebce 100644 --- a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceBeforeStartClusterCommand.java +++ b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceBeforeStartClusterCommand.java @@ -16,31 +16,37 @@ package org.glassfish.gms.admin; -import org.glassfish.gms.bootstrap.GMSAdapterService; -import org.glassfish.gms.bootstrap.GMSAdapter; -import com.sun.enterprise.config.serverbeans.*; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.ee.cms.core.GMSConstants; -import org.glassfish.api.ActionReport; -import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import com.sun.enterprise.ee.cms.core.GroupManagementService; + import jakarta.inject.Inject; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; +import java.util.logging.Logger; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandRunner; +import org.glassfish.api.admin.FailurePolicy; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.api.admin.Supplemental; +import org.glassfish.api.logging.LogLevel; +import org.glassfish.gms.bootstrap.GMSAdapter; +import org.glassfish.gms.bootstrap.GMSAdapterService; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.logging.annotation.LogMessageInfo; import org.glassfish.logging.annotation.LogMessagesResourceBundle; import org.glassfish.logging.annotation.LoggerInfo; import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; -import org.glassfish.hk2.api.ServiceLocator; - -import java.util.*; - -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.ee.cms.core.GroupManagementService; - -import java.util.LinkedList; -import java.util.List; -import org.glassfish.api.logging.LogLevel; -import java.util.logging.Logger; @Service(name = "_gms-announce-before-start-cluster-command") diff --git a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceBeforeStopClusterCommand.java b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceBeforeStopClusterCommand.java index 13ec4d77ddb..842637baf41 100644 --- a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceBeforeStopClusterCommand.java +++ b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceBeforeStopClusterCommand.java @@ -16,30 +16,35 @@ package org.glassfish.gms.admin; -import org.glassfish.gms.bootstrap.GMSAdapterService; -import org.glassfish.gms.bootstrap.GMSAdapter; -import com.sun.enterprise.config.serverbeans.*; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.ee.cms.core.GMSConstants; -import org.glassfish.api.ActionReport; -import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import com.sun.enterprise.ee.cms.core.GroupManagementService; + import jakarta.inject.Inject; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; +import java.util.logging.Logger; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.FailurePolicy; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.api.admin.Supplemental; +import org.glassfish.api.logging.LogLevel; +import org.glassfish.gms.bootstrap.GMSAdapter; +import org.glassfish.gms.bootstrap.GMSAdapterService; +import org.glassfish.hk2.api.PerLookup; import org.glassfish.logging.annotation.LogMessageInfo; import org.glassfish.logging.annotation.LogMessagesResourceBundle; import org.glassfish.logging.annotation.LoggerInfo; import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; - -import java.util.*; - -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.ee.cms.core.GroupManagementService; - -import java.util.LinkedList; -import java.util.List; -import org.glassfish.api.logging.LogLevel; -import java.util.logging.Logger; /** diff --git a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceSupplementalInfo.java b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceSupplementalInfo.java index 63458336e7b..000d60150ac 100644 --- a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceSupplementalInfo.java +++ b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceSupplementalInfo.java @@ -17,9 +17,11 @@ package org.glassfish.gms.admin; import com.sun.enterprise.ee.cms.core.GroupManagementService; -import org.glassfish.gms.bootstrap.GMSAdapter; + import java.util.List; +import org.glassfish.gms.bootstrap.GMSAdapter; + class GMSAnnounceSupplementalInfo { final public List clusterMembers; final public boolean gmsInitiated; diff --git a/nucleus/cluster/gms-bootstrap/src/main/java/org/glassfish/gms/bootstrap/GMSAdapter.java b/nucleus/cluster/gms-bootstrap/src/main/java/org/glassfish/gms/bootstrap/GMSAdapter.java index 247b56a36cc..51ab2379588 100644 --- a/nucleus/cluster/gms-bootstrap/src/main/java/org/glassfish/gms/bootstrap/GMSAdapter.java +++ b/nucleus/cluster/gms-bootstrap/src/main/java/org/glassfish/gms/bootstrap/GMSAdapter.java @@ -17,9 +17,10 @@ package org.glassfish.gms.bootstrap; +import com.sun.enterprise.ee.cms.core.CallBack; import com.sun.enterprise.ee.cms.core.GroupManagementService; + import org.jvnet.hk2.annotations.Contract; -import com.sun.enterprise.ee.cms.core.CallBack; /** *

      The register methods below replace GroupManagementService.addFactory methods. diff --git a/nucleus/cluster/gms-bootstrap/src/main/java/org/glassfish/gms/bootstrap/HealthHistory.java b/nucleus/cluster/gms-bootstrap/src/main/java/org/glassfish/gms/bootstrap/HealthHistory.java index 40b88b1cd47..5eec2510d9f 100644 --- a/nucleus/cluster/gms-bootstrap/src/main/java/org/glassfish/gms/bootstrap/HealthHistory.java +++ b/nucleus/cluster/gms-bootstrap/src/main/java/org/glassfish/gms/bootstrap/HealthHistory.java @@ -19,20 +19,30 @@ import com.sun.enterprise.config.serverbeans.Cluster; import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.config.serverbeans.ServerRef; -import com.sun.enterprise.ee.cms.core.*; +import com.sun.enterprise.ee.cms.core.FailureNotificationSignal; +import com.sun.enterprise.ee.cms.core.JoinNotificationSignal; +import com.sun.enterprise.ee.cms.core.JoinedAndReadyNotificationSignal; +import com.sun.enterprise.ee.cms.core.PlannedShutdownSignal; +import com.sun.enterprise.ee.cms.core.RejoinSubevent; +import com.sun.enterprise.ee.cms.core.Signal; import com.sun.enterprise.util.i18n.StringManager; -import org.glassfish.logging.annotation.LogMessageInfo; -import org.glassfish.logging.annotation.LogMessagesResourceBundle; -import org.glassfish.logging.annotation.LoggerInfo; -import org.jvnet.hk2.config.ConfigListener; -import org.jvnet.hk2.config.UnprocessedChangeEvents; import java.beans.PropertyChangeEvent; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.logging.Logger; + import org.glassfish.api.logging.LogLevel; +import org.glassfish.logging.annotation.LogMessageInfo; +import org.glassfish.logging.annotation.LogMessagesResourceBundle; +import org.glassfish.logging.annotation.LoggerInfo; +import org.jvnet.hk2.config.ConfigListener; +import org.jvnet.hk2.config.UnprocessedChangeEvents; /** * Used to hold cluster history. This information is backed by diff --git a/nucleus/cluster/ssh/src/main/java/org/glassfish/cluster/ssh/connect/NodeRunnerSsh.java b/nucleus/cluster/ssh/src/main/java/org/glassfish/cluster/ssh/connect/NodeRunnerSsh.java index 7f48b69f9d5..2b4e8b19c4c 100644 --- a/nucleus/cluster/ssh/src/main/java/org/glassfish/cluster/ssh/connect/NodeRunnerSsh.java +++ b/nucleus/cluster/ssh/src/main/java/org/glassfish/cluster/ssh/connect/NodeRunnerSsh.java @@ -16,23 +16,22 @@ package org.glassfish.cluster.ssh.connect; +import com.jcraft.jsch.JSchException; +import com.sun.enterprise.config.serverbeans.Node; +import com.sun.enterprise.util.StringUtils; +import com.sun.enterprise.util.SystemPropertyConstants; + +import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.util.List; import java.util.ArrayList; +import java.util.List; import java.util.logging.Logger; -import com.jcraft.jsch.JSchException; -import org.glassfish.common.util.admin.AsadminInput; import org.glassfish.api.admin.SSHCommandExecutionException; -import com.sun.enterprise.config.serverbeans.Node; -import com.sun.enterprise.util.SystemPropertyConstants; -import com.sun.enterprise.util.StringUtils; - import org.glassfish.cluster.ssh.launcher.SSHLauncher; +import org.glassfish.common.util.admin.AsadminInput; import org.glassfish.hk2.api.ServiceLocator; -import java.io.ByteArrayOutputStream; - public class NodeRunnerSsh { private ServiceLocator habitat; diff --git a/nucleus/cluster/ssh/src/main/java/org/glassfish/cluster/ssh/launcher/JavaSystemJschLogger.java b/nucleus/cluster/ssh/src/main/java/org/glassfish/cluster/ssh/launcher/JavaSystemJschLogger.java index eef5a5c80cc..75b14c11d4f 100644 --- a/nucleus/cluster/ssh/src/main/java/org/glassfish/cluster/ssh/launcher/JavaSystemJschLogger.java +++ b/nucleus/cluster/ssh/src/main/java/org/glassfish/cluster/ssh/launcher/JavaSystemJschLogger.java @@ -16,6 +16,7 @@ package org.glassfish.cluster.ssh.launcher; import com.jcraft.jsch.JSch; + import java.lang.System.Logger; import java.lang.System.Logger.Level; diff --git a/nucleus/cluster/ssh/src/main/java/org/glassfish/cluster/ssh/util/SSHUtil.java b/nucleus/cluster/ssh/src/main/java/org/glassfish/cluster/ssh/util/SSHUtil.java index 2facc3a0bea..35df2c71a17 100644 --- a/nucleus/cluster/ssh/src/main/java/org/glassfish/cluster/ssh/util/SSHUtil.java +++ b/nucleus/cluster/ssh/src/main/java/org/glassfish/cluster/ssh/util/SSHUtil.java @@ -18,16 +18,15 @@ package org.glassfish.cluster.ssh.util; import com.jcraft.jsch.Session; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import com.sun.enterprise.util.io.FileUtils; import java.io.File; import java.io.IOException; import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; -import com.sun.enterprise.util.io.FileUtils; import org.glassfish.api.admin.CommandException; /** From fb856d62e933bb333fa5d48da2cae6e9deaac870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sat, 10 Aug 2024 23:11:08 +0200 Subject: [PATCH 10/40] Imports: deployment modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../deployment/ConnectionDefDescriptor.java | 4 +- .../deployment/ConnectorConfigProperty.java | 3 +- .../EntityManagerReferenceDescriptor.java | 1 + .../deployment/PersistenceUnitDescriptor.java | 7 +- .../enterprise/deployment/RoleReference.java | 1 + .../com/sun/enterprise/deployment/Roles.java | 4 +- .../deployment/SecurityRoleDescriptor.java | 4 +- .../deployment/ServiceRefPortInfo.java | 6 +- .../deployment/WebComponentDescriptor.java | 3 +- .../deployment/WebServiceHandlerChain.java | 4 +- .../annotation/context/RarBundleContext.java | 4 +- ...dScheduledExecutorDefinitionConverter.java | 1 + .../handlers/ResourceAnnotationControl.java | 1 + ...ersistenceDependencyAnnotationScanner.java | 4 +- .../introspection/ConstantPoolInfo.java | 4 +- .../DefaultAnnotationScanner.java | 10 +-- .../EjbComponentAnnotationScanner.java | 4 +- .../ResourceAdapterAnnotationScanner.java | 4 +- .../deployment/archivist/ArchivistFor.java | 4 +- .../archivist/EARBasedPersistenceHelper.java | 4 +- .../archivist/ExtensionsArchivistFor.java | 4 +- .../io/AppClientDeploymentDescriptorFile.java | 3 +- .../ApplicationDeploymentDescriptorFile.java | 3 +- ...figurationDeploymentDescriptorFileFor.java | 4 +- .../io/ConnectorDeploymentDescriptorFile.java | 3 +- .../deployment/io/DescriptorList.java | 4 +- .../EntityManagerFactoryReferenceNode.java | 3 +- .../enterprise/deployment/node/IconNode.java | 7 +- .../node/JMSDestinationDefinitionNode.java | 6 +- .../node/LifecycleCallbackNode.java | 5 +- .../deployment/node/LocalizedNode.java | 10 +-- .../deployment/node/MailSessionNode.java | 3 +- .../node/MessageDestinationNode.java | 3 +- .../deployment/node/ModuleNode.java | 7 +- .../deployment/node/NameValuePairNode.java | 3 +- .../deployment/node/PermissionItemNode.java | 6 +- .../node/SaxParserHandlerFactory.java | 4 +- .../node/runtime/JavaWebStartAccessNode.java | 3 +- .../ServiceRefPortInfoRuntimeNode.java | 6 +- .../node/runtime/WebServiceRuntimeNode.java | 3 +- .../application/wls/ApplicationParamNode.java | 9 ++- .../common/DefaultResourcePrincipalNode.java | 3 +- .../common/wls/ResourceDescriptionNode.java | 5 +- .../runtime/connector/MapElementNode.java | 1 + .../deployment/node/ws/WLUnSupportedNode.java | 3 +- .../runtime/JavaWebStartAccessDescriptor.java | 1 + .../types/EntityManagerReference.java | 1 + .../deployment/util/AnnotationDetector.java | 17 +++-- .../deployment/util/ApplicationVisitor.java | 1 + .../deployment/util/ComponentPostVisitor.java | 2 +- .../util/ConnectorAnnotationDetector.java | 7 +- .../util/ConnectorTracerVisitor.java | 2 +- .../deployment/util/ConnectorValidator.java | 2 +- .../deployment/util/ConnectorVisitor.java | 1 + .../deployment/util/TracerVisitor.java | 1 + .../util/webservice/WsCompileInvoker.java | 4 +- .../deployment/EjbInterceptorTest.java | 4 +- .../deployment/GetContextRootCommand.java | 22 ++++-- .../full/deployment/EarClassLoader.java | 4 +- .../javaee/full/deployment/EarDeployer.java | 18 ++--- .../full/deployment/EarLibClassLoader.java | 4 +- .../javaee/full/deployment/EarSniffer.java | 8 +- .../deployment/admin/AddLibraryCommand.java | 39 +++++----- .../admin/CreateApplicationRefCommand.java | 76 ++++++++++--------- .../admin/CreateLifecycleModuleCommand.java | 35 ++++----- .../admin/DeleteApplicationRefCommand.java | 50 ++++++------ .../admin/DeleteLifecycleModuleCommand.java | 37 ++++----- .../admin/DeployCommandSupplementalInfo.java | 1 + .../deployment/admin/DeployDirCommand.java | 9 ++- .../admin/DeploymentCommandUtils.java | 22 +++--- .../deployment/admin/DisableCommand.java | 73 +++++++++--------- .../deployment/admin/EnableCommand.java | 65 ++++++++-------- .../GetApplicationLaunchURLsCommand.java | 26 +++---- .../admin/GetClientStubsCommand.java | 16 +++- .../GetDeploymentConfigurationsCommand.java | 8 +- .../admin/GetHostAndPortCommand.java | 29 +++---- .../deployment/admin/GetTargetsCommand.java | 11 +-- .../admin/InstanceDeployCommand.java | 46 +++++------ .../InstanceDeployCommandParameters.java | 1 + .../admin/InstanceLifecycleModuleCommand.java | 38 +++++----- ...nceValidateRemoteDirDeploymentCommand.java | 5 +- .../deployment/admin/InterceptorNotifier.java | 1 + .../admin/IsSnifferUserVisibleCommand.java | 11 +-- .../deployment/admin/ListAppRefsCommand.java | 28 +++---- .../admin/ListApplicationRefsCommand.java | 37 ++++----- .../admin/ListApplicationsCommand.java | 10 +-- .../admin/ListComponentsCommand.java | 45 ++++++----- .../admin/ListLibrariesCommand.java | 25 +++--- .../admin/ListLifecycleModulesCommand.java | 15 ++-- .../deployment/admin/MTDeployCommand.java | 22 +++--- .../deployment/admin/MTProvisionCommand.java | 42 +++++----- .../deployment/admin/MTUndeployCommand.java | 32 ++++---- .../admin/MTUnprovisionCommand.java | 38 +++++----- .../deployment/admin/PostDeployCommand.java | 16 ++-- .../deployment/admin/PostEnableCommand.java | 1 - .../deployment/admin/PostStateCommand.java | 9 ++- .../deployment/admin/PostUndeployCommand.java | 6 +- .../deployment/admin/ReDeployCommand.java | 36 ++++----- .../admin/RemoveLibraryCommand.java | 47 ++++++------ .../admin/ShowComponentStatusCommand.java | 30 ++++---- .../ValidateRemoteDirDeploymentCommand.java | 12 +-- .../autodeploy/AutoDeployService.java | 18 ++--- .../autodeploy/AutoDeployedFilesManager.java | 10 ++- .../autodeploy/AutoDeploymentOperation.java | 10 +-- .../deployment/autodeploy/AutoOperation.java | 11 +-- .../autodeploy/AutoUndeploymentOperation.java | 18 ++--- .../autodeploy/AutodeployRetryManager.java | 10 +-- .../deploy/shared/ArchiveFactory.java | 6 +- .../enterprise/deploy/shared/FileArchive.java | 1 + .../deploy/shared/InputJarArchive.java | 10 +-- .../deploy/shared/MultiReadableArchive.java | 10 ++- .../deployment/common/AnnotationScanner.java | 13 +++- .../common/ApplicationConfigInfo.java | 1 + .../common/ClassDependencyBuilder.java | 7 +- .../common/DeploymentProperties.java | 6 +- .../deployment/common/DeploymentUtils.java | 34 ++++----- .../deployment/common/DummyApplication.java | 2 +- .../deployment/common/ModuleExploder.java | 24 +++--- .../glassfish/deployment/common/NodeInfo.java | 14 +++- .../common/RootDeploymentDescriptor.java | 3 +- .../deployment/common/SimpleDeployer.java | 3 +- .../DeploymentLifecycleStatsProvider.java | 8 +- .../versioning/VersioningUtils.java | 1 + .../loader/util/ASClassLoaderUtil.java | 20 ++--- 124 files changed, 857 insertions(+), 720 deletions(-) diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ConnectionDefDescriptor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ConnectionDefDescriptor.java index 08b6d9be9a7..e98a73321c8 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ConnectionDefDescriptor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ConnectionDefDescriptor.java @@ -17,10 +17,10 @@ package com.sun.enterprise.deployment; -import org.glassfish.deployment.common.Descriptor; - import java.util.Set; +import org.glassfish.deployment.common.Descriptor; + /** * Deployment Information for connection-definition * diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ConnectorConfigProperty.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ConnectorConfigProperty.java index 9b489e26694..187c8f6c358 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ConnectorConfigProperty.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ConnectorConfigProperty.java @@ -18,11 +18,12 @@ package com.sun.enterprise.deployment; import com.sun.enterprise.deployment.util.DOLUtils; -import org.glassfish.internal.api.RelativePathResolver; import java.util.logging.Level; import java.util.logging.Logger; +import org.glassfish.internal.api.RelativePathResolver; + public class ConnectorConfigProperty extends EnvironmentProperty { private static final long serialVersionUID = 1L; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/EntityManagerReferenceDescriptor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/EntityManagerReferenceDescriptor.java index 61b1ba352fe..7794003357e 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/EntityManagerReferenceDescriptor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/EntityManagerReferenceDescriptor.java @@ -23,6 +23,7 @@ import jakarta.persistence.EntityManager; import jakarta.persistence.PersistenceContextType; import jakarta.persistence.SynchronizationType; + import java.util.HashMap; import java.util.Map; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/PersistenceUnitDescriptor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/PersistenceUnitDescriptor.java index e293c90d20b..3a2e9719b3a 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/PersistenceUnitDescriptor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/PersistenceUnitDescriptor.java @@ -17,16 +17,17 @@ package com.sun.enterprise.deployment; -import org.glassfish.api.naming.SimpleJndiName; -import org.glassfish.deployment.common.Descriptor; - import jakarta.persistence.SharedCacheMode; import jakarta.persistence.ValidationMode; + import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Properties; +import org.glassfish.api.naming.SimpleJndiName; +import org.glassfish.deployment.common.Descriptor; + /** * A persistence.xml file can contain one or more s * This class represents information about a . diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/RoleReference.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/RoleReference.java index 1a6eacfdd51..0791a442966 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/RoleReference.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/RoleReference.java @@ -19,6 +19,7 @@ import com.sun.enterprise.deployment.web.SecurityRole; import com.sun.enterprise.deployment.web.SecurityRoleReference; + import org.glassfish.security.common.Role; /** diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/Roles.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/Roles.java index afeab94376c..f5ad4acfe0f 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/Roles.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/Roles.java @@ -17,10 +17,10 @@ package com.sun.enterprise.deployment; -import org.glassfish.security.common.Role; - import java.util.Set; +import org.glassfish.security.common.Role; + /** * @author Danny Coward */ diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/SecurityRoleDescriptor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/SecurityRoleDescriptor.java index 033fc376673..92563f8539d 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/SecurityRoleDescriptor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/SecurityRoleDescriptor.java @@ -17,11 +17,11 @@ package com.sun.enterprise.deployment; +import com.sun.enterprise.deployment.web.SecurityRole; + import org.glassfish.deployment.common.Descriptor; import org.glassfish.security.common.Role; -import com.sun.enterprise.deployment.web.SecurityRole; - /** * I am an abstract role.. * diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ServiceRefPortInfo.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ServiceRefPortInfo.java index 7158c1e3907..608aa7b0981 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ServiceRefPortInfo.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ServiceRefPortInfo.java @@ -18,13 +18,15 @@ package com.sun.enterprise.deployment; import com.sun.enterprise.deployment.runtime.common.MessageSecurityBindingDescriptor; -import org.glassfish.deployment.common.Descriptor; -import javax.xml.namespace.QName; import java.util.HashSet; import java.util.LinkedList; import java.util.Set; +import javax.xml.namespace.QName; + +import org.glassfish.deployment.common.Descriptor; + /** * Information about a single WSDL port or port type in a service reference. * diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/WebComponentDescriptor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/WebComponentDescriptor.java index fabe014c382..ae2cc6b07ad 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/WebComponentDescriptor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/WebComponentDescriptor.java @@ -20,12 +20,13 @@ import com.sun.enterprise.deployment.web.InitializationParameter; import com.sun.enterprise.deployment.web.MultipartConfig; import com.sun.enterprise.deployment.web.SecurityRoleReference; -import org.glassfish.deployment.common.Descriptor; import java.lang.reflect.Method; import java.util.Enumeration; import java.util.Set; +import org.glassfish.deployment.common.Descriptor; + /** * Common data and behavior of the deployment diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/WebServiceHandlerChain.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/WebServiceHandlerChain.java index 988dd1eda5c..6e55c4babb9 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/WebServiceHandlerChain.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/WebServiceHandlerChain.java @@ -17,12 +17,12 @@ package com.sun.enterprise.deployment; -import org.glassfish.deployment.common.Descriptor; - import java.util.Iterator; import java.util.LinkedList; import java.util.List; +import org.glassfish.deployment.common.Descriptor; + /** * Represents a single handler-chains in a webservice in webservices.xml */ diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/context/RarBundleContext.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/context/RarBundleContext.java index 93d5d641c7d..7e4969a4196 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/context/RarBundleContext.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/context/RarBundleContext.java @@ -22,9 +22,9 @@ import java.lang.annotation.ElementType; import java.lang.reflect.AnnotatedElement; -import org.glassfish.apf.context.AnnotationContext; -import org.glassfish.apf.ProcessingContext; import org.glassfish.apf.AnnotationProcessorException; +import org.glassfish.apf.ProcessingContext; +import org.glassfish.apf.context.AnnotationContext; public class RarBundleContext extends AnnotationContext { diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ManagedScheduledExecutorDefinitionConverter.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ManagedScheduledExecutorDefinitionConverter.java index c23b29124c0..210a6c968a2 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ManagedScheduledExecutorDefinitionConverter.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ManagedScheduledExecutorDefinitionConverter.java @@ -18,6 +18,7 @@ import com.sun.enterprise.deployment.ManagedScheduledExecutorDefinitionDescriptor; import com.sun.enterprise.deployment.MetadataSource; + import jakarta.enterprise.concurrent.ManagedScheduledExecutorDefinition; import java.lang.System.Logger; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ResourceAnnotationControl.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ResourceAnnotationControl.java index 9b3fdec80ca..d13affddad3 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ResourceAnnotationControl.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ResourceAnnotationControl.java @@ -35,6 +35,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.Collection; + import org.glassfish.deployment.common.RootDeploymentDescriptor; import static java.lang.System.Logger.Level.DEBUG; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/AppClientPersistenceDependencyAnnotationScanner.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/AppClientPersistenceDependencyAnnotationScanner.java index 86e033e6fcc..e8450d43c7d 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/AppClientPersistenceDependencyAnnotationScanner.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/AppClientPersistenceDependencyAnnotationScanner.java @@ -16,10 +16,10 @@ package com.sun.enterprise.deployment.annotation.introspection; -import org.jvnet.hk2.annotations.Service; - import jakarta.inject.Singleton; +import org.jvnet.hk2.annotations.Service; + /** * Scans for annotations relevant to persistence units that indicate an app client depends on at least one persistence unit. * diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/ConstantPoolInfo.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/ConstantPoolInfo.java index 4c10850e968..b7874a73f2e 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/ConstantPoolInfo.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/ConstantPoolInfo.java @@ -26,11 +26,11 @@ package com.sun.enterprise.deployment.annotation.introspection; +import com.sun.enterprise.deployment.util.DOLUtils; + import java.io.IOException; import java.nio.ByteBuffer; -import com.sun.enterprise.deployment.util.DOLUtils; - /** * * @author dochez diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/DefaultAnnotationScanner.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/DefaultAnnotationScanner.java index 4f7c769c167..1907b4df2fe 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/DefaultAnnotationScanner.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/DefaultAnnotationScanner.java @@ -16,16 +16,16 @@ package com.sun.enterprise.deployment.annotation.introspection; -import java.util.Set; - -import org.glassfish.hk2.api.PostConstruct; -import org.jvnet.hk2.annotations.Service; - import com.sun.enterprise.deployment.annotation.factory.SJSASFactory; import jakarta.inject.Inject; import jakarta.inject.Singleton; +import java.util.Set; + +import org.glassfish.hk2.api.PostConstruct; +import org.jvnet.hk2.annotations.Service; + /** * This class contains the list of all annotations types name which can be present at the class level (Type.TYPE). * diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/EjbComponentAnnotationScanner.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/EjbComponentAnnotationScanner.java index da082103c1f..54ab5825bf9 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/EjbComponentAnnotationScanner.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/EjbComponentAnnotationScanner.java @@ -16,13 +16,13 @@ package com.sun.enterprise.deployment.annotation.introspection; +import jakarta.inject.Singleton; + import java.util.HashSet; import java.util.Set; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Singleton; - /** * This class contains the following annotation type: jakarta.ejb.Stateless jakarta.ejb.Stateful jakarta.ejb.MessageDriven * diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/ResourceAdapterAnnotationScanner.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/ResourceAdapterAnnotationScanner.java index 63950bb086c..7c161bfb7d3 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/ResourceAdapterAnnotationScanner.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/ResourceAdapterAnnotationScanner.java @@ -16,13 +16,13 @@ package com.sun.enterprise.deployment.annotation.introspection; +import jakarta.inject.Singleton; + import java.util.HashSet; import java.util.Set; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Singleton; - @Service(name = "rar") @Singleton public class ResourceAdapterAnnotationScanner implements AnnotationScanner { diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ArchivistFor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ArchivistFor.java index 74d85f18bfe..75289b2d6a4 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ArchivistFor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ArchivistFor.java @@ -16,12 +16,12 @@ package com.sun.enterprise.deployment.archivist; +import jakarta.inject.Qualifier; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import jakarta.inject.Qualifier; - import org.glassfish.hk2.api.Metadata; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/EARBasedPersistenceHelper.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/EARBasedPersistenceHelper.java index 2caae7e36db..17a82de84e4 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/EARBasedPersistenceHelper.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/EARBasedPersistenceHelper.java @@ -19,10 +19,12 @@ import com.sun.enterprise.deployment.Application; import com.sun.enterprise.deployment.BundleDescriptor; import com.sun.enterprise.deployment.archivist.PersistenceArchivist.SubArchivePURootScanner; -import org.glassfish.deployment.common.ModuleDescriptor; + import java.util.Map; import java.util.Set; + import org.glassfish.api.deployment.archive.ReadableArchive; +import org.glassfish.deployment.common.ModuleDescriptor; /** * Common logic supporting persistence archivists that deal with EARs. diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ExtensionsArchivistFor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ExtensionsArchivistFor.java index 0dcef78aae2..b0c44404bf4 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ExtensionsArchivistFor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/ExtensionsArchivistFor.java @@ -16,12 +16,12 @@ package com.sun.enterprise.deployment.archivist; +import jakarta.inject.Qualifier; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import jakarta.inject.Qualifier; - import org.glassfish.hk2.api.Metadata; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/AppClientDeploymentDescriptorFile.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/AppClientDeploymentDescriptorFile.java index 742a8c19523..af00fa65431 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/AppClientDeploymentDescriptorFile.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/AppClientDeploymentDescriptorFile.java @@ -16,10 +16,11 @@ package com.sun.enterprise.deployment.io; -import org.glassfish.deployment.common.Descriptor; import com.sun.enterprise.deployment.node.RootXMLNode; import com.sun.enterprise.deployment.node.appclient.AppClientNode; +import org.glassfish.deployment.common.Descriptor; + /** * This class is responsible for handling appclient DeploymentDescriptor files diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/ApplicationDeploymentDescriptorFile.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/ApplicationDeploymentDescriptorFile.java index 358994e5cc0..d03928eb374 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/ApplicationDeploymentDescriptorFile.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/ApplicationDeploymentDescriptorFile.java @@ -16,10 +16,11 @@ package com.sun.enterprise.deployment.io; -import org.glassfish.deployment.common.Descriptor; import com.sun.enterprise.deployment.node.ApplicationNode; import com.sun.enterprise.deployment.node.RootXMLNode; +import org.glassfish.deployment.common.Descriptor; + /** * This class is responsible for handling J2EE applications * DeploymentDescriptor files diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/ConfigurationDeploymentDescriptorFileFor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/ConfigurationDeploymentDescriptorFileFor.java index 20419b35e72..d00f5a9c080 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/ConfigurationDeploymentDescriptorFileFor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/ConfigurationDeploymentDescriptorFileFor.java @@ -16,13 +16,13 @@ package com.sun.enterprise.deployment.io; -import org.glassfish.hk2.api.Metadata; +import jakarta.inject.Qualifier; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import jakarta.inject.Qualifier; +import org.glassfish.hk2.api.Metadata; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/ConnectorDeploymentDescriptorFile.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/ConnectorDeploymentDescriptorFile.java index d1b6d837d42..90fbbc3ac34 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/ConnectorDeploymentDescriptorFile.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/ConnectorDeploymentDescriptorFile.java @@ -16,10 +16,11 @@ package com.sun.enterprise.deployment.io; -import org.glassfish.deployment.common.Descriptor; import com.sun.enterprise.deployment.node.RootXMLNode; import com.sun.enterprise.deployment.node.connector.ConnectorNode; +import org.glassfish.deployment.common.Descriptor; + /** * This class is responsible for handling JCA DeploymentDescriptor files diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/DescriptorList.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/DescriptorList.java index d61446cfc94..cbc2a7c7f17 100755 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/DescriptorList.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/io/DescriptorList.java @@ -16,10 +16,10 @@ package com.sun.enterprise.deployment.io; -import org.glassfish.api.deployment.archive.ArchiveType; - import com.sun.enterprise.deployment.util.DOLUtils; +import org.glassfish.api.deployment.archive.ArchiveType; + /** * Repository of descriptors * This class will evolve to provide a comprhensive list of diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/EntityManagerFactoryReferenceNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/EntityManagerFactoryReferenceNode.java index 72959636a0e..6d7ce95cffe 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/EntityManagerFactoryReferenceNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/EntityManagerFactoryReferenceNode.java @@ -19,10 +19,11 @@ import com.sun.enterprise.deployment.EntityManagerFactoryReferenceDescriptor; import com.sun.enterprise.deployment.InjectionTarget; import com.sun.enterprise.deployment.xml.TagNames; -import org.w3c.dom.Node; import java.util.Map; +import org.w3c.dom.Node; + /** * This node handles all persistence-unit-ref xml tag elements * diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/IconNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/IconNode.java index c787dea0dfd..f12e9bab8f0 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/IconNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/IconNode.java @@ -17,16 +17,17 @@ package com.sun.enterprise.deployment.node; -import org.glassfish.deployment.common.Descriptor; import com.sun.enterprise.deployment.xml.TagNames; -import org.w3c.dom.Element; -import org.w3c.dom.Node; import java.util.Locale; import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import org.glassfish.deployment.common.Descriptor; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + /** * * @author dochez diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/JMSDestinationDefinitionNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/JMSDestinationDefinitionNode.java index 030d9a7d944..9396a578f26 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/JMSDestinationDefinitionNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/JMSDestinationDefinitionNode.java @@ -21,12 +21,12 @@ import com.sun.enterprise.deployment.util.DOLUtils; import com.sun.enterprise.deployment.xml.TagNames; -import org.glassfish.logging.annotation.LogMessageInfo; -import org.w3c.dom.Node; - import java.util.Map; import java.util.logging.Level; +import org.glassfish.logging.annotation.LogMessageInfo; +import org.w3c.dom.Node; + public class JMSDestinationDefinitionNode extends DeploymentDescriptorNode { @LogMessageInfo( diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/LifecycleCallbackNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/LifecycleCallbackNode.java index cd419e0d1bf..e144a19296f 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/LifecycleCallbackNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/LifecycleCallbackNode.java @@ -16,12 +16,13 @@ package com.sun.enterprise.deployment.node; -import java.util.Map; - import com.sun.enterprise.deployment.EjbDescriptor; import com.sun.enterprise.deployment.EjbInterceptor; import com.sun.enterprise.deployment.LifecycleCallbackDescriptor; import com.sun.enterprise.deployment.xml.TagNames; + +import java.util.Map; + 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/LocalizedNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/LocalizedNode.java index 011f39226c2..3f6cf2f450b 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/LocalizedNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/LocalizedNode.java @@ -19,16 +19,16 @@ import com.sun.enterprise.deployment.xml.TagNames; -import org.glassfish.deployment.common.Descriptor; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.xml.sax.Attributes; - import java.util.Locale; import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import org.glassfish.deployment.common.Descriptor; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.xml.sax.Attributes; + /** * This class is responsible for handling the xml lang attribute of an xml element * diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/MailSessionNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/MailSessionNode.java index f768822e801..6b0be238009 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/MailSessionNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/MailSessionNode.java @@ -19,10 +19,11 @@ import com.sun.enterprise.deployment.MailSessionDescriptor; import com.sun.enterprise.deployment.xml.TagNames; -import org.w3c.dom.Node; import java.util.Map; +import org.w3c.dom.Node; + /** * @author naman mehta */ diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/MessageDestinationNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/MessageDestinationNode.java index dc6c381ede1..4951fd4dace 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/MessageDestinationNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/MessageDestinationNode.java @@ -19,10 +19,11 @@ import com.sun.enterprise.deployment.MessageDestinationDescriptor; import com.sun.enterprise.deployment.xml.TagNames; -import org.w3c.dom.Node; import java.util.Map; +import org.w3c.dom.Node; + /** * This class handles all information related to the message-destination xml tag * diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ModuleNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ModuleNode.java index 4f28d5434a8..6d663164a83 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ModuleNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ModuleNode.java @@ -17,14 +17,15 @@ package com.sun.enterprise.deployment.node; -import org.glassfish.deployment.common.ModuleDescriptor; -import com.sun.enterprise.deployment.xml.ApplicationTagNames; import com.sun.enterprise.deployment.util.DOLUtils; -import org.w3c.dom.Node; +import com.sun.enterprise.deployment.xml.ApplicationTagNames; import java.util.Map; import java.util.Objects; +import org.glassfish.deployment.common.ModuleDescriptor; +import org.w3c.dom.Node; + /** * This node is responsible for handling the module xml fragment from application.xml files * diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/NameValuePairNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/NameValuePairNode.java index dff4416f60b..6dea4c45d33 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/NameValuePairNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/NameValuePairNode.java @@ -19,11 +19,12 @@ import com.sun.enterprise.deployment.NameValuePairDescriptor; import com.sun.enterprise.deployment.xml.TagNames; -import org.w3c.dom.Node; import java.util.Iterator; import java.util.Map; +import org.w3c.dom.Node; + /** * This class handles a name-value property * diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/PermissionItemNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/PermissionItemNode.java index fbbcd32ecaa..cace5fa17ac 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/PermissionItemNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/PermissionItemNode.java @@ -16,12 +16,12 @@ package com.sun.enterprise.deployment.node; +import com.sun.enterprise.deployment.PermissionItemDescriptor; +import com.sun.enterprise.deployment.xml.DeclaredPermissionsTagNames; + import java.util.HashMap; import java.util.Map; -import com.sun.enterprise.deployment.xml.DeclaredPermissionsTagNames; -import com.sun.enterprise.deployment.PermissionItemDescriptor; - public class PermissionItemNode extends DeploymentDescriptorNode { diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/SaxParserHandlerFactory.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/SaxParserHandlerFactory.java index 94f943bed1f..cc3714b1a05 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/SaxParserHandlerFactory.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/SaxParserHandlerFactory.java @@ -16,13 +16,13 @@ package com.sun.enterprise.deployment.node; -import static com.sun.enterprise.util.SystemPropertyConstants.INSTALL_ROOT_PROPERTY; - import java.io.File; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.api.Globals; +import static com.sun.enterprise.util.SystemPropertyConstants.INSTALL_ROOT_PROPERTY; + /** *Provides the appropriate implementation depending on the current *runtime environment. diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/JavaWebStartAccessNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/JavaWebStartAccessNode.java index 1017fe23c5f..21116820a3a 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/JavaWebStartAccessNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/JavaWebStartAccessNode.java @@ -22,10 +22,11 @@ import com.sun.enterprise.deployment.node.XMLNode; import com.sun.enterprise.deployment.runtime.JavaWebStartAccessDescriptor; import com.sun.enterprise.deployment.xml.RuntimeTagNames; -import org.w3c.dom.Node; import java.util.Map; +import org.w3c.dom.Node; + /** * @author tjquinn */ diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/ServiceRefPortInfoRuntimeNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/ServiceRefPortInfoRuntimeNode.java index de21a361d6d..968f6703e6e 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/ServiceRefPortInfoRuntimeNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/ServiceRefPortInfoRuntimeNode.java @@ -24,13 +24,15 @@ import com.sun.enterprise.deployment.node.runtime.common.MessageSecurityBindingNode; import com.sun.enterprise.deployment.runtime.common.MessageSecurityBindingDescriptor; import com.sun.enterprise.deployment.xml.WebServicesTagNames; -import org.w3c.dom.Node; -import javax.xml.namespace.QName; import java.util.Iterator; import java.util.Map; import java.util.Set; +import javax.xml.namespace.QName; + +import org.w3c.dom.Node; + /** * This node is responsible for handling runtime info for * a service reference wsdl port. diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/WebServiceRuntimeNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/WebServiceRuntimeNode.java index 33fe339895d..f641f44b7bd 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/WebServiceRuntimeNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/WebServiceRuntimeNode.java @@ -24,13 +24,14 @@ import com.sun.enterprise.deployment.node.XMLElement; import com.sun.enterprise.deployment.util.DOLUtils; import com.sun.enterprise.deployment.xml.WebServicesTagNames; -import org.w3c.dom.Node; import java.net.MalformedURLException; import java.net.URL; import java.util.logging.Level; import java.util.logging.Logger; +import org.w3c.dom.Node; + /** * This node is responsible for handling WebService runtime info * diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/application/wls/ApplicationParamNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/application/wls/ApplicationParamNode.java index a547f5b833d..cb30196fca1 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/application/wls/ApplicationParamNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/application/wls/ApplicationParamNode.java @@ -16,17 +16,18 @@ package com.sun.enterprise.deployment.node.runtime.application.wls; -import org.glassfish.deployment.common.Descriptor; -import com.sun.enterprise.deployment.EnvironmentProperty; import com.sun.enterprise.deployment.Application; -import com.sun.enterprise.deployment.runtime.application.wls.ApplicationParam; +import com.sun.enterprise.deployment.EnvironmentProperty; import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; +import com.sun.enterprise.deployment.runtime.application.wls.ApplicationParam; import com.sun.enterprise.deployment.xml.RuntimeTagNames; -import org.w3c.dom.Node; import java.util.Map; import java.util.Set; +import org.glassfish.deployment.common.Descriptor; +import org.w3c.dom.Node; + /** * This node is responsible for handling application-param. * diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/common/DefaultResourcePrincipalNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/common/DefaultResourcePrincipalNode.java index a304aef42e9..4492185943e 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/common/DefaultResourcePrincipalNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/common/DefaultResourcePrincipalNode.java @@ -20,10 +20,11 @@ import com.sun.enterprise.deployment.node.runtime.RuntimeDescriptorNode; import com.sun.enterprise.deployment.runtime.common.DefaultResourcePrincipal; import com.sun.enterprise.deployment.xml.RuntimeTagNames; -import org.w3c.dom.Node; import java.util.Map; +import org.w3c.dom.Node; + /** * This node handles all the role mapping information * diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/common/wls/ResourceDescriptionNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/common/wls/ResourceDescriptionNode.java index 002d9892242..0a5a4ed4c99 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/common/wls/ResourceDescriptionNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/common/wls/ResourceDescriptionNode.java @@ -24,12 +24,13 @@ import com.sun.enterprise.deployment.util.DOLUtils; import com.sun.enterprise.deployment.xml.RuntimeTagNames; import com.sun.enterprise.deployment.xml.TagNames; -import org.glassfish.deployment.common.Descriptor; -import org.w3c.dom.Node; import java.util.Map; import java.util.Set; +import org.glassfish.deployment.common.Descriptor; +import org.w3c.dom.Node; + /** * This node handles resource-description in weblogic.xml * diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/connector/MapElementNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/connector/MapElementNode.java index 59c9f73b86c..20360746064 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/connector/MapElementNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/runtime/connector/MapElementNode.java @@ -21,6 +21,7 @@ import com.sun.enterprise.deployment.runtime.connector.MapElement; import com.sun.enterprise.deployment.runtime.connector.Principal; import com.sun.enterprise.deployment.xml.RuntimeTagNames; + import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ws/WLUnSupportedNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ws/WLUnSupportedNode.java index f40a2d6a7dd..9ea30b90410 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ws/WLUnSupportedNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/ws/WLUnSupportedNode.java @@ -17,10 +17,11 @@ package com.sun.enterprise.deployment.node.ws; -import org.glassfish.deployment.common.Descriptor; import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; import com.sun.enterprise.deployment.node.XMLElement; import com.sun.enterprise.deployment.util.DOLUtils; + +import org.glassfish.deployment.common.Descriptor; import org.w3c.dom.Node; /** diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/runtime/JavaWebStartAccessDescriptor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/runtime/JavaWebStartAccessDescriptor.java index f6fbe8d39ff..0dd283556a8 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/runtime/JavaWebStartAccessDescriptor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/runtime/JavaWebStartAccessDescriptor.java @@ -17,6 +17,7 @@ package com.sun.enterprise.deployment.runtime; import com.sun.enterprise.deployment.BundleDescriptor; + import org.glassfish.deployment.common.Descriptor; /** diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/types/EntityManagerReference.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/types/EntityManagerReference.java index af80ca39f71..92990e5fddc 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/types/EntityManagerReference.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/types/EntityManagerReference.java @@ -21,6 +21,7 @@ import jakarta.persistence.PersistenceContextType; import jakarta.persistence.SynchronizationType; + import java.util.Map; /** diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/AnnotationDetector.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/AnnotationDetector.java index 31babda1060..da28f7708d1 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/AnnotationDetector.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/AnnotationDetector.java @@ -19,20 +19,25 @@ import com.sun.enterprise.deployment.annotation.introspection.AnnotationScanner; import com.sun.enterprise.deployment.annotation.introspection.ClassFile; import com.sun.enterprise.deployment.annotation.introspection.ConstantPoolInfo; -import org.glassfish.api.deployment.archive.ReadableArchive; -import org.glassfish.hk2.classmodel.reflect.*; import java.io.IOException; import java.io.InputStream; +import java.net.URI; import java.nio.channels.Channels; import java.nio.channels.ReadableByteChannel; -import java.util.Enumeration; +import java.util.ArrayList; import java.util.Collection; -import java.util.Set; +import java.util.Enumeration; import java.util.List; -import java.util.ArrayList; +import java.util.Set; import java.util.logging.Level; -import java.net.URI; + +import org.glassfish.api.deployment.archive.ReadableArchive; +import org.glassfish.hk2.classmodel.reflect.AnnotatedElement; +import org.glassfish.hk2.classmodel.reflect.AnnotationType; +import org.glassfish.hk2.classmodel.reflect.Member; +import org.glassfish.hk2.classmodel.reflect.Type; +import org.glassfish.hk2.classmodel.reflect.Types; /** * Abstract superclass for specific types of annotation detectors. diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ApplicationVisitor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ApplicationVisitor.java index 374f2b29070..dd031dc66cf 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ApplicationVisitor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ApplicationVisitor.java @@ -18,6 +18,7 @@ import com.sun.enterprise.deployment.Application; + import org.jvnet.hk2.annotations.Contract; /** diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ComponentPostVisitor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ComponentPostVisitor.java index 86831ef9040..ce198cc6832 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ComponentPostVisitor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ComponentPostVisitor.java @@ -16,8 +16,8 @@ package com.sun.enterprise.deployment.util; -import org.jvnet.hk2.annotations.Contract; import org.glassfish.api.deployment.archive.ReadableArchive; +import org.jvnet.hk2.annotations.Contract; /** * This class does the necessary post processing for J2EE Component DOL diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ConnectorAnnotationDetector.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ConnectorAnnotationDetector.java index a8ab5d4dc78..c684b3928f3 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ConnectorAnnotationDetector.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ConnectorAnnotationDetector.java @@ -17,14 +17,15 @@ package com.sun.enterprise.deployment.util; import com.sun.enterprise.deployment.annotation.introspection.AnnotationScanner; -import org.glassfish.api.deployment.archive.ReadableArchive; -import java.io.IOException; import java.io.File; import java.io.FileFilter; +import java.io.IOException; import java.util.Enumeration; -import java.util.jar.JarFile; import java.util.jar.JarEntry; +import java.util.jar.JarFile; + +import org.glassfish.api.deployment.archive.ReadableArchive; /** * Subclass for connector annotation detection. diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ConnectorTracerVisitor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ConnectorTracerVisitor.java index 2b72c670de5..b3c8c417799 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ConnectorTracerVisitor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ConnectorTracerVisitor.java @@ -16,8 +16,8 @@ package com.sun.enterprise.deployment.util; -import com.sun.enterprise.deployment.ConnectorDescriptor; import com.sun.enterprise.deployment.BundleDescriptor; +import com.sun.enterprise.deployment.ConnectorDescriptor; public class ConnectorTracerVisitor extends DefaultDOLVisitor implements ConnectorVisitor { diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ConnectorValidator.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ConnectorValidator.java index b85ab689b79..ea6b1751160 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ConnectorValidator.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ConnectorValidator.java @@ -16,8 +16,8 @@ package com.sun.enterprise.deployment.util; -import com.sun.enterprise.deployment.ConnectorDescriptor; import com.sun.enterprise.deployment.BundleDescriptor; +import com.sun.enterprise.deployment.ConnectorDescriptor; /** * This class validates a connector descriptor diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ConnectorVisitor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ConnectorVisitor.java index 5da4acced03..42ff558a20d 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ConnectorVisitor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/ConnectorVisitor.java @@ -22,6 +22,7 @@ package com.sun.enterprise.deployment.util; import com.sun.enterprise.deployment.ConnectorDescriptor; + import org.jvnet.hk2.annotations.Contract; /** diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/TracerVisitor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/TracerVisitor.java index a9c15e478ec..470b8910e14 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/TracerVisitor.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/TracerVisitor.java @@ -23,6 +23,7 @@ import com.sun.enterprise.deployment.WebService; import com.sun.enterprise.deployment.types.EjbReference; import com.sun.enterprise.deployment.types.MessageDestinationReferencer; + import org.glassfish.deployment.common.Descriptor; import org.glassfish.deployment.common.DescriptorVisitor; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/webservice/WsCompileInvoker.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/webservice/WsCompileInvoker.java index d9d13cacc7b..30b82c03032 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/webservice/WsCompileInvoker.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/util/webservice/WsCompileInvoker.java @@ -16,11 +16,11 @@ package com.sun.enterprise.deployment.util.webservice; -import org.jvnet.hk2.annotations.Contract; - import java.io.IOException; import java.util.HashMap; +import org.jvnet.hk2.annotations.Contract; + /** * This interface is used by the deploytool to generate webservice artifacts. * A client is expected to set the options and features using the add* methods before calling the generate* method diff --git a/appserver/deployment/dol/src/test/java/com/sun/enterprise/deployment/EjbInterceptorTest.java b/appserver/deployment/dol/src/test/java/com/sun/enterprise/deployment/EjbInterceptorTest.java index 5c0d86d24b2..701167a20c5 100644 --- a/appserver/deployment/dol/src/test/java/com/sun/enterprise/deployment/EjbInterceptorTest.java +++ b/appserver/deployment/dol/src/test/java/com/sun/enterprise/deployment/EjbInterceptorTest.java @@ -17,11 +17,11 @@ package com.sun.enterprise.deployment; +import jakarta.enterprise.inject.spi.Interceptor; + import org.easymock.EasyMockSupport; import org.junit.jupiter.api.Test; -import jakarta.enterprise.inject.spi.Interceptor; - import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; diff --git a/appserver/deployment/jakartaee-core/src/main/java/org/glassfish/javaee/core/deployment/GetContextRootCommand.java b/appserver/deployment/jakartaee-core/src/main/java/org/glassfish/javaee/core/deployment/GetContextRootCommand.java index ac49bba18d2..18aef2187c0 100644 --- a/appserver/deployment/jakartaee-core/src/main/java/org/glassfish/javaee/core/deployment/GetContextRootCommand.java +++ b/appserver/deployment/jakartaee-core/src/main/java/org/glassfish/javaee/core/deployment/GetContextRootCommand.java @@ -16,19 +16,27 @@ package org.glassfish.javaee.core.deployment; -import org.glassfish.api.Param; -import org.glassfish.internal.data.ApplicationInfo; -import org.glassfish.internal.data.ApplicationRegistry; import com.sun.enterprise.deployment.Application; import com.sun.enterprise.deployment.BundleDescriptor; -import org.glassfish.deployment.common.DeploymentProperties; import com.sun.enterprise.deployment.WebBundleDescriptor; -import org.glassfish.api.ActionReport; -import org.glassfish.api.admin.*; + import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; +import org.glassfish.api.ActionReport; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.deployment.common.DeploymentProperties; import org.glassfish.hk2.api.PerLookup; +import org.glassfish.internal.data.ApplicationInfo; +import org.glassfish.internal.data.ApplicationRegistry; +import org.jvnet.hk2.annotations.Service; /** diff --git a/appserver/deployment/jakartaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarClassLoader.java b/appserver/deployment/jakartaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarClassLoader.java index 4487701a697..0b3041aa2b4 100644 --- a/appserver/deployment/jakartaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarClassLoader.java +++ b/appserver/deployment/jakartaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarClassLoader.java @@ -17,14 +17,14 @@ package org.glassfish.javaee.full.deployment; +import com.sun.enterprise.loader.ASURLClassLoader; + import java.util.LinkedList; import java.util.List; import org.glassfish.hk2.api.PreDestroy; import org.glassfish.internal.api.DelegatingClassLoader; -import com.sun.enterprise.loader.ASURLClassLoader; - /** * Simplistic class loader which will delegate to each module class loader in the order they were added to the instance * diff --git a/appserver/deployment/jakartaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarDeployer.java b/appserver/deployment/jakartaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarDeployer.java index f3cf8b8111a..ef63be33363 100644 --- a/appserver/deployment/jakartaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarDeployer.java +++ b/appserver/deployment/jakartaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarDeployer.java @@ -17,6 +17,15 @@ package org.glassfish.javaee.full.deployment; +import com.sun.enterprise.deploy.shared.ArchiveFactory; +import com.sun.enterprise.deployment.Application; +import com.sun.enterprise.deployment.BundleDescriptor; +import com.sun.enterprise.deployment.deploy.shared.Util; +import com.sun.enterprise.deployment.util.DOLUtils; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + import java.io.File; import java.io.IOException; import java.util.Collection; @@ -61,15 +70,6 @@ import org.glassfish.logging.annotation.LoggerInfo; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.deploy.shared.ArchiveFactory; -import com.sun.enterprise.deployment.Application; -import com.sun.enterprise.deployment.BundleDescriptor; -import com.sun.enterprise.deployment.deploy.shared.Util; -import com.sun.enterprise.deployment.util.DOLUtils; -import com.sun.enterprise.util.LocalStringManagerImpl; - -import jakarta.inject.Inject; - /** * EarDeployer to deploy composite Jakarta EE applications. * diff --git a/appserver/deployment/jakartaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarLibClassLoader.java b/appserver/deployment/jakartaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarLibClassLoader.java index 1a3cde4ee68..9a192ebef63 100644 --- a/appserver/deployment/jakartaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarLibClassLoader.java +++ b/appserver/deployment/jakartaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarLibClassLoader.java @@ -17,10 +17,10 @@ package org.glassfish.javaee.full.deployment; -import java.net.URL; - import com.sun.enterprise.loader.ASURLClassLoader; +import java.net.URL; + /** * Classloader that is responsible to load the ear libraries (lib/*.jar etc) */ diff --git a/appserver/deployment/jakartaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarSniffer.java b/appserver/deployment/jakartaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarSniffer.java index cba287cb6fd..dafb0b385a7 100644 --- a/appserver/deployment/jakartaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarSniffer.java +++ b/appserver/deployment/jakartaee-full/src/main/java/org/glassfish/javaee/full/deployment/EarSniffer.java @@ -17,7 +17,9 @@ package org.glassfish.javaee.full.deployment; -import static org.glassfish.deployment.common.DeploymentUtils.isArchiveOfType; +import com.sun.enterprise.deployment.EarType; + +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.List; @@ -30,9 +32,7 @@ import org.glassfish.internal.deployment.GenericSniffer; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.deployment.EarType; - -import jakarta.inject.Inject; +import static org.glassfish.deployment.common.DeploymentUtils.isArchiveOfType; /** * Ear sniffers snifs ear files. diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/AddLibraryCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/AddLibraryCommand.java index 33dc0da284d..f787fd6c3b5 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/AddLibraryCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/AddLibraryCommand.java @@ -16,34 +16,35 @@ package org.glassfish.deployment.admin; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.v3.server.DomainXmlPersistence; + +import jakarta.inject.Inject; + +import java.beans.PropertyChangeEvent; +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AccessRequired; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandLock; -import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.api.admin.RestEndpoints; -import org.glassfish.api.admin.RestEndpoint; -import org.glassfish.api.Param; import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.hk2.api.PerLookup; import org.glassfish.internal.config.UnprocessedConfigListener; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.UnprocessedChangeEvent; import org.jvnet.hk2.config.UnprocessedChangeEvents; -import org.jvnet.hk2.annotations.Service; - -import org.glassfish.hk2.api.PerLookup; -import jakarta.inject.Inject; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.v3.server.DomainXmlPersistence; - -import java.util.logging.Logger; -import java.util.logging.Level; -import java.util.List; -import java.util.ArrayList; -import java.io.File; -import java.beans.PropertyChangeEvent; -import org.glassfish.api.admin.AccessRequired; @Service(name="add-library") @PerLookup diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/CreateApplicationRefCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/CreateApplicationRefCommand.java index fc8e622ca84..d8278ea7827 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/CreateApplicationRefCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/CreateApplicationRefCommand.java @@ -18,64 +18,70 @@ package org.glassfish.deployment.admin; import com.sun.enterprise.admin.util.ClusterOperationUtil; -import com.sun.enterprise.config.serverbeans.*; -import java.util.Collection; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.Param; -import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.api.admin.ExecuteOn; -import org.glassfish.api.admin.RuntimeType; -import org.glassfish.api.event.Events; -import org.glassfish.api.event.EventListener.Event; -import org.glassfish.api.deployment.archive.ReadableArchive; -import org.glassfish.api.deployment.DeployCommandParameters; -import org.glassfish.api.deployment.OpsParams.Origin; -import org.glassfish.api.deployment.OpsParams.Command; -import org.glassfish.config.support.TargetType; -import org.glassfish.config.support.CommandTarget; -import org.glassfish.deployment.common.DeploymentUtils; -import org.glassfish.deployment.common.DeploymentContextImpl; -import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.config.serverbeans.Application; +import com.sun.enterprise.config.serverbeans.ApplicationRef; +import com.sun.enterprise.config.serverbeans.Applications; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.config.serverbeans.ServerTags; import com.sun.enterprise.deploy.shared.ArchiveFactory; -import org.glassfish.api.ActionReport; -import org.glassfish.api.I18n; -import org.glassfish.internal.deployment.Deployment; -import org.glassfish.internal.deployment.ExtendedDeploymentContext; +import com.sun.enterprise.util.LocalStringManagerImpl; + import jakarta.inject.Inject; import jakarta.inject.Named; -import org.jvnet.hk2.annotations.Service; - -import org.glassfish.hk2.api.PerLookup; -import org.glassfish.hk2.api.ServiceLocator; -import org.jvnet.hk2.config.TransactionFailure; -import org.jvnet.hk2.config.Transaction; - -import java.util.Properties; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.Map; import java.io.File; import java.io.IOException; import java.net.URI; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.Iterator; import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.I18n; +import org.glassfish.api.Param; import org.glassfish.api.admin.AccessRequired.AccessCheck; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.AdminCommandSecurity; +import org.glassfish.api.admin.ExecuteOn; import org.glassfish.api.admin.FailurePolicy; import org.glassfish.api.admin.ParameterMap; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.api.deployment.DeployCommandParameters; +import org.glassfish.api.deployment.OpsParams.Command; +import org.glassfish.api.deployment.OpsParams.Origin; +import org.glassfish.api.deployment.archive.ReadableArchive; +import org.glassfish.api.event.EventListener.Event; +import org.glassfish.api.event.Events; +import org.glassfish.config.support.CommandTarget; +import org.glassfish.config.support.TargetType; import org.glassfish.deployment.common.ApplicationConfigInfo; +import org.glassfish.deployment.common.DeploymentContextImpl; import org.glassfish.deployment.common.DeploymentProperties; +import org.glassfish.deployment.common.DeploymentUtils; import org.glassfish.deployment.versioning.VersioningException; +import org.glassfish.deployment.versioning.VersioningService; import org.glassfish.deployment.versioning.VersioningSyntaxException; import org.glassfish.deployment.versioning.VersioningUtils; import org.glassfish.deployment.versioning.VersioningWildcardException; -import org.glassfish.deployment.versioning.VersioningService; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.deployment.Deployment; +import org.glassfish.internal.deployment.ExtendedDeploymentContext; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.Transaction; +import org.jvnet.hk2.config.TransactionFailure; /** * Create application ref command diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/CreateLifecycleModuleCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/CreateLifecycleModuleCommand.java index 40b3002079f..b1d7824640a 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/CreateLifecycleModuleCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/CreateLifecycleModuleCommand.java @@ -19,29 +19,21 @@ import com.sun.enterprise.config.serverbeans.Application; import com.sun.enterprise.config.serverbeans.Applications; import com.sun.enterprise.config.serverbeans.Cluster; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.config.serverbeans.ServerTags; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.config.serverbeans.ServerTags; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + import java.util.ArrayList; import java.util.Collection; -import org.glassfish.internal.deployment.Deployment; -import org.glassfish.internal.deployment.ExtendedDeploymentContext; +import java.util.List; +import java.util.Properties; + import org.glassfish.api.ActionReport; -import org.glassfish.api.Param; import org.glassfish.api.I18n; -import org.glassfish.api.deployment.DeployCommandParameters; -import org.glassfish.deployment.common.DeploymentContextImpl; -import org.glassfish.config.support.TargetType; -import org.glassfish.config.support.CommandTarget; -import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; - -import org.glassfish.hk2.api.PerLookup; -import org.jvnet.hk2.config.Transaction; - -import java.util.Properties; -import java.util.List; +import org.glassfish.api.Param; import org.glassfish.api.admin.AccessRequired.AccessCheck; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; @@ -51,6 +43,15 @@ import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.RestParam; import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.deployment.DeployCommandParameters; +import org.glassfish.config.support.CommandTarget; +import org.glassfish.config.support.TargetType; +import org.glassfish.deployment.common.DeploymentContextImpl; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.internal.deployment.Deployment; +import org.glassfish.internal.deployment.ExtendedDeploymentContext; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.Transaction; /** * Create lifecycle modules. diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeleteApplicationRefCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeleteApplicationRefCommand.java index ee56cffbdd8..75521598a99 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeleteApplicationRefCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeleteApplicationRefCommand.java @@ -22,47 +22,47 @@ import com.sun.enterprise.config.serverbeans.Cluster; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Server; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.Param; -import org.glassfish.api.admin.ExecuteOn; -import org.glassfish.api.admin.RuntimeType; -import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.api.deployment.UndeployCommandParameters; -import org.glassfish.api.deployment.OpsParams.Origin; -import org.glassfish.api.deployment.OpsParams.Command; -import org.glassfish.api.deployment.archive.ReadableArchive; -import org.glassfish.config.support.TargetType; -import org.glassfish.config.support.CommandTarget; -import org.glassfish.internal.data.ApplicationInfo; -import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.deploy.shared.ArchiveFactory; +import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.io.FileUtils; -import org.glassfish.api.ActionReport; -import org.glassfish.api.I18n; -import org.glassfish.internal.deployment.Deployment; -import org.glassfish.internal.deployment.ExtendedDeploymentContext; + import jakarta.inject.Inject; import jakarta.inject.Named; -import org.jvnet.hk2.annotations.Service; - -import org.glassfish.hk2.api.PerLookup; -import org.jvnet.hk2.config.TransactionFailure; - -import java.util.logging.Level; -import java.util.logging.Logger; import java.io.File; import java.net.URI; import java.util.Collection; import java.util.Iterator; import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.I18n; +import org.glassfish.api.Param; import org.glassfish.api.admin.AccessRequired.AccessCheck; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.AdminCommandSecurity; +import org.glassfish.api.admin.ExecuteOn; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.api.deployment.OpsParams.Command; +import org.glassfish.api.deployment.OpsParams.Origin; +import org.glassfish.api.deployment.UndeployCommandParameters; +import org.glassfish.api.deployment.archive.ReadableArchive; +import org.glassfish.config.support.CommandTarget; +import org.glassfish.config.support.TargetType; import org.glassfish.deployment.versioning.VersioningException; import org.glassfish.deployment.versioning.VersioningService; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.internal.data.ApplicationInfo; +import org.glassfish.internal.deployment.Deployment; +import org.glassfish.internal.deployment.ExtendedDeploymentContext; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.TransactionFailure; /** * Delete application ref command diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeleteLifecycleModuleCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeleteLifecycleModuleCommand.java index 841ccc0b899..d4f1b700d40 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeleteLifecycleModuleCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeleteLifecycleModuleCommand.java @@ -16,31 +16,24 @@ package org.glassfish.deployment.admin; -import com.sun.enterprise.util.LocalStringManagerImpl; -import java.util.ArrayList; -import org.glassfish.deployment.common.DeploymentUtils; -import org.glassfish.api.ActionReport; -import org.glassfish.api.Param; -import org.glassfish.api.I18n; -import org.glassfish.internal.deployment.Deployment; -import com.sun.enterprise.config.serverbeans.ApplicationRef; -import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.admin.util.ClusterOperationUtil; +import com.sun.enterprise.config.serverbeans.ApplicationRef; import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Server; -import java.util.Collection; -import org.glassfish.common.util.admin.ParameterMapExtractor; -import org.glassfish.config.support.TargetType; -import org.glassfish.config.support.CommandTarget; -import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; +import com.sun.enterprise.util.LocalStringManagerImpl; -import org.glassfish.hk2.api.PerLookup; -import org.glassfish.hk2.api.ServiceLocator; +import jakarta.inject.Inject; -import java.util.logging.Logger; +import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.List; +import java.util.logging.Logger; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.I18n; +import org.glassfish.api.Param; import org.glassfish.api.admin.AccessRequired.AccessCheck; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; @@ -53,6 +46,14 @@ import org.glassfish.api.admin.RestParam; import org.glassfish.api.admin.RuntimeType; import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.common.util.admin.ParameterMapExtractor; +import org.glassfish.config.support.CommandTarget; +import org.glassfish.config.support.TargetType; +import org.glassfish.deployment.common.DeploymentUtils; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.deployment.Deployment; +import org.jvnet.hk2.annotations.Service; /** * Delete lifecycle modules. diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeployCommandSupplementalInfo.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeployCommandSupplementalInfo.java index 8cfc757a6b4..e277a04776f 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeployCommandSupplementalInfo.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeployCommandSupplementalInfo.java @@ -19,6 +19,7 @@ import java.io.Serializable; import java.util.Collection; import java.util.List; + import org.glassfish.api.admin.AccessRequired.AccessCheck; import org.glassfish.internal.deployment.ExtendedDeploymentContext; diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeployDirCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeployDirCommand.java index ff5378b3572..b9e6f81230a 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeployDirCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeployDirCommand.java @@ -16,16 +16,17 @@ package org.glassfish.deployment.admin; -import org.glassfish.api.admin.AdminCommandContext; +import com.sun.enterprise.util.LocalStringManagerImpl; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; +import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.ExecuteOn; import org.glassfish.api.admin.RuntimeType; -import org.glassfish.config.support.TargetType; import org.glassfish.config.support.CommandTarget; -import com.sun.enterprise.util.LocalStringManagerImpl; -import org.jvnet.hk2.annotations.Service; +import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeploymentCommandUtils.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeploymentCommandUtils.java index 314d42140d9..8983c92de74 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeploymentCommandUtils.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeploymentCommandUtils.java @@ -21,30 +21,32 @@ import com.sun.enterprise.config.serverbeans.Application; import com.sun.enterprise.config.serverbeans.ApplicationRef; import com.sun.enterprise.config.serverbeans.Applications; -import com.sun.enterprise.util.io.FileUtils; import com.sun.enterprise.config.serverbeans.Cluster; import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.util.io.FileUtils; + +import java.io.File; +import java.io.IOException; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.logging.Logger; +import java.util.List; import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; +import org.glassfish.api.admin.AccessRequired; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.FailurePolicy; import org.glassfish.api.admin.ParameterMap; import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.api.deployment.OpsParams; +import org.glassfish.common.util.admin.ParameterMapExtractor; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.deployment.Deployment; -import org.glassfish.common.util.admin.ParameterMapExtractor; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import org.glassfish.api.admin.AccessRequired; import org.jvnet.hk2.config.ConfigBeanProxy; /** diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DisableCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DisableCommand.java index f79164dbcc5..7da8c3e7d09 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DisableCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DisableCommand.java @@ -16,59 +16,62 @@ package org.glassfish.deployment.admin; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.api.admin.FailurePolicy; -import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.admin.util.ClusterOperationUtil; -import com.sun.enterprise.config.serverbeans.*; -import java.util.ArrayList; -import java.util.Collection; -import org.glassfish.api.ActionReport; -import org.glassfish.api.I18n; -import org.glassfish.api.Param; -import org.glassfish.api.deployment.UndeployCommandParameters; -import org.glassfish.api.admin.ExecuteOn; -import org.glassfish.api.admin.RuntimeType; -import org.glassfish.api.admin.ParameterMap; -import org.glassfish.api.event.Events; -import org.glassfish.internal.deployment.Deployment; -import org.glassfish.internal.deployment.ExtendedDeploymentContext; -import org.glassfish.internal.deployment.DeploymentTargetResolver; -import org.glassfish.internal.data.ApplicationInfo; -import org.glassfish.config.support.TargetType; -import org.glassfish.config.support.CommandTarget; -import org.glassfish.common.util.admin.ParameterMapExtractor; -import org.glassfish.deployment.common.DeploymentUtils; +import com.sun.enterprise.config.serverbeans.Application; +import com.sun.enterprise.config.serverbeans.ApplicationRef; +import com.sun.enterprise.config.serverbeans.Applications; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.util.LocalStringManagerImpl; + import jakarta.inject.Inject; import jakarta.inject.Named; -import org.jvnet.hk2.annotations.Service; - -import org.glassfish.hk2.api.PerLookup; -import org.glassfish.hk2.api.ServiceLocator; -import org.jvnet.hk2.config.TransactionFailure; - -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.List; +import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; +import java.util.List; import java.util.Map; import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.I18n; +import org.glassfish.api.Param; import org.glassfish.api.admin.AccessRequired.AccessCheck; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.AdminCommandSecurity; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.FailurePolicy; +import org.glassfish.api.admin.ParameterMap; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.api.deployment.DeploymentContext; - -import org.glassfish.deployment.versioning.VersioningService; +import org.glassfish.api.deployment.UndeployCommandParameters; +import org.glassfish.api.event.Events; +import org.glassfish.common.util.admin.ParameterMapExtractor; +import org.glassfish.config.support.CommandTarget; +import org.glassfish.config.support.TargetType; +import org.glassfish.deployment.common.DeploymentUtils; import org.glassfish.deployment.versioning.VersioningException; +import org.glassfish.deployment.versioning.VersioningService; import org.glassfish.deployment.versioning.VersioningUtils; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.data.ApplicationInfo; +import org.glassfish.internal.deployment.Deployment; +import org.glassfish.internal.deployment.DeploymentTargetResolver; +import org.glassfish.internal.deployment.ExtendedDeploymentContext; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.TransactionFailure; /** * Disable command diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/EnableCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/EnableCommand.java index 618bb0a3560..2690a2cc77b 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/EnableCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/EnableCommand.java @@ -16,53 +16,56 @@ package org.glassfish.deployment.admin; +import com.sun.enterprise.admin.util.ClusterOperationUtil; +import com.sun.enterprise.config.serverbeans.Application; +import com.sun.enterprise.config.serverbeans.ApplicationRef; +import com.sun.enterprise.config.serverbeans.Applications; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.deploy.shared.ArchiveFactory; -import java.util.ArrayList; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.admin.ExecuteOn; -import org.glassfish.api.admin.RuntimeType; -import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.api.admin.ParameterMap; -import org.glassfish.api.admin.FailurePolicy; -import org.glassfish.api.deployment.StateCommandParameters; -import org.glassfish.api.deployment.OpsParams; -import org.glassfish.config.support.TargetType; -import org.glassfish.config.support.CommandTarget; import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.config.serverbeans.*; -import com.sun.enterprise.admin.util.ClusterOperationUtil; -import java.util.Collection; -import org.glassfish.api.ActionReport; -import org.glassfish.api.I18n; -import org.glassfish.internal.deployment.Deployment; -import org.glassfish.common.util.admin.ParameterMapExtractor; -import org.glassfish.internal.deployment.ExtendedDeploymentContext; -import org.glassfish.internal.deployment.DeploymentTargetResolver; + import jakarta.inject.Inject; import jakarta.inject.Named; -import org.jvnet.hk2.annotations.Service; - -import org.glassfish.hk2.api.PerLookup; -import org.glassfish.hk2.api.ServiceLocator; -import org.jvnet.hk2.config.TransactionFailure; - +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.List; -import java.util.Collections; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.I18n; import org.glassfish.api.admin.AccessRequired.AccessCheck; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.AdminCommandSecurity; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.FailurePolicy; +import org.glassfish.api.admin.ParameterMap; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.api.deployment.DeploymentContext; +import org.glassfish.api.deployment.OpsParams; +import org.glassfish.api.deployment.StateCommandParameters; +import org.glassfish.common.util.admin.ParameterMapExtractor; +import org.glassfish.config.support.CommandTarget; +import org.glassfish.config.support.TargetType; import org.glassfish.deployment.common.DeploymentUtils; -import org.glassfish.deployment.versioning.VersioningSyntaxException; - import org.glassfish.deployment.versioning.VersioningService; +import org.glassfish.deployment.versioning.VersioningSyntaxException; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.deployment.Deployment; +import org.glassfish.internal.deployment.DeploymentTargetResolver; +import org.glassfish.internal.deployment.ExtendedDeploymentContext; import org.glassfish.internal.deployment.ExtendedDeploymentContext.Phase; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.TransactionFailure; /** * Enable command diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetApplicationLaunchURLsCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetApplicationLaunchURLsCommand.java index 4a153e57cf8..74feceed495 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetApplicationLaunchURLsCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetApplicationLaunchURLsCommand.java @@ -16,6 +16,19 @@ package org.glassfish.deployment.admin; +import com.sun.enterprise.config.serverbeans.Application; +import com.sun.enterprise.config.serverbeans.Applications; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.HttpService; +import com.sun.enterprise.config.serverbeans.Node; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.config.serverbeans.VirtualServer; +import com.sun.enterprise.util.StringUtils; + +import jakarta.inject.Inject; + import java.net.URL; import java.util.ArrayList; import java.util.Collection; @@ -46,19 +59,6 @@ import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.Application; -import com.sun.enterprise.config.serverbeans.Applications; -import com.sun.enterprise.config.serverbeans.Cluster; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.HttpService; -import com.sun.enterprise.config.serverbeans.Node; -import com.sun.enterprise.config.serverbeans.Server; -import com.sun.enterprise.config.serverbeans.VirtualServer; -import com.sun.enterprise.util.StringUtils; - -import jakarta.inject.Inject; - @Service(name="_get-application-launch-urls") @ExecuteOn(value={RuntimeType.DAS}) @PerLookup diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetClientStubsCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetClientStubsCommand.java index 507532e8ffb..de45af66c30 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetClientStubsCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetClientStubsCommand.java @@ -21,20 +21,28 @@ import com.sun.enterprise.util.LocalStringManager; import com.sun.enterprise.util.LocalStringManagerImpl; +import jakarta.inject.Inject; + import java.util.Collection; import java.util.logging.Logger; -import jakarta.inject.Inject; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AccessRequired; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.AdminCommandSecurity; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; import org.glassfish.deployment.common.Artifacts; import org.glassfish.deployment.common.DeploymentUtils; import org.glassfish.deployment.versioning.VersioningSyntaxException; import org.glassfish.deployment.versioning.VersioningUtils; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetDeploymentConfigurationsCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetDeploymentConfigurationsCommand.java index fbb477bc77a..21840cf658b 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetDeploymentConfigurationsCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetDeploymentConfigurationsCommand.java @@ -17,6 +17,10 @@ package org.glassfish.deployment.admin; +import com.sun.enterprise.config.serverbeans.Application; + +import jakarta.inject.Inject; + import java.io.IOException; import java.util.Map; @@ -42,10 +46,6 @@ import org.glassfish.internal.data.ModuleInfo; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.Application; - -import jakarta.inject.Inject; - /** * Get deployment configurations command */ diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetHostAndPortCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetHostAndPortCommand.java index 6a89b1691b6..770618ad6e4 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetHostAndPortCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetHostAndPortCommand.java @@ -16,38 +16,39 @@ package org.glassfish.deployment.admin; -import java.util.ArrayList; -import java.util.List; - import com.sun.enterprise.config.serverbeans.ApplicationRef; +import com.sun.enterprise.config.serverbeans.Cluster; import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Configs; +import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.HttpService; import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.config.serverbeans.VirtualServer; -import com.sun.enterprise.config.serverbeans.Cluster; import com.sun.enterprise.util.HostAndPort; import com.sun.enterprise.util.StringUtils; + +import jakarta.inject.Inject; + +import java.util.ArrayList; import java.util.Collection; -import org.glassfish.grizzly.config.dom.Http; -import org.glassfish.grizzly.config.dom.NetworkListener; -import org.glassfish.grizzly.config.dom.Protocol; +import java.util.List; + import org.glassfish.api.ActionReport; import org.glassfish.api.Param; +import org.glassfish.api.admin.AccessRequired; +import org.glassfish.api.admin.AccessRequired.AccessCheck; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.AdminCommandSecurity; import org.glassfish.api.admin.CommandLock; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.RuntimeType; -import jakarta.inject.Inject; -import org.glassfish.api.admin.AccessRequired; -import org.glassfish.api.admin.AccessRequired.AccessCheck; -import org.glassfish.api.admin.AdminCommandSecurity; - -import org.jvnet.hk2.annotations.Service; +import org.glassfish.grizzly.config.dom.Http; +import org.glassfish.grizzly.config.dom.NetworkListener; +import org.glassfish.grizzly.config.dom.Protocol; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; @Service(name="_get-host-and-port") @org.glassfish.api.admin.ExecuteOn(value={RuntimeType.DAS}) diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetTargetsCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetTargetsCommand.java index 74c66358148..3566abc9f6a 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetTargetsCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetTargetsCommand.java @@ -16,11 +16,15 @@ package org.glassfish.deployment.admin; +import com.sun.enterprise.config.serverbeans.Domain; + +import jakarta.inject.Inject; + import java.util.List; -import com.sun.enterprise.config.serverbeans.Domain; import org.glassfish.api.ActionReport; import org.glassfish.api.Param; +import org.glassfish.api.admin.AccessRequired; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandLock; @@ -28,11 +32,8 @@ import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.RuntimeType; -import jakarta.inject.Inject; -import org.glassfish.api.admin.AccessRequired; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; @Service(name="_get-targets") @ExecuteOn(value={RuntimeType.DAS}) diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceDeployCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceDeployCommand.java index b81b9083450..8e97734811a 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceDeployCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceDeployCommand.java @@ -17,54 +17,54 @@ package org.glassfish.deployment.admin; +import com.sun.enterprise.config.serverbeans.Application; +import com.sun.enterprise.config.serverbeans.Applications; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.deploy.shared.ArchiveFactory; +import com.sun.enterprise.deployment.deploy.shared.Util; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.io.FileUtils; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.io.File; import java.io.IOException; import java.io.InputStream; import java.net.URI; import java.util.ArrayList; import java.util.Calendar; +import java.util.Collection; import java.util.Enumeration; import java.util.List; -import java.util.logging.Logger; import java.util.logging.Level; +import java.util.logging.Logger; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.admin.AccessRequired.AccessCheck; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.AdminCommandSecurity; import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.RuntimeType; import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.api.ActionReport; import org.glassfish.api.deployment.archive.ArchiveHandler; import org.glassfish.api.deployment.archive.ReadableArchive; +import org.glassfish.deployment.common.DeploymentUtils; +import org.glassfish.deployment.versioning.VersioningUtils; +import org.glassfish.hk2.api.PerLookup; import org.glassfish.internal.data.ApplicationInfo; import org.glassfish.internal.deployment.Deployment; import org.glassfish.internal.deployment.ExtendedDeploymentContext; import org.glassfish.internal.deployment.SnifferManager; -import org.glassfish.deployment.common.DeploymentUtils; -import com.sun.enterprise.deployment.deploy.shared.Util; -import org.glassfish.deployment.versioning.VersioningUtils; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import jakarta.inject.Named; - - -import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.config.Transaction; -import com.sun.enterprise.util.io.FileUtils; -import com.sun.enterprise.deploy.shared.ArchiveFactory; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.config.serverbeans.Server; -import com.sun.enterprise.config.serverbeans.Applications; -import com.sun.enterprise.config.serverbeans.Application; -import com.sun.enterprise.config.serverbeans.Domain; -import java.util.Collection; -import org.glassfish.api.admin.AccessRequired.AccessCheck; -import org.glassfish.api.admin.AdminCommandSecurity; -import org.glassfish.api.admin.RestEndpoint; -import org.glassfish.api.admin.RestEndpoints; - /** * The deploy command that runs on instance diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceDeployCommandParameters.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceDeployCommandParameters.java index 1f8bd702ffc..12e40d83926 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceDeployCommandParameters.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceDeployCommandParameters.java @@ -18,6 +18,7 @@ import java.io.File; import java.util.Properties; + import org.glassfish.api.Param; import org.glassfish.api.deployment.DeployCommandParameters; import org.glassfish.deployment.common.DeploymentProperties; diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceLifecycleModuleCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceLifecycleModuleCommand.java index 7df5ddc40f4..61d8989a7a5 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceLifecycleModuleCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceLifecycleModuleCommand.java @@ -16,35 +16,35 @@ package org.glassfish.deployment.admin; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.Param; -import org.glassfish.api.admin.ExecuteOn; -import org.glassfish.api.admin.RuntimeType; -import org.glassfish.api.ActionReport; -import org.glassfish.api.deployment.DeployCommandParameters; -import org.glassfish.internal.deployment.Deployment; -import org.glassfish.internal.deployment.ExtendedDeploymentContext; -import org.glassfish.deployment.common.DeploymentContextImpl; -import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; - -import org.glassfish.hk2.api.PerLookup; -import org.jvnet.hk2.config.Transaction; - -import com.sun.enterprise.config.serverbeans.Applications; import com.sun.enterprise.config.serverbeans.Application; +import com.sun.enterprise.config.serverbeans.Applications; import com.sun.enterprise.config.serverbeans.Domain; + +import jakarta.inject.Inject; + import java.util.ArrayList; import java.util.Collection; import java.util.List; - -import java.util.logging.Logger; import java.util.Properties; +import java.util.logging.Logger; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.Param; import org.glassfish.api.admin.AccessRequired.AccessCheck; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.AdminCommandSecurity; +import org.glassfish.api.admin.ExecuteOn; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.deployment.DeployCommandParameters; +import org.glassfish.deployment.common.DeploymentContextImpl; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.internal.deployment.Deployment; +import org.glassfish.internal.deployment.ExtendedDeploymentContext; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.Transaction; /** * The command to create application ref for lifecycle module on instance diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceValidateRemoteDirDeploymentCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceValidateRemoteDirDeploymentCommand.java index 85230ced596..89fd152a004 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceValidateRemoteDirDeploymentCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceValidateRemoteDirDeploymentCommand.java @@ -18,8 +18,10 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.universal.i18n.LocalStringsImpl; + import java.io.File; import java.util.logging.Level; + import org.glassfish.api.ActionReport; import org.glassfish.api.Param; import org.glassfish.api.admin.AccessRequired; @@ -30,9 +32,8 @@ import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.RuntimeType; import org.glassfish.deployment.common.DeploymentUtils; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * Instance-only command which makes sure that a deployment directory seems to diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InterceptorNotifier.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InterceptorNotifier.java index f6fe66368a3..a2bd32c70d5 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InterceptorNotifier.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InterceptorNotifier.java @@ -18,6 +18,7 @@ import java.util.Arrays; import java.util.Collection; + import org.glassfish.api.deployment.DeploymentContext; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.deployment.ApplicationLifecycleInterceptor; diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/IsSnifferUserVisibleCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/IsSnifferUserVisibleCommand.java index bafd494a364..402d1c675c8 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/IsSnifferUserVisibleCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/IsSnifferUserVisibleCommand.java @@ -17,8 +17,12 @@ package org.glassfish.deployment.admin; import com.sun.enterprise.config.serverbeans.Application; + +import jakarta.inject.Inject; + import org.glassfish.api.ActionReport; import org.glassfish.api.Param; +import org.glassfish.api.admin.AccessRequired; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandLock; @@ -26,13 +30,10 @@ import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.RuntimeType; import org.glassfish.api.container.Sniffer; +import org.glassfish.deployment.common.DeploymentProperties; +import org.glassfish.hk2.api.PerLookup; import org.glassfish.internal.deployment.SnifferManager; -import jakarta.inject.Inject; -import org.glassfish.api.admin.AccessRequired; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; -import org.glassfish.deployment.common.DeploymentProperties; @Service(name="_is-sniffer-user-visible") @org.glassfish.api.admin.ExecuteOn(value={RuntimeType.DAS}) diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListAppRefsCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListAppRefsCommand.java index c1dd3c64bfc..75126ca8564 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListAppRefsCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListAppRefsCommand.java @@ -16,31 +16,33 @@ package org.glassfish.deployment.admin; -import java.util.ArrayList; -import org.glassfish.api.ActionReport; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.admin.CommandLock; -import org.glassfish.api.Param; -import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.ApplicationRef; import com.sun.enterprise.config.serverbeans.Application; +import com.sun.enterprise.config.serverbeans.ApplicationRef; import com.sun.enterprise.config.serverbeans.Applications; +import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Engine; import com.sun.enterprise.config.serverbeans.Module; -import org.glassfish.api.admin.ExecuteOn; -import org.glassfish.api.admin.RuntimeType; -import java.util.Collection; import jakarta.inject.Inject; -import org.glassfish.hk2.api.PerLookup; + +import java.util.ArrayList; +import java.util.Collection; import java.util.List; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.Param; import org.glassfish.api.admin.AccessRequired; import org.glassfish.api.admin.AccessRequired.AccessCheck; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.AdminCommandSecurity; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; @Service(name="_list-app-refs") @ExecuteOn(value={RuntimeType.DAS}) diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListApplicationRefsCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListApplicationRefsCommand.java index 96e01d608f3..080d12bb8cf 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListApplicationRefsCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListApplicationRefsCommand.java @@ -16,35 +16,36 @@ package org.glassfish.deployment.admin; -import com.sun.enterprise.util.ColumnFormatter; -import java.util.List; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.admin.CommandLock; -import org.glassfish.api.Param; -import org.glassfish.api.admin.ExecuteOn; -import org.glassfish.api.admin.RuntimeType; -import org.glassfish.config.support.TargetType; -import org.glassfish.config.support.CommandTarget; -import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.config.serverbeans.ApplicationRef; import com.sun.enterprise.config.serverbeans.Applications; import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.util.ColumnFormatter; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + import java.util.ArrayList; import java.util.Collection; +import java.util.List; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; -import org.glassfish.api.admin.RestEndpoint; -import org.glassfish.api.admin.RestEndpoints; -import jakarta.inject.Inject; +import org.glassfish.api.Param; import org.glassfish.api.admin.AccessRequired; import org.glassfish.api.admin.AccessRequired.AccessCheck; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.AdminCommandSecurity; -import org.jvnet.hk2.annotations.Service; - -import org.glassfish.hk2.api.PerLookup; - +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.config.support.CommandTarget; +import org.glassfish.config.support.TargetType; import org.glassfish.deployment.common.DeploymentUtils; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * List application ref command diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListApplicationsCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListApplicationsCommand.java index 24c37888074..a4fd7a10014 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListApplicationsCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListApplicationsCommand.java @@ -17,18 +17,18 @@ package org.glassfish.deployment.admin; import com.sun.enterprise.config.serverbeans.Applications; + +import org.glassfish.api.I18n; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandLock; import org.glassfish.api.admin.ExecuteOn; -import org.glassfish.api.admin.RuntimeType; -import org.glassfish.api.I18n; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; -import org.glassfish.config.support.TargetType; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; -import org.jvnet.hk2.annotations.Service; - +import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListComponentsCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListComponentsCommand.java index 2f192c4b826..dcdcaf3af94 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListComponentsCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListComponentsCommand.java @@ -16,36 +16,47 @@ package org.glassfish.deployment.admin; +import com.sun.enterprise.config.serverbeans.Application; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Engine; +import com.sun.enterprise.config.serverbeans.Module; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; + import javax.security.auth.Subject; + import org.glassfish.api.ActionReport; +import org.glassfish.api.I18n; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AccessRequired; +import org.glassfish.api.admin.AccessRequired.AccessCheck; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.AdminCommandSecurity; import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.CommandRunner; import org.glassfish.api.admin.ExecuteOn; -import org.glassfish.api.admin.RuntimeType; import org.glassfish.api.admin.ParameterMap; -import org.glassfish.api.admin.CommandRunner; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.RestParam; -import org.glassfish.api.Param; -import org.glassfish.api.I18n; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.api.container.Sniffer; -import org.glassfish.internal.deployment.SnifferManager; -import org.glassfish.config.support.TargetType; import org.glassfish.config.support.CommandTarget; -import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.*; -import com.sun.enterprise.util.LocalStringManagerImpl; - -import jakarta.inject.Inject; +import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; -import com.sun.enterprise.config.serverbeans.Module; - -import java.util.*; -import org.glassfish.api.admin.AccessRequired; -import org.glassfish.api.admin.AccessRequired.AccessCheck; -import org.glassfish.api.admin.AdminCommandSecurity; +import org.glassfish.internal.deployment.SnifferManager; +import org.jvnet.hk2.annotations.Service; /** * list-components command diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLibrariesCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLibrariesCommand.java index 646c5c8b5ef..7fe723236d6 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLibrariesCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLibrariesCommand.java @@ -16,25 +16,26 @@ package org.glassfish.deployment.admin; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.util.io.FileUtils; + +import jakarta.inject.Inject; + +import java.io.File; + import org.glassfish.api.ActionReport; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AccessRequired; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandLock; -import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.api.Param; import org.glassfish.api.admin.ExecuteOn; -import org.glassfish.api.admin.RuntimeType; -import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.RestEndpoint; -import org.jvnet.hk2.annotations.Service; - +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.hk2.api.PerLookup; -import jakarta.inject.Inject; -import com.sun.enterprise.util.io.FileUtils; -import com.sun.enterprise.config.serverbeans.Domain; - -import java.io.File; -import org.glassfish.api.admin.AccessRequired; +import org.jvnet.hk2.annotations.Service; @Service(name="list-libraries") @PerLookup diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLifecycleModulesCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLifecycleModulesCommand.java index b27b52eebcc..c584aa1c98a 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLifecycleModulesCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLifecycleModulesCommand.java @@ -16,14 +16,18 @@ package org.glassfish.deployment.admin; -import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.config.serverbeans.Application; import com.sun.enterprise.config.serverbeans.Cluster; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + import org.glassfish.api.ActionReport; -import org.glassfish.api.Param; import org.glassfish.api.I18n; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AccessRequired; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandLock; @@ -32,13 +36,10 @@ import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.RestParam; import org.glassfish.api.admin.RuntimeType; -import org.glassfish.config.support.TargetType; import org.glassfish.config.support.CommandTarget; -import org.jvnet.hk2.annotations.Service; - -import jakarta.inject.Inject; -import org.glassfish.api.admin.AccessRequired; +import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTDeployCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTDeployCommand.java index 4edfa5494e9..878494de64b 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTDeployCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTDeployCommand.java @@ -16,23 +16,23 @@ package org.glassfish.deployment.admin; +import jakarta.inject.Inject; + +import java.io.File; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AccessRequired; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandLock; -import org.glassfish.api.admin.RuntimeType; -import org.glassfish.api.admin.ParameterMap; import org.glassfish.api.admin.CommandRunner; -import org.glassfish.api.ActionReport; -import org.glassfish.api.Param; -import org.glassfish.deployment.common.DeploymentUtils; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.deployment.common.DeploymentProperties; - -import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; +import org.glassfish.deployment.common.DeploymentUtils; import org.glassfish.hk2.api.PerLookup; - -import java.io.File; -import org.glassfish.api.admin.AccessRequired; +import org.jvnet.hk2.annotations.Service; @Service(name="_mt-deploy") @org.glassfish.api.admin.ExecuteOn(value={RuntimeType.DAS}) diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTProvisionCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTProvisionCommand.java index 032a53c105d..6232eec3c28 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTProvisionCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTProvisionCommand.java @@ -16,42 +16,42 @@ package org.glassfish.deployment.admin; +import com.sun.enterprise.config.serverbeans.Application; +import com.sun.enterprise.config.serverbeans.ApplicationRef; +import com.sun.enterprise.config.serverbeans.Applications; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.ServerTags; +import com.sun.enterprise.deploy.shared.ArchiveFactory; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + import java.io.File; import java.io.IOException; +import java.net.URI; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; import java.util.Properties; import java.util.logging.Logger; -import java.net.URI; +import org.glassfish.api.ActionReport; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AccessRequired; +import org.glassfish.api.admin.AccessRequired.AccessCheck; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.AdminCommandSecurity; import org.glassfish.api.admin.CommandLock; import org.glassfish.api.admin.RuntimeType; -import org.glassfish.api.ActionReport; -import org.glassfish.api.Param; import org.glassfish.api.deployment.DeployCommandParameters; import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.api.deployment.archive.WritableArchive; +import org.glassfish.deployment.common.DeploymentUtils; +import org.glassfish.hk2.api.PerLookup; import org.glassfish.internal.deployment.Deployment; import org.glassfish.internal.deployment.ExtendedDeploymentContext; -import org.glassfish.deployment.common.DeploymentUtils; - -import jakarta.inject.Inject; import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; - -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.Application; -import com.sun.enterprise.config.serverbeans.ApplicationRef; -import com.sun.enterprise.config.serverbeans.Applications; -import com.sun.enterprise.config.serverbeans.ServerTags; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.deploy.shared.ArchiveFactory; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import org.glassfish.api.admin.AccessRequired; -import org.glassfish.api.admin.AccessRequired.AccessCheck; -import org.glassfish.api.admin.AdminCommandSecurity; @Service(name="_mt-provision") @org.glassfish.api.admin.ExecuteOn(value={RuntimeType.DAS}) diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTUndeployCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTUndeployCommand.java index cdb9e490bcb..86307153ef4 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTUndeployCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTUndeployCommand.java @@ -16,31 +16,33 @@ package org.glassfish.deployment.admin; -import javax.security.auth.Subject; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.admin.CommandLock; -import org.glassfish.api.admin.RuntimeType; -import org.glassfish.api.admin.ParameterMap; -import org.glassfish.api.admin.CommandRunner; -import org.glassfish.api.ActionReport; -import org.glassfish.api.Param; -import org.glassfish.deployment.common.DeploymentUtils; -import org.glassfish.deployment.common.DeploymentProperties; +import com.sun.enterprise.config.serverbeans.AppTenant; import com.sun.enterprise.config.serverbeans.Application; import com.sun.enterprise.config.serverbeans.Applications; -import com.sun.enterprise.config.serverbeans.AppTenant; -import java.util.ArrayList; import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; +import java.util.ArrayList; import java.util.Collection; import java.util.List; + +import javax.security.auth.Subject; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.Param; import org.glassfish.api.admin.AccessRequired; import org.glassfish.api.admin.AccessRequired.AccessCheck; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.AdminCommandSecurity; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.CommandRunner; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.deployment.common.DeploymentProperties; +import org.glassfish.deployment.common.DeploymentUtils; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; @Service(name="_mt-undeploy") @org.glassfish.api.admin.ExecuteOn(value={RuntimeType.DAS}) diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTUnprovisionCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTUnprovisionCommand.java index 95b327ae415..205d04703d4 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTUnprovisionCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTUnprovisionCommand.java @@ -16,41 +16,41 @@ package org.glassfish.deployment.admin; +import com.sun.enterprise.config.serverbeans.AppTenant; +import com.sun.enterprise.config.serverbeans.Application; +import com.sun.enterprise.config.serverbeans.Applications; +import com.sun.enterprise.deploy.shared.ArchiveFactory; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + import java.io.File; import java.io.IOException; +import java.net.URI; import java.util.ArrayList; +import java.util.Collection; import java.util.List; -import java.util.logging.Logger; import java.util.logging.Level; -import java.net.URI; +import java.util.logging.Logger; +import org.glassfish.api.ActionReport; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AccessRequired; +import org.glassfish.api.admin.AccessRequired.AccessCheck; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.AdminCommandSecurity; import org.glassfish.api.admin.CommandLock; import org.glassfish.api.admin.RuntimeType; -import org.glassfish.api.ActionReport; -import org.glassfish.api.Param; import org.glassfish.api.deployment.DeployCommandParameters; -import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.api.deployment.UndeployCommandParameters; +import org.glassfish.api.deployment.archive.ReadableArchive; +import org.glassfish.deployment.common.DeploymentUtils; +import org.glassfish.hk2.api.PerLookup; import org.glassfish.internal.data.ApplicationInfo; import org.glassfish.internal.deployment.Deployment; import org.glassfish.internal.deployment.ExtendedDeploymentContext; -import org.glassfish.deployment.common.DeploymentUtils; - -import jakarta.inject.Inject; import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; - -import com.sun.enterprise.config.serverbeans.Application; -import com.sun.enterprise.config.serverbeans.Applications; -import com.sun.enterprise.config.serverbeans.AppTenant; -import com.sun.enterprise.deploy.shared.ArchiveFactory; -import com.sun.enterprise.util.LocalStringManagerImpl; -import java.util.Collection; -import org.glassfish.api.admin.AccessRequired; -import org.glassfish.api.admin.AccessRequired.AccessCheck; -import org.glassfish.api.admin.AdminCommandSecurity; @Service(name="_mt-unprovision") @org.glassfish.api.admin.ExecuteOn(value={RuntimeType.DAS}) diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostDeployCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostDeployCommand.java index 756a0a5b713..415f5091c41 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostDeployCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostDeployCommand.java @@ -18,10 +18,15 @@ import com.sun.enterprise.admin.util.ClusterOperationUtil; import com.sun.enterprise.config.serverbeans.Domain; -import java.util.logging.Logger; -import java.util.List; + +import jakarta.inject.Inject; + import java.util.ArrayList; +import java.util.List; +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; +import org.glassfish.api.admin.AccessRequired; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.ExecuteOn; @@ -34,14 +39,11 @@ import org.glassfish.api.deployment.DeployCommandParameters; import org.glassfish.api.deployment.DeploymentContext; import org.glassfish.deployment.common.DeploymentUtils; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.deployment.Deployment; import org.glassfish.internal.deployment.ExtendedDeploymentContext.Phase; -import jakarta.inject.Inject; -import org.glassfish.api.admin.AccessRequired; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; -import org.glassfish.hk2.api.ServiceLocator; /** * Causes InstanceDeployCommand executions on the correct remote instances. diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostEnableCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostEnableCommand.java index c1385985888..8769df6dbb9 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostEnableCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostEnableCommand.java @@ -21,7 +21,6 @@ import org.glassfish.api.admin.RuntimeType; import org.glassfish.api.admin.Supplemental; import org.glassfish.hk2.api.PerLookup; - import org.jvnet.hk2.annotations.Service; /** diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostStateCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostStateCommand.java index b1e195542f7..59fc9821abd 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostStateCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostStateCommand.java @@ -16,19 +16,20 @@ package org.glassfish.deployment.admin; +import jakarta.inject.Inject; + import java.util.Collection; import java.util.logging.Level; import java.util.logging.Logger; + import org.glassfish.api.ActionReport; +import org.glassfish.api.admin.AccessRequired.AccessCheck; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.AdminCommandSecurity; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.deployment.ExtendedDeploymentContext; -import jakarta.inject.Inject; -import org.glassfish.api.admin.AccessRequired.AccessCheck; -import org.glassfish.api.admin.AdminCommandSecurity; - import org.jvnet.hk2.annotations.Service; /** diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostUndeployCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostUndeployCommand.java index 0d2513056e8..1a4782c4eeb 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostUndeployCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostUndeployCommand.java @@ -16,9 +16,13 @@ package org.glassfish.deployment.admin; +import jakarta.inject.Inject; + import java.util.logging.Level; import java.util.logging.Logger; + import org.glassfish.api.ActionReport; +import org.glassfish.api.admin.AccessRequired; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.ExecuteOn; @@ -29,8 +33,6 @@ import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.deployment.ExtendedDeploymentContext; -import jakarta.inject.Inject; -import org.glassfish.api.admin.AccessRequired; import org.jvnet.hk2.annotations.Service; /** diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ReDeployCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ReDeployCommand.java index 3ed7960dcf7..3564ddee321 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ReDeployCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ReDeployCommand.java @@ -16,30 +16,32 @@ package org.glassfish.deployment.admin; +import com.sun.enterprise.config.serverbeans.ConfigBeansUtilities; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + +import java.io.File; +import java.util.ArrayList; +import java.util.Collection; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.I18n; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AccessRequired; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandRunner; -import org.glassfish.api.Param; -import org.glassfish.api.ActionReport; -import org.glassfish.api.I18n; -import org.glassfish.api.deployment.DeployCommandParameters; import org.glassfish.api.admin.ExecuteOn; -import org.glassfish.api.admin.RuntimeType; import org.glassfish.api.admin.ParameterMap; -import org.glassfish.internal.deployment.Deployment; -import org.glassfish.config.support.TargetType; -import org.glassfish.config.support.CommandTarget; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.deployment.DeployCommandParameters; import org.glassfish.common.util.admin.ParameterMapExtractor; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.config.serverbeans.ConfigBeansUtilities; -import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; +import org.glassfish.config.support.CommandTarget; +import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; - -import java.util.Collection; -import java.util.ArrayList; -import java.io.File; -import org.glassfish.api.admin.AccessRequired; +import org.glassfish.internal.deployment.Deployment; +import org.jvnet.hk2.annotations.Service; /** * diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/RemoveLibraryCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/RemoveLibraryCommand.java index d5a2592a6b1..d6b6d21902b 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/RemoveLibraryCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/RemoveLibraryCommand.java @@ -16,38 +16,39 @@ package org.glassfish.deployment.admin; -import org.glassfish.api.ActionReport; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.admin.CommandLock; -import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.api.Param; -import org.glassfish.api.admin.ExecuteOn; -import org.glassfish.api.admin.RuntimeType; -import org.glassfish.api.admin.RestEndpoints; -import org.glassfish.api.admin.RestEndpoint; -import org.glassfish.internal.config.UnprocessedConfigListener; -import org.jvnet.hk2.config.UnprocessedChangeEvent; -import org.jvnet.hk2.config.UnprocessedChangeEvents; -import org.jvnet.hk2.annotations.Service; - -import org.glassfish.hk2.api.PerLookup; -import jakarta.inject.Inject; +import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.io.FileUtils; -import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.v3.server.DomainXmlPersistence; -import java.util.logging.Logger; -import java.util.logging.Level; -import java.util.List; -import java.util.ArrayList; -import java.io.File; +import jakarta.inject.Inject; + import java.beans.PropertyChangeEvent; +import java.io.File; +import java.util.ArrayList; import java.util.Collection; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.Param; import org.glassfish.api.admin.AccessRequired; import org.glassfish.api.admin.AccessRequired.AccessCheck; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.AdminCommandSecurity; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.internal.config.UnprocessedConfigListener; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.UnprocessedChangeEvent; +import org.jvnet.hk2.config.UnprocessedChangeEvents; @Service(name="remove-library") @PerLookup diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ShowComponentStatusCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ShowComponentStatusCommand.java index 120555efe63..1f5a4aadc4b 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ShowComponentStatusCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ShowComponentStatusCommand.java @@ -16,40 +16,42 @@ package org.glassfish.deployment.admin; -import org.glassfish.api.ActionReport; -import org.glassfish.api.Param; -import org.glassfish.config.support.TargetType; -import org.glassfish.config.support.CommandTarget; -import org.glassfish.deployment.common.DeploymentProperties; -import org.glassfish.deployment.common.DeploymentUtils; -import org.glassfish.internal.deployment.Deployment; -import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.Applications; import com.sun.enterprise.config.serverbeans.Application; import com.sun.enterprise.config.serverbeans.ApplicationRef; +import com.sun.enterprise.config.serverbeans.Applications; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.logging.Logger; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AccessRequired; +import org.glassfish.api.admin.AccessRequired.AccessCheck; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.AdminCommandSecurity; import org.glassfish.api.admin.CommandLock; import org.glassfish.api.admin.ExecuteOn; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.RestParam; import org.glassfish.api.admin.RuntimeType; +import org.glassfish.config.support.CommandTarget; +import org.glassfish.config.support.TargetType; +import org.glassfish.deployment.common.DeploymentProperties; +import org.glassfish.deployment.common.DeploymentUtils; import org.glassfish.deployment.versioning.VersioningException; import org.glassfish.deployment.versioning.VersioningService; - import org.glassfish.hk2.api.PerLookup; -import jakarta.inject.Inject; -import org.glassfish.api.admin.AccessRequired; -import org.glassfish.api.admin.AccessRequired.AccessCheck; -import org.glassfish.api.admin.AdminCommandSecurity; +import org.glassfish.internal.deployment.Deployment; +import org.jvnet.hk2.annotations.Service; @Service(name="show-component-status") @PerLookup diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ValidateRemoteDirDeploymentCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ValidateRemoteDirDeploymentCommand.java index 8d3f186b9c5..717e4573433 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ValidateRemoteDirDeploymentCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ValidateRemoteDirDeploymentCommand.java @@ -20,12 +20,17 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.deploy.shared.ArchiveFactory; import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; + import org.glassfish.api.ActionReport; +import org.glassfish.api.admin.AccessRequired; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.ExecuteOn; @@ -37,14 +42,11 @@ import org.glassfish.api.admin.Supplemental; import org.glassfish.api.deployment.DeployCommandParameters; import org.glassfish.api.deployment.archive.ReadableArchive; -import org.glassfish.internal.deployment.Deployment; import org.glassfish.deployment.common.DeploymentUtils; -import jakarta.inject.Inject; -import org.glassfish.api.admin.AccessRequired; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.deployment.Deployment; +import org.jvnet.hk2.annotations.Service; /** * Makes sure that, if a deployment is a directory deployment to a non-DAS diff --git a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployService.java b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployService.java index 5f54644b8c9..6bc31a6e021 100644 --- a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployService.java +++ b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployService.java @@ -17,6 +17,9 @@ package org.glassfish.deployment.autodeploy; import com.sun.enterprise.config.serverbeans.DasConfig; + +import jakarta.inject.Inject; + import java.beans.PropertyChangeEvent; import java.util.ArrayList; import java.util.Arrays; @@ -25,26 +28,23 @@ import java.util.Timer; import java.util.TimerTask; import java.util.logging.Level; -import java.util.logging.Logger; import java.util.logging.LogRecord; +import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.hk2.runlevel.RunLevel; -import org.glassfish.internal.api.PostStartupRunLevel; -import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.hk2.api.PostConstruct; import org.glassfish.hk2.api.PreDestroy; import org.glassfish.hk2.api.ServiceLocator; - +import org.glassfish.hk2.runlevel.RunLevel; +import org.glassfish.internal.api.PostStartupRunLevel; +import org.glassfish.logging.annotation.LogMessageInfo; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigListener; import org.jvnet.hk2.config.UnprocessedChangeEvent; import org.jvnet.hk2.config.UnprocessedChangeEvents; -import org.glassfish.logging.annotation.LogMessageInfo; - /** * A service wrapper around the autodeployer. *

      diff --git a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployedFilesManager.java b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployedFilesManager.java index 4801a957e1c..216b8c4d6aa 100644 --- a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployedFilesManager.java +++ b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployedFilesManager.java @@ -23,11 +23,15 @@ package org.glassfish.deployment.autodeploy; -import java.io.*; +import java.io.File; import java.net.URI; -import java.util.*; -import java.util.logging.Logger; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Set; import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.logging.annotation.LogMessageInfo; /** diff --git a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeploymentOperation.java b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeploymentOperation.java index ccfc59d4d7e..685ba9b8674 100644 --- a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeploymentOperation.java +++ b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeploymentOperation.java @@ -16,6 +16,9 @@ package org.glassfish.deployment.autodeploy; +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.io.File; import java.util.Properties; import java.util.logging.Level; @@ -24,15 +27,10 @@ import org.glassfish.api.admin.AdminCommand; import org.glassfish.deployment.autodeploy.AutoDeployer.AutodeploymentStatus; import org.glassfish.deployment.common.DeploymentProperties; -import jakarta.inject.Inject; -import jakarta.inject.Named; - - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; - import org.glassfish.logging.annotation.LogMessageInfo; +import org.jvnet.hk2.annotations.Service; /** * Performs a single auto-deployment operation for a single file. diff --git a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoOperation.java b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoOperation.java index 508f42bf664..4edfcacf6fb 100644 --- a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoOperation.java +++ b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoOperation.java @@ -17,23 +17,24 @@ package org.glassfish.deployment.autodeploy; import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + import java.io.File; -import java.util.Properties; import java.util.Map; +import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.CommandRunner; import org.glassfish.api.admin.ParameterMap; import org.glassfish.deployment.autodeploy.AutoDeployer.AutodeploymentStatus; -import jakarta.inject.Inject; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; import org.glassfish.internal.api.InternalSystemAdministrator; - import org.glassfish.logging.annotation.LogMessageInfo; +import org.jvnet.hk2.annotations.Service; /** * Abstract class for operations the AutoDeployer can perform (currently diff --git a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoUndeploymentOperation.java b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoUndeploymentOperation.java index 361aaafefaa..4cd1c827bff 100644 --- a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoUndeploymentOperation.java +++ b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoUndeploymentOperation.java @@ -16,25 +16,25 @@ package org.glassfish.deployment.autodeploy; -import com.sun.enterprise.util.io.FileUtils; -import com.sun.enterprise.config.serverbeans.Applications; import com.sun.enterprise.config.serverbeans.Application; +import com.sun.enterprise.config.serverbeans.Applications; +import com.sun.enterprise.util.io.FileUtils; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.io.File; +import java.util.List; import java.util.Properties; import java.util.logging.Level; -import java.util.List; + import org.glassfish.api.admin.AdminCommand; import org.glassfish.deployment.autodeploy.AutoDeployer.AutodeploymentStatus; import org.glassfish.deployment.common.DeploymentProperties; -import jakarta.inject.Inject; -import jakarta.inject.Named; - - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; - import org.glassfish.logging.annotation.LogMessageInfo; +import org.jvnet.hk2.annotations.Service; /** * Performs a single auto-undeploy operation for a single file. diff --git a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutodeployRetryManager.java b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutodeployRetryManager.java index 3cd79538920..dce34d89270 100644 --- a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutodeployRetryManager.java +++ b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutodeployRetryManager.java @@ -18,6 +18,10 @@ import com.sun.enterprise.config.serverbeans.DasConfig; import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import java.io.File; import java.util.Date; import java.util.HashMap; @@ -26,13 +30,9 @@ import org.glassfish.api.ActionReport; import org.glassfish.deployment.autodeploy.AutoDeployer.AutodeploymentStatus; -import jakarta.inject.Inject; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PostConstruct; -import jakarta.inject.Singleton; - import org.glassfish.logging.annotation.LogMessageInfo; +import org.jvnet.hk2.annotations.Service; /** * Manages retrying of autodeployed files in case a file is copied slowly. diff --git a/nucleus/deployment/common/src/main/java/com/sun/enterprise/deploy/shared/ArchiveFactory.java b/nucleus/deployment/common/src/main/java/com/sun/enterprise/deploy/shared/ArchiveFactory.java index cd96c2cdca7..cdfeac16a64 100644 --- a/nucleus/deployment/common/src/main/java/com/sun/enterprise/deploy/shared/ArchiveFactory.java +++ b/nucleus/deployment/common/src/main/java/com/sun/enterprise/deploy/shared/ArchiveFactory.java @@ -17,7 +17,8 @@ package com.sun.enterprise.deploy.shared; -import static java.util.logging.Level.SEVERE; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.io.File; import java.io.FileNotFoundException; @@ -38,8 +39,7 @@ import org.glassfish.logging.annotation.LogMessageInfo; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import jakarta.inject.Singleton; +import static java.util.logging.Level.SEVERE; /** * This implementation of the ArchiveFactory interface is capable of creating the right abstraction of the Archive diff --git a/nucleus/deployment/common/src/main/java/com/sun/enterprise/deploy/shared/FileArchive.java b/nucleus/deployment/common/src/main/java/com/sun/enterprise/deploy/shared/FileArchive.java index 85d40073bd5..403ac502596 100644 --- a/nucleus/deployment/common/src/main/java/com/sun/enterprise/deploy/shared/FileArchive.java +++ b/nucleus/deployment/common/src/main/java/com/sun/enterprise/deploy/shared/FileArchive.java @@ -47,6 +47,7 @@ import java.util.jar.Manifest; import java.util.logging.Level; import java.util.logging.Logger; + import org.glassfish.api.deployment.archive.Archive; import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.api.deployment.archive.WritableArchive; diff --git a/nucleus/deployment/common/src/main/java/com/sun/enterprise/deployment/deploy/shared/InputJarArchive.java b/nucleus/deployment/common/src/main/java/com/sun/enterprise/deployment/deploy/shared/InputJarArchive.java index c6b7513e5b9..837d9892fe3 100644 --- a/nucleus/deployment/common/src/main/java/com/sun/enterprise/deployment/deploy/shared/InputJarArchive.java +++ b/nucleus/deployment/common/src/main/java/com/sun/enterprise/deployment/deploy/shared/InputJarArchive.java @@ -17,10 +17,7 @@ package com.sun.enterprise.deployment.deploy.shared; -import static com.sun.enterprise.util.io.FileUtils.deleteFile; -import static com.sun.enterprise.util.io.FileUtils.renameFile; -import static java.util.jar.JarFile.MANIFEST_NAME; -import static java.util.logging.Level.WARNING; +import com.sun.enterprise.util.i18n.StringManager; import java.io.BufferedInputStream; import java.io.File; @@ -49,7 +46,10 @@ import org.glassfish.logging.annotation.LogMessageInfo; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.util.i18n.StringManager; +import static com.sun.enterprise.util.io.FileUtils.deleteFile; +import static com.sun.enterprise.util.io.FileUtils.renameFile; +import static java.util.jar.JarFile.MANIFEST_NAME; +import static java.util.logging.Level.WARNING; /** * This implementation of the Archive deal with reading jar files either from a JarFile or from a JarInputStream diff --git a/nucleus/deployment/common/src/main/java/com/sun/enterprise/deployment/deploy/shared/MultiReadableArchive.java b/nucleus/deployment/common/src/main/java/com/sun/enterprise/deployment/deploy/shared/MultiReadableArchive.java index 2aa306e5669..0076042e750 100644 --- a/nucleus/deployment/common/src/main/java/com/sun/enterprise/deployment/deploy/shared/MultiReadableArchive.java +++ b/nucleus/deployment/common/src/main/java/com/sun/enterprise/deployment/deploy/shared/MultiReadableArchive.java @@ -16,8 +16,11 @@ package com.sun.enterprise.deployment.deploy.shared; -import com.sun.enterprise.deploy.shared.ArchiveFactory; import com.sun.enterprise.deploy.shared.AbstractReadableArchive; +import com.sun.enterprise.deploy.shared.ArchiveFactory; + +import jakarta.inject.Inject; + import java.io.IOException; import java.io.InputStream; import java.net.URI; @@ -26,11 +29,10 @@ import java.util.Enumeration; import java.util.LinkedHashSet; import java.util.jar.Manifest; -import org.glassfish.api.deployment.archive.ReadableArchive; -import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; +import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * Implements ReadableArchive based on multiple underlying ReadableArchives, diff --git a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/AnnotationScanner.java b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/AnnotationScanner.java index 30c96e14bb6..f3cf9e9737c 100644 --- a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/AnnotationScanner.java +++ b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/AnnotationScanner.java @@ -16,10 +16,6 @@ package org.glassfish.deployment.common; -import org.glassfish.api.deployment.archive.ReadableArchive; -import org.glassfish.logging.annotation.LogMessageInfo; -import org.objectweb.asm.*; - import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -30,6 +26,15 @@ import java.util.logging.LogRecord; import java.util.logging.Logger; +import org.glassfish.api.deployment.archive.ReadableArchive; +import org.glassfish.logging.annotation.LogMessageInfo; +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.Attribute; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.FieldVisitor; +import org.objectweb.asm.MethodVisitor; + public class AnnotationScanner extends ClassVisitor { public static final Logger deplLogger = org.glassfish.deployment.common.DeploymentContextImpl.deplLogger; diff --git a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/ApplicationConfigInfo.java b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/ApplicationConfigInfo.java index b4340566f37..7d867e80d5b 100644 --- a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/ApplicationConfigInfo.java +++ b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/ApplicationConfigInfo.java @@ -20,6 +20,7 @@ import com.sun.enterprise.config.serverbeans.ApplicationConfig; import com.sun.enterprise.config.serverbeans.Engine; import com.sun.enterprise.config.serverbeans.Module; + import java.util.HashMap; import java.util.Map; import java.util.Properties; diff --git a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/ClassDependencyBuilder.java b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/ClassDependencyBuilder.java index 64dff40761b..61ff3cb72e5 100644 --- a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/ClassDependencyBuilder.java +++ b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/ClassDependencyBuilder.java @@ -16,7 +16,12 @@ package org.glassfish.deployment.common; -import java.util.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * A class that can answer the following queries WITHOUT loading any classes diff --git a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/DeploymentProperties.java b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/DeploymentProperties.java index 8dd3c0e5b3f..eec787b08aa 100644 --- a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/DeploymentProperties.java +++ b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/DeploymentProperties.java @@ -22,11 +22,11 @@ package org.glassfish.deployment.common; -import java.util.Properties; -import java.util.Iterator; +import java.io.File; import java.util.HashMap; +import java.util.Iterator; import java.util.Map; -import java.io.File; +import java.util.Properties; /** * This properties are used to transfer information between diff --git a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/DeploymentUtils.java b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/DeploymentUtils.java index aaa4ee5b513..2eb44a560a1 100644 --- a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/DeploymentUtils.java +++ b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/DeploymentUtils.java @@ -17,12 +17,17 @@ package org.glassfish.deployment.common; -import static com.sun.enterprise.util.Utility.isAnyNull; -import static com.sun.enterprise.util.io.FileUtils.makeFriendlyFilenameExtension; -import static com.sun.enterprise.util.io.FileUtils.makeLegalNoBlankFileName; -import static com.sun.enterprise.util.io.FileUtils.safeIsDirectory; -import static java.util.jar.JarFile.MANIFEST_NAME; -import static java.util.logging.Level.WARNING; +import com.sun.enterprise.config.serverbeans.Application; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.HttpService; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.config.serverbeans.VirtualServer; +import com.sun.enterprise.deploy.shared.ArchiveFactory; +import com.sun.enterprise.deploy.shared.FileArchive; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.io.FileUtils; import java.io.File; import java.io.IOException; @@ -51,17 +56,12 @@ import org.glassfish.loader.util.ASClassLoaderUtil; import org.glassfish.logging.annotation.LogMessageInfo; -import com.sun.enterprise.config.serverbeans.Application; -import com.sun.enterprise.config.serverbeans.Cluster; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.HttpService; -import com.sun.enterprise.config.serverbeans.Server; -import com.sun.enterprise.config.serverbeans.VirtualServer; -import com.sun.enterprise.deploy.shared.ArchiveFactory; -import com.sun.enterprise.deploy.shared.FileArchive; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.io.FileUtils; +import static com.sun.enterprise.util.Utility.isAnyNull; +import static com.sun.enterprise.util.io.FileUtils.makeFriendlyFilenameExtension; +import static com.sun.enterprise.util.io.FileUtils.makeLegalNoBlankFileName; +import static com.sun.enterprise.util.io.FileUtils.safeIsDirectory; +import static java.util.jar.JarFile.MANIFEST_NAME; +import static java.util.logging.Level.WARNING; /** * Utility methods for deployment. diff --git a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/DummyApplication.java b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/DummyApplication.java index 9cca6b89d81..cf98dd9954e 100644 --- a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/DummyApplication.java +++ b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/DummyApplication.java @@ -16,9 +16,9 @@ package org.glassfish.deployment.common; +import org.glassfish.api.container.Container; import org.glassfish.api.deployment.ApplicationContainer; import org.glassfish.api.deployment.ApplicationContext; -import org.glassfish.api.container.Container; /** * A dummy implementation of ApplicationContainer class. diff --git a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/ModuleExploder.java b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/ModuleExploder.java index 9da5581d1f4..123d28ef62a 100644 --- a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/ModuleExploder.java +++ b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/ModuleExploder.java @@ -18,22 +18,24 @@ package org.glassfish.deployment.common; -import org.glassfish.api.deployment.archive.Archive; -import java.io.*; +import com.sun.enterprise.deploy.shared.FileArchive; +import com.sun.enterprise.util.i18n.StringManager; +import com.sun.enterprise.util.io.FileUtils; +import com.sun.enterprise.util.zip.ZipFile; +import com.sun.enterprise.util.zip.ZipFileException; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; import java.util.Enumeration; import java.util.Locale; -import java.util.jar.JarFile; import java.util.jar.JarEntry; -import java.util.logging.Logger; -import java.util.logging.LogRecord; +import java.util.jar.JarFile; import java.util.logging.Level; +import java.util.logging.LogRecord; +import java.util.logging.Logger; -import com.sun.enterprise.deploy.shared.FileArchive; -import com.sun.enterprise.util.zip.ZipFile; -import com.sun.enterprise.util.zip.ZipFileException; -import com.sun.enterprise.util.i18n.StringManager; -import com.sun.enterprise.util.io.FileUtils; - +import org.glassfish.api.deployment.archive.Archive; import org.glassfish.logging.annotation.LogMessageInfo; /** diff --git a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/NodeInfo.java b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/NodeInfo.java index 5ab77aff23e..cc6aea1d4ab 100644 --- a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/NodeInfo.java +++ b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/NodeInfo.java @@ -17,12 +17,18 @@ package org.glassfish.deployment.common; -import org.objectweb.asm.*; - -import java.util.List; import java.util.ArrayList; -import java.util.Set; import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.Attribute; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.FieldVisitor; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; import static org.objectweb.asm.Opcodes.ASM9; diff --git a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/RootDeploymentDescriptor.java b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/RootDeploymentDescriptor.java index 69ef86203f4..da1a6f916e1 100644 --- a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/RootDeploymentDescriptor.java +++ b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/RootDeploymentDescriptor.java @@ -23,11 +23,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.logging.Logger; import java.util.logging.Level; +import java.util.logging.Logger; import org.glassfish.api.deployment.archive.ArchiveType; - import org.glassfish.logging.annotation.LogMessageInfo; /** diff --git a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/SimpleDeployer.java b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/SimpleDeployer.java index 881c2a76877..870836aa51f 100644 --- a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/SimpleDeployer.java +++ b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/common/SimpleDeployer.java @@ -16,11 +16,10 @@ package org.glassfish.deployment.common; -import org.glassfish.api.deployment.DeploymentContext; - import org.glassfish.api.container.Container; import org.glassfish.api.deployment.ApplicationContainer; import org.glassfish.api.deployment.Deployer; +import org.glassfish.api.deployment.DeploymentContext; import org.glassfish.api.deployment.MetaData; import org.glassfish.api.deployment.OpsParams; diff --git a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/monitor/DeploymentLifecycleStatsProvider.java b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/monitor/DeploymentLifecycleStatsProvider.java index dd3736907bd..3e5694eb41f 100644 --- a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/monitor/DeploymentLifecycleStatsProvider.java +++ b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/monitor/DeploymentLifecycleStatsProvider.java @@ -16,10 +16,13 @@ package org.glassfish.deployment.monitor; +import java.util.HashMap; +import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.Map; -import java.util.HashMap; + +import org.glassfish.external.probe.provider.annotations.ProbeListener; +import org.glassfish.external.probe.provider.annotations.ProbeParam; import org.glassfish.external.statistics.CountStatistic; import org.glassfish.external.statistics.RangeStatistic; import org.glassfish.external.statistics.StringStatistic; @@ -27,7 +30,6 @@ import org.glassfish.external.statistics.impl.RangeStatisticImpl; import org.glassfish.external.statistics.impl.StatisticImpl; import org.glassfish.external.statistics.impl.StringStatisticImpl; -import org.glassfish.external.probe.provider.annotations.*; import org.glassfish.gmbal.AMXMetadata; import org.glassfish.gmbal.Description; import org.glassfish.gmbal.ManagedAttribute; diff --git a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/versioning/VersioningUtils.java b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/versioning/VersioningUtils.java index 1ee8d3b5da9..28e0fce7d77 100644 --- a/nucleus/deployment/common/src/main/java/org/glassfish/deployment/versioning/VersioningUtils.java +++ b/nucleus/deployment/common/src/main/java/org/glassfish/deployment/versioning/VersioningUtils.java @@ -18,6 +18,7 @@ package org.glassfish.deployment.versioning; import com.sun.enterprise.config.serverbeans.Application; + import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collections; diff --git a/nucleus/deployment/common/src/main/java/org/glassfish/loader/util/ASClassLoaderUtil.java b/nucleus/deployment/common/src/main/java/org/glassfish/loader/util/ASClassLoaderUtil.java index fbfed741371..a4cf41c895a 100644 --- a/nucleus/deployment/common/src/main/java/org/glassfish/loader/util/ASClassLoaderUtil.java +++ b/nucleus/deployment/common/src/main/java/org/glassfish/loader/util/ASClassLoaderUtil.java @@ -17,13 +17,9 @@ package org.glassfish.loader.util; -import static com.sun.enterprise.util.Utility.isEmpty; -import static com.sun.enterprise.util.io.FileUtils.isJar; -import static com.sun.enterprise.util.io.FileUtils.isZip; -import static java.io.File.pathSeparator; -import static java.io.File.separator; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.WARNING; +import com.sun.enterprise.deployment.deploy.shared.Util; +import com.sun.enterprise.module.HK2Module; +import com.sun.enterprise.module.ModulesRegistry; import java.io.File; import java.io.FileInputStream; @@ -53,9 +49,13 @@ import org.glassfish.internal.data.ApplicationRegistry; import org.glassfish.logging.annotation.LogMessageInfo; -import com.sun.enterprise.deployment.deploy.shared.Util; -import com.sun.enterprise.module.HK2Module; -import com.sun.enterprise.module.ModulesRegistry; +import static com.sun.enterprise.util.Utility.isEmpty; +import static com.sun.enterprise.util.io.FileUtils.isJar; +import static com.sun.enterprise.util.io.FileUtils.isZip; +import static java.io.File.pathSeparator; +import static java.io.File.separator; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.WARNING; public class ASClassLoaderUtil { From e2e2071322ea1b0a493dbbfa303b3126a49efcb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sat, 10 Aug 2024 23:14:47 +0200 Subject: [PATCH 11/40] Imports: flashlight modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../flashlight/FlashlightLoggerInfo.java | 1 + .../glassfish/flashlight/FlashlightUtils.java | 5 ++- .../flashlight/cli/DisableMonitoring.java | 28 +++++++----- .../flashlight/cli/EnableMonitoring.java | 30 ++++++++----- .../flashlight/cli/MonitoringConfig.java | 16 ++++--- .../client/EjbContainerListener.java | 4 +- .../client/EjbContainerProvider.java | 4 +- .../client/ProbeClientInvokerFactory.java | 8 ++-- .../client/ProbeClientMediator.java | 3 +- .../flashlight/client/ProbeListener.java | 2 +- .../impl/client/BtraceClientGenerator.java | 9 ++-- .../impl/client/DTraceClientInvoker.java | 6 ++- .../client/FlashlightProbeClientMediator.java | 5 ++- .../glassfish/flashlight/impl/client/Log.java | 2 + .../ProbeProviderClassFileTransformer.java | 22 +++++++--- .../impl/client/ReflectiveClientInvoker.java | 8 ++-- .../core/ComputedParamsHandlerManager.java | 6 +-- .../impl/core/FlashlightProbeProvider.java | 6 ++- .../flashlight/impl/core/ProbeFactory.java | 8 ++-- .../impl/core/ProbeProviderRegistry.java | 7 ++- .../core/ProviderSubClassImplGenerator.java | 17 ++++--- .../FlashlightProbeProviderFactory.java | 44 +++++++++++++------ .../flashlight/provider/FlashlightProbe.java | 23 +++++----- .../provider/ProbeProviderEventManager.java | 8 ++-- .../flashlight/provider/ProbeRegistry.java | 11 +++-- .../xml/ProbeProviderStaxParser.java | 33 +++++++++++--- .../glassfish/flashlight/xml/Provider.java | 2 +- .../glassfish/flashlight/xml/XmlProbe.java | 2 +- 28 files changed, 201 insertions(+), 119 deletions(-) diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/FlashlightLoggerInfo.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/FlashlightLoggerInfo.java index c431930c432..e261db84164 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/FlashlightLoggerInfo.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/FlashlightLoggerInfo.java @@ -17,6 +17,7 @@ package org.glassfish.flashlight; import java.util.logging.Logger; + import org.glassfish.logging.annotation.LogMessageInfo; import org.glassfish.logging.annotation.LogMessagesResourceBundle; import org.glassfish.logging.annotation.LoggerInfo; diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/FlashlightUtils.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/FlashlightUtils.java index 11e8d91dd33..484808b1bf2 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/FlashlightUtils.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/FlashlightUtils.java @@ -21,9 +21,10 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Method; -import java.util.*; -import java.util.logging.Logger; +import java.util.LinkedList; +import java.util.List; import java.util.logging.Level; +import java.util.logging.Logger; import org.glassfish.api.monitoring.DTraceContract; import org.glassfish.external.probe.provider.annotations.Probe; diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/DisableMonitoring.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/DisableMonitoring.java index 29604207dfc..de3c8d09a9a 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/DisableMonitoring.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/DisableMonitoring.java @@ -18,23 +18,29 @@ import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.MonitoringService; +import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.api.admin.*; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; + +import jakarta.inject.Inject; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.config.support.*; -import org.glassfish.internal.api.Target; -import org.jvnet.hk2.annotations.Service; - -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.config.serverbeans.MonitoringService; +import org.glassfish.api.admin.AccessRequired; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.AdminCommandSecurity; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.api.monitoring.ContainerMonitoring; +import org.glassfish.config.support.CommandTarget; +import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; - -import jakarta.inject.Inject; +import org.glassfish.internal.api.Target; +import org.jvnet.hk2.annotations.Service; /** * @author Sreenivas Munnangi (3.0) diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/EnableMonitoring.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/EnableMonitoring.java index 558076b8807..9d2bf7bc4b9 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/EnableMonitoring.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/EnableMonitoring.java @@ -18,23 +18,29 @@ import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.util.*; -import org.glassfish.api.admin.*; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; +import com.sun.enterprise.config.serverbeans.MonitoringService; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.config.support.*; +import org.glassfish.api.admin.AccessRequired; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.AdminCommandSecurity; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.config.support.CommandTarget; +import org.glassfish.config.support.TargetType; import org.glassfish.flashlight.impl.client.AgentAttacher; -import org.glassfish.internal.api.*; -import org.jvnet.hk2.annotations.Service; - import org.glassfish.hk2.api.PerLookup; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.config.serverbeans.MonitoringService; - -import jakarta.inject.Inject; +import org.glassfish.internal.api.Target; +import org.jvnet.hk2.annotations.Service; /** * @author Sreenivas Munnangi (3.0) diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/MonitoringConfig.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/MonitoringConfig.java index 845e6cd3de6..465119b9992 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/MonitoringConfig.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/MonitoringConfig.java @@ -17,17 +17,19 @@ package org.glassfish.flashlight.cli; import com.sun.enterprise.config.serverbeans.ModuleMonitoringLevels; -import org.glassfish.api.ActionReport; -import org.jvnet.hk2.annotations.Service; +import com.sun.enterprise.config.serverbeans.MonitoringService; import com.sun.enterprise.util.LocalStringManagerImpl; + import java.beans.PropertyVetoException; -import org.jvnet.hk2.config.TransactionFailure; -import org.jvnet.hk2.config.SingleConfigCode; -import org.jvnet.hk2.config.ConfigSupport; -import com.sun.enterprise.config.serverbeans.MonitoringService; +import java.util.concurrent.atomic.AtomicBoolean; + +import org.glassfish.api.ActionReport; import org.glassfish.api.monitoring.ContainerMonitoring; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.Dom; -import java.util.concurrent.atomic.AtomicBoolean; +import org.jvnet.hk2.config.SingleConfigCode; +import org.jvnet.hk2.config.TransactionFailure; /** * @author Sreenivas Munnangi diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/client/EjbContainerListener.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/client/EjbContainerListener.java index 0ef1052e06e..964d4cd5b31 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/client/EjbContainerListener.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/client/EjbContainerListener.java @@ -16,10 +16,10 @@ package org.glassfish.flashlight.client; -import org.glassfish.external.probe.provider.annotations.ProbeParam; - import java.lang.reflect.Method; +import org.glassfish.external.probe.provider.annotations.ProbeParam; + /** * @author Mahesh Kannan * Date: Jul 20, 2008 diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/client/EjbContainerProvider.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/client/EjbContainerProvider.java index 4578a21e649..7779be946d4 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/client/EjbContainerProvider.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/client/EjbContainerProvider.java @@ -16,11 +16,11 @@ package org.glassfish.flashlight.client; +import java.lang.reflect.Method; + import org.glassfish.external.probe.provider.annotations.Probe; import org.glassfish.external.probe.provider.annotations.ProbeParam; -import java.lang.reflect.Method; - /** * @author Mahesh Kannan * Date: Jul 20, 2008 diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/client/ProbeClientInvokerFactory.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/client/ProbeClientInvokerFactory.java index 706c584eba6..454feb6ae87 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/client/ProbeClientInvokerFactory.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/client/ProbeClientInvokerFactory.java @@ -16,15 +16,15 @@ package org.glassfish.flashlight.client; +import java.lang.reflect.Method; +import java.util.concurrent.atomic.AtomicInteger; + import org.glassfish.flashlight.FlashlightUtils; +import org.glassfish.flashlight.impl.client.DTraceClientInvoker; import org.glassfish.flashlight.impl.client.ReflectiveClientInvoker; import org.glassfish.flashlight.provider.FlashlightProbe; import org.jvnet.hk2.annotations.Service; -import java.lang.reflect.Method; -import java.util.concurrent.atomic.AtomicInteger; -import org.glassfish.flashlight.impl.client.DTraceClientInvoker; - /** * @author Mahesh Kannan */ diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/client/ProbeClientMediator.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/client/ProbeClientMediator.java index 698242dcff0..f4c072d7c7e 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/client/ProbeClientMediator.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/client/ProbeClientMediator.java @@ -17,12 +17,11 @@ package org.glassfish.flashlight.client; -import org.jvnet.hk2.annotations.Contract; - import java.util.Collection; import java.util.List; import org.glassfish.flashlight.provider.FlashlightProbe; +import org.jvnet.hk2.annotations.Contract; /** * @author Mahesh Kannan diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/client/ProbeListener.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/client/ProbeListener.java index 4882ad30ec2..2c6d7756439 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/client/ProbeListener.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/client/ProbeListener.java @@ -16,10 +16,10 @@ package org.glassfish.flashlight.client; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import java.lang.annotation.ElementType; /** * diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/BtraceClientGenerator.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/BtraceClientGenerator.java index e9fdc341128..86da6a3e30b 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/BtraceClientGenerator.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/BtraceClientGenerator.java @@ -23,6 +23,11 @@ * @author Byron Nevins, August 2009 */ import com.sun.enterprise.util.SystemPropertyConstants; + +import java.io.File; +import java.io.FileOutputStream; +import java.util.Collection; + import org.glassfish.flashlight.provider.FlashlightProbe; import org.glassfish.flashlight.provider.ProbeRegistry; import org.objectweb.asm.AnnotationVisitor; @@ -32,10 +37,6 @@ import org.objectweb.asm.commons.GeneratorAdapter; import org.objectweb.asm.commons.Method; -import java.io.File; -import java.io.FileOutputStream; -import java.util.Collection; - import static org.objectweb.asm.Opcodes.V11; public class BtraceClientGenerator { diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/DTraceClientInvoker.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/DTraceClientInvoker.java index d64b70dd6b6..464924b6a9d 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/DTraceClientInvoker.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/DTraceClientInvoker.java @@ -22,11 +22,13 @@ package org.glassfish.flashlight.impl.client; import java.lang.reflect.Method; -import java.util.logging.*; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.glassfish.flashlight.FlashlightLoggerInfo; import org.glassfish.flashlight.FlashlightUtils; import org.glassfish.flashlight.client.ProbeClientInvoker; import org.glassfish.flashlight.provider.FlashlightProbe; -import org.glassfish.flashlight.FlashlightLoggerInfo; /** * bnevins Aug 15, 2009 diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/FlashlightProbeClientMediator.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/FlashlightProbeClientMediator.java index d2f540597e3..2eba95efca2 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/FlashlightProbeClientMediator.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/FlashlightProbeClientMediator.java @@ -24,6 +24,7 @@ */ import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.reflect.ReflectUtils; + import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collection; @@ -33,9 +34,9 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; + import org.glassfish.external.probe.provider.annotations.ProbeListener; import org.glassfish.flashlight.FlashlightLoggerInfo; -import static org.glassfish.flashlight.FlashlightLoggerInfo.*; import org.glassfish.flashlight.FlashlightUtils; import org.glassfish.flashlight.client.ProbeClientInvoker; import org.glassfish.flashlight.client.ProbeClientInvokerFactory; @@ -47,6 +48,8 @@ import org.glassfish.hk2.api.PostConstruct; import org.jvnet.hk2.annotations.Service; +import static org.glassfish.flashlight.FlashlightLoggerInfo.BAD_TRANSFORM; + /** * @author Mahesh Kannan Date: Jan 27, 2008 * @author Byron Nevins, significant rewrite/refactor August 2009 diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/Log.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/Log.java index 75883d1e410..de98e69b3b5 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/Log.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/Log.java @@ -17,8 +17,10 @@ package org.glassfish.flashlight.impl.client; import com.sun.enterprise.util.Utility; + import java.util.logging.Level; import java.util.logging.Logger; + import org.glassfish.flashlight.FlashlightLoggerInfo; /** diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/ProbeProviderClassFileTransformer.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/ProbeProviderClassFileTransformer.java index e06ff7fbf8f..5419c2bb364 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/ProbeProviderClassFileTransformer.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/ProbeProviderClassFileTransformer.java @@ -30,22 +30,30 @@ import java.lang.reflect.Method; import java.security.ProtectionDomain; import java.util.HashMap; -import java.util.logging.Logger; -import java.util.logging.Level; import java.util.Map; import java.util.Set; import java.util.WeakHashMap; +import java.util.logging.Level; +import java.util.logging.Logger; import org.glassfish.flashlight.FlashlightLoggerInfo; -import static org.glassfish.flashlight.FlashlightLoggerInfo.*; -import static org.objectweb.asm.Opcodes.ASM9; - import org.glassfish.flashlight.provider.FlashlightProbe; import org.glassfish.flashlight.provider.ProbeRegistry; - -import org.objectweb.asm.*; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Type; import org.objectweb.asm.commons.AdviceAdapter; +import static org.glassfish.flashlight.FlashlightLoggerInfo.NO_ATTACH_API; +import static org.glassfish.flashlight.FlashlightLoggerInfo.NO_ATTACH_GET; +import static org.glassfish.flashlight.FlashlightLoggerInfo.REGISTRATION_ERROR; +import static org.glassfish.flashlight.FlashlightLoggerInfo.RETRANSFORMATION_ERROR; +import static org.glassfish.flashlight.FlashlightLoggerInfo.WRITE_ERROR; +import static org.objectweb.asm.Opcodes.ASM9; + /** * July 2012 Byron Nevins says: We no longer allow outsiders to create * instances. Summary of the problem solved: All of the diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/ReflectiveClientInvoker.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/ReflectiveClientInvoker.java index cdbc4909c23..ffa48adbb5e 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/ReflectiveClientInvoker.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/ReflectiveClientInvoker.java @@ -17,14 +17,14 @@ package org.glassfish.flashlight.impl.client; import java.lang.reflect.InvocationTargetException; -import org.glassfish.flashlight.client.ProbeClientInvoker; -import org.glassfish.flashlight.impl.core.ComputedParamsHandlerManager; -import org.glassfish.flashlight.provider.FlashlightProbe; - import java.lang.reflect.Method; import java.util.Arrays; import java.util.HashMap; + import org.glassfish.flashlight.FlashlightUtils; +import org.glassfish.flashlight.client.ProbeClientInvoker; +import org.glassfish.flashlight.impl.core.ComputedParamsHandlerManager; +import org.glassfish.flashlight.provider.FlashlightProbe; public class ReflectiveClientInvoker implements ProbeClientInvoker { diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/core/ComputedParamsHandlerManager.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/core/ComputedParamsHandlerManager.java index 7c4da11b02f..5ea7e2591d5 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/core/ComputedParamsHandlerManager.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/core/ComputedParamsHandlerManager.java @@ -16,10 +16,10 @@ package org.glassfish.flashlight.impl.core; -import org.jvnet.hk2.annotations.Service; - -import java.util.List; import java.util.ArrayList; +import java.util.List; + +import org.jvnet.hk2.annotations.Service; /** * @author Mahesh Kannan diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/core/FlashlightProbeProvider.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/core/FlashlightProbeProvider.java index 47064e6f648..8c5c3356a6e 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/core/FlashlightProbeProvider.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/core/FlashlightProbeProvider.java @@ -17,11 +17,13 @@ package org.glassfish.flashlight.impl.core; import com.sun.enterprise.util.ObjectAnalyzer; + +import java.util.Collection; +import java.util.concurrent.ConcurrentHashMap; + import org.glassfish.api.monitoring.ProbeInfo; import org.glassfish.api.monitoring.ProbeProviderInfo; import org.glassfish.flashlight.provider.FlashlightProbe; -import java.util.Collection; -import java.util.concurrent.ConcurrentHashMap; /** * Byron Nevins, October 2009 diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/core/ProbeFactory.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/core/ProbeFactory.java index 8ba76234178..92e7b9a3ddd 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/core/ProbeFactory.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/core/ProbeFactory.java @@ -16,14 +16,14 @@ package org.glassfish.flashlight.impl.core; -import org.glassfish.flashlight.provider.FlashlightProbe; -import org.glassfish.flashlight.provider.ProbeRegistry; - -import org.jvnet.hk2.annotations.Service; import jakarta.inject.Singleton; import java.util.concurrent.atomic.AtomicInteger; +import org.glassfish.flashlight.provider.FlashlightProbe; +import org.glassfish.flashlight.provider.ProbeRegistry; +import org.jvnet.hk2.annotations.Service; + /** * @author Mahesh Kannan */ diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/core/ProbeProviderRegistry.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/core/ProbeProviderRegistry.java index c9fe6f113b3..7652ab854ca 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/core/ProbeProviderRegistry.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/core/ProbeProviderRegistry.java @@ -16,8 +16,11 @@ package org.glassfish.flashlight.impl.core; -import java.util.*; -import java.util.concurrent.*; +import java.util.Collection; +import java.util.Collections; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + import org.glassfish.flashlight.FlashlightUtils; /** diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/core/ProviderSubClassImplGenerator.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/core/ProviderSubClassImplGenerator.java index 974e5745402..c910c8dd24e 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/core/ProviderSubClassImplGenerator.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/core/ProviderSubClassImplGenerator.java @@ -23,15 +23,22 @@ * Fixed a bunch of FindBugs problem, 2/2012, Byron Nevins */ import com.sun.enterprise.util.LocalStringManagerImpl; -import org.glassfish.flashlight.FlashlightLoggerInfo; -import java.security.*; -import org.objectweb.asm.*; import java.io.InputStream; +import java.security.AccessController; +import java.security.PrivilegedExceptionAction; import java.security.ProtectionDomain; -import java.util.logging.Logger; -import java.util.logging.Level; import java.util.concurrent.atomic.AtomicInteger; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.glassfish.flashlight.FlashlightLoggerInfo; +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; import static org.objectweb.asm.Opcodes.ASM9; diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/provider/FlashlightProbeProviderFactory.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/provider/FlashlightProbeProviderFactory.java index 77cb530b16a..986ec08e4b9 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/provider/FlashlightProbeProviderFactory.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/provider/FlashlightProbeProviderFactory.java @@ -17,33 +17,49 @@ package org.glassfish.flashlight.impl.provider; -import org.glassfish.external.probe.provider.annotations.*; -import org.glassfish.flashlight.xml.ProbeProviderStaxParser; import com.sun.enterprise.config.serverbeans.MonitoringService; import com.sun.enterprise.util.ObjectAnalyzer; + +import jakarta.inject.Inject; + import java.io.FileInputStream; import java.io.InputStream; -import java.util.*; -import org.glassfish.api.monitoring.DTraceContract; -import org.glassfish.flashlight.FlashlightLoggerInfo; -import static org.glassfish.flashlight.FlashlightLoggerInfo.*; -import org.glassfish.flashlight.FlashlightUtils; -import org.glassfish.flashlight.impl.client.FlashlightProbeClientMediator; -import org.glassfish.flashlight.provider.*; -import org.glassfish.flashlight.impl.core.*; -import org.glassfish.flashlight.provider.ProbeProviderFactory; -import org.jvnet.hk2.annotations.Service; - import java.lang.reflect.Method; import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.List; +import java.util.ResourceBundle; import java.util.logging.Level; import java.util.logging.Logger; + +import org.glassfish.api.monitoring.DTraceContract; +import org.glassfish.external.probe.provider.annotations.Probe; +import org.glassfish.external.probe.provider.annotations.ProbeProvider; +import org.glassfish.flashlight.FlashlightLoggerInfo; +import org.glassfish.flashlight.FlashlightUtils; +import org.glassfish.flashlight.impl.client.FlashlightProbeClientMediator; +import org.glassfish.flashlight.impl.core.FlashlightProbeProvider; +import org.glassfish.flashlight.impl.core.ProbeFactory; +import org.glassfish.flashlight.impl.core.ProbeProviderRegistry; +import org.glassfish.flashlight.impl.core.ProviderImplGenerator; +import org.glassfish.flashlight.impl.core.ProviderSubClassImplGenerator; +import org.glassfish.flashlight.provider.FlashlightProbe; +import org.glassfish.flashlight.provider.ProbeProviderEventListener; +import org.glassfish.flashlight.provider.ProbeProviderEventManager; +import org.glassfish.flashlight.provider.ProbeProviderFactory; +import org.glassfish.flashlight.provider.ProbeRegistry; +import org.glassfish.flashlight.xml.ProbeProviderStaxParser; import org.glassfish.hk2.api.PostConstruct; import org.glassfish.hk2.api.ServiceLocator; +import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; +import static org.glassfish.flashlight.FlashlightLoggerInfo.CANNOT_PROCESS_XML_PROBE_PROVIDER; +import static org.glassfish.flashlight.FlashlightLoggerInfo.CANNOT_RESOLVE_PROBE_PARAM_TYPES; +import static org.glassfish.flashlight.FlashlightLoggerInfo.CANNOT_RESOLVE_PROBE_PARAM_TYPES_FOR_PROBE; +import static org.glassfish.flashlight.FlashlightLoggerInfo.INVALID_PROBE_PROVIDER; +import static org.glassfish.flashlight.FlashlightLoggerInfo.UNREGISTER_PROBE_PROVIDER_EXCEPTION; /** * @author Mahesh Kannan diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/provider/FlashlightProbe.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/provider/FlashlightProbe.java index 6586fb8c043..ea88e94fc10 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/provider/FlashlightProbe.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/provider/FlashlightProbe.java @@ -16,24 +16,25 @@ package org.glassfish.flashlight.provider; +import com.sun.enterprise.util.LocalStringManagerImpl; + import java.lang.reflect.Method; import java.lang.reflect.Modifier; - -import java.util.*; -import org.glassfish.flashlight.client.ProbeClientInvoker; -import org.glassfish.flashlight.client.ProbeHandle; -import org.glassfish.flashlight.client.StatefulProbeClientInvoker; - -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.List; import java.util.ArrayList; -import java.util.logging.Logger; -import java.util.logging.Level; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.monitoring.ProbeInfo; -import com.sun.enterprise.util.LocalStringManagerImpl; import org.glassfish.flashlight.FlashlightLoggerInfo; +import org.glassfish.flashlight.client.ProbeClientInvoker; +import org.glassfish.flashlight.client.ProbeHandle; +import org.glassfish.flashlight.client.StatefulProbeClientInvoker; public class FlashlightProbe implements ProbeHandle, ProbeInfo{ diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/provider/ProbeProviderEventManager.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/provider/ProbeProviderEventManager.java index e83d56fe99b..26d18a97772 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/provider/ProbeProviderEventManager.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/provider/ProbeProviderEventManager.java @@ -16,12 +16,12 @@ package org.glassfish.flashlight.provider; -import org.jvnet.hk2.annotations.Service; - -import java.util.Collection; import java.util.ArrayList; -import java.util.Set; +import java.util.Collection; import java.util.HashSet; +import java.util.Set; + +import org.jvnet.hk2.annotations.Service; /** * @author Mahesh Kannan diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/provider/ProbeRegistry.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/provider/ProbeRegistry.java index 9668fc53bd7..711e2be87d4 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/provider/ProbeRegistry.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/provider/ProbeRegistry.java @@ -16,16 +16,15 @@ package org.glassfish.flashlight.provider; -import java.util.Collection; -import java.util.ArrayList; - -import org.glassfish.flashlight.impl.core.*; - -import org.jvnet.hk2.annotations.Service; import jakarta.inject.Singleton; +import java.util.ArrayList; +import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; +import org.glassfish.flashlight.impl.core.ProbeProviderRegistry; +import org.jvnet.hk2.annotations.Service; + /** * @author Mahesh Kannan * Date: Jul 20, 2008 diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/xml/ProbeProviderStaxParser.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/xml/ProbeProviderStaxParser.java index 24003010183..09b7c3ef894 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/xml/ProbeProviderStaxParser.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/xml/ProbeProviderStaxParser.java @@ -21,16 +21,39 @@ package org.glassfish.flashlight.xml; -import java.io.*; -import java.util.*; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import java.io.File; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; + import javax.xml.stream.XMLStreamException; -import static org.glassfish.flashlight.xml.XmlConstants.*; + import org.glassfish.flashlight.FlashlightLoggerInfo; -import static org.glassfish.flashlight.FlashlightLoggerInfo.*; -import com.sun.enterprise.util.LocalStringManagerImpl; + import static javax.xml.stream.XMLStreamConstants.END_DOCUMENT; +import static org.glassfish.flashlight.FlashlightLoggerInfo.NO_PROVIDER_IDENTIFIED_FROM_XML; +import static org.glassfish.flashlight.xml.XmlConstants.METHOD; +import static org.glassfish.flashlight.xml.XmlConstants.MODULE_NAME; +import static org.glassfish.flashlight.xml.XmlConstants.MODULE_PROVIDER_NAME; +import static org.glassfish.flashlight.xml.XmlConstants.PROBE; +import static org.glassfish.flashlight.xml.XmlConstants.PROBE_HIDDEN; +import static org.glassfish.flashlight.xml.XmlConstants.PROBE_NAME; +import static org.glassfish.flashlight.xml.XmlConstants.PROBE_PARAM; +import static org.glassfish.flashlight.xml.XmlConstants.PROBE_PARAM_NAME; +import static org.glassfish.flashlight.xml.XmlConstants.PROBE_PARAM_TYPE; +import static org.glassfish.flashlight.xml.XmlConstants.PROBE_PROFILE_NAMES; +import static org.glassfish.flashlight.xml.XmlConstants.PROBE_PROVIDER; +import static org.glassfish.flashlight.xml.XmlConstants.PROBE_PROVIDER_CLASS; +import static org.glassfish.flashlight.xml.XmlConstants.PROBE_PROVIDER_NAME; +import static org.glassfish.flashlight.xml.XmlConstants.PROBE_SELF; +import static org.glassfish.flashlight.xml.XmlConstants.PROBE_STATEFUL; +import static org.glassfish.flashlight.xml.XmlConstants.PROBE_STATEFUL_EXCEPTION; +import static org.glassfish.flashlight.xml.XmlConstants.PROBE_STATEFUL_RETURN; /** * Read the XML file, parse it and return a list of ProbeProvider objects diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/xml/Provider.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/xml/Provider.java index 2066ea457e4..fae8812823c 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/xml/Provider.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/xml/Provider.java @@ -21,7 +21,7 @@ package org.glassfish.flashlight.xml; -import java.util.*; +import java.util.List; /** * diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/xml/XmlProbe.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/xml/XmlProbe.java index 6d828b67b2f..5a64f42d15c 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/xml/XmlProbe.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/xml/XmlProbe.java @@ -21,7 +21,7 @@ package org.glassfish.flashlight.xml; -import java.util.*; +import java.util.List; /** * From c94917984a438844fc0126c0199f151909ded129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sat, 10 Aug 2024 23:29:21 +0200 Subject: [PATCH 12/40] Imports: EJB modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../com/sun/ejb/portable/EJBMetaDataImpl.java | 10 +++- .../sun/ejb/portable/HandleDelegateUtil.java | 6 +-- .../java/com/sun/ejb/portable/HandleImpl.java | 12 +++-- .../com/sun/ejb/portable/HomeHandleImpl.java | 14 ++++-- .../sun/ejb/portable/ObjrefEnumeration.java | 5 +- .../ejb/config/EjbContainerAvailability.java | 14 +++--- .../glassfish/ejb/config/EjbTimerService.java | 16 +++---- .../glassfish/ejb/config/MdbContainer.java | 4 +- .../ejb/deployment/archive/EjbSniffer.java | 16 +++---- .../java/com/sun/ejb/ComponentContext.java | 5 +- .../src/main/java/com/sun/ejb/Container.java | 8 ++-- .../main/java/com/sun/ejb/InvocationInfo.java | 5 +- .../main/java/com/sun/ejb/MethodLockInfo.java | 3 +- .../base/container/util/CacheProperties.java | 9 ++-- .../base/io/EJBObjectInputStreamHandler.java | 5 +- .../base/sfsb/util/ScrambledKeyGenerator.java | 4 +- .../base/sfsb/util/SimpleKeyGenerator.java | 1 + .../HAStatefulSessionStoreStatsImpl.java | 5 +- .../stats/StatefulSessionStoreStatsImpl.java | 7 ++- .../com/sun/ejb/base/stats/StatsImpl.java | 5 +- .../ejb/codegen/StaticRmiStubGenerator.java | 34 ++++++++------ .../AbstractSingletonContainer.java | 24 +++++----- .../ejb/containers/BMCSingletonContainer.java | 8 ++-- .../ejb/containers/BaseContainerFactory.java | 2 + .../ejb/containers/CMCSingletonContainer.java | 16 ++++--- .../containers/ContainerSynchronization.java | 14 +++--- .../containers/EJBContainerStateManager.java | 4 +- .../com/sun/ejb/containers/EJBHomeImpl.java | 21 +++++---- .../ejb/containers/EJBLocalObjectImpl.java | 12 ++--- .../ejb/containers/EJBLocalRemoteObject.java | 4 +- .../com/sun/ejb/containers/EJBObjectImpl.java | 12 ++--- .../EJBObjectInvocationHandler.java | 18 ++++--- .../EJBTimerServiceConfigListener.java | 8 ++-- .../containers/EJBTimerServiceWrapper.java | 22 ++++----- .../containers/EjbAsyncInvocationManager.java | 24 +++++++--- .../com/sun/ejb/containers/EjbAsyncTask.java | 7 ++- .../ejb/containers/EjbEndpointFacadeImpl.java | 12 ++--- .../com/sun/ejb/containers/EjbFutureTask.java | 4 +- .../ejb/containers/EjbIiopServiceImpl.java | 3 +- .../ejb/containers/EjbRemoteFutureTask.java | 14 +++--- .../ejb/containers/EjbThreadPoolExecutor.java | 6 ++- .../sun/ejb/containers/GenericEJBHome.java | 1 + .../ejb/containers/InvocationHandlerUtil.java | 6 +-- .../JavaGlobalJndiNamingObjectProxy.java | 4 +- .../RemoteBusinessObjectFactory.java | 10 ++-- .../containers/RemoteBusinessWrapperBase.java | 9 ++-- .../sun/ejb/containers/RuntimeTimerState.java | 13 +++-- .../SFSBTxCheckpointCoordinator.java | 7 +-- .../ejb/containers/SessionContextImpl.java | 10 ++-- .../SimpleEjbResourceHandlerImpl.java | 5 +- .../containers/SingletonContainerFactory.java | 2 + .../containers/StatefulContainerFactory.java | 25 +++++----- .../containers/StatelessContainerFactory.java | 2 + .../containers/StatelessSessionContainer.java | 32 ++++++------- .../com/sun/ejb/containers/TimerWrapper.java | 21 ++++----- .../CallbackInvocationContext.java | 16 +++---- .../InterceptorInvocationHandler.java | 12 ++--- .../JavaEEInterceptorBuilderImpl.java | 4 +- .../containers/util/cache/LruEJBCache.java | 5 +- .../util/cache/NRUSessionCache.java | 4 +- .../containers/util/pool/AbstractPool.java | 14 +++--- .../containers/util/pool/NonBlockingPool.java | 12 ++--- .../probes/EjbCacheProbeProvider.java | 4 +- .../probes/EjbMonitoringProbeProvider.java | 4 +- .../probes/EjbPoolProbeProvider.java | 4 +- .../probes/EjbTimedObjectProbeProvider.java | 3 +- .../stats/EjbCacheStatsProvider.java | 18 ++++--- .../stats/EjbMethodStatsProvider.java | 14 ++++-- .../stats/EjbMonitoringStatsProvider.java | 17 ++++--- .../monitoring/stats/EjbMonitoringUtils.java | 5 +- .../stats/EjbPoolStatsProvider.java | 18 ++++--- .../stats/EjbTimedObjectStatsProvider.java | 15 +++--- .../stats/SingletonBeanStatsProvider.java | 3 +- .../StatefulSessionBeanStatsProvider.java | 13 +++-- .../StatelessSessionBeanStatsProvider.java | 9 ++-- .../java/org/glassfish/ejb/LogFacade.java | 6 +-- .../glassfish/ejb/admin/cli/ListTimers.java | 11 +++-- .../ejb/admin/cli/MigrateTimers.java | 15 +++--- .../handlers/AbstractAttributeHandler.java | 11 +++-- .../handlers/AccessTimeoutHandler.java | 18 +++---- .../handlers/AfterBeginHandler.java | 10 ++-- .../handlers/AfterCompletionHandler.java | 10 ++-- .../handlers/AroundConstructHandler.java | 13 ++--- .../handlers/AroundInvokeHandler.java | 10 ++-- .../handlers/AroundTimeoutHandler.java | 5 +- .../handlers/AsynchronousHandler.java | 16 ++++--- .../handlers/BeforeCompletionHandler.java | 10 ++-- .../ConcurrencyManagementHandler.java | 8 ++-- .../ExcludeDefaultInterceptorsHandler.java | 8 ++-- .../annotation/handlers/InitHandler.java | 10 ++-- .../handlers/PostActivateHandler.java | 10 ++-- .../handlers/PrePassivateHandler.java | 10 ++-- .../annotation/handlers/RemoveHandler.java | 8 ++-- .../annotation/handlers/ScheduleHandler.java | 16 ++++--- .../annotation/handlers/SchedulesHandler.java | 8 ++-- .../annotation/handlers/SingletonHandler.java | 5 +- .../annotation/handlers/StatefulHandler.java | 3 +- .../handlers/StatefulTimeoutHandler.java | 6 ++- .../annotation/handlers/StatelessHandler.java | 3 +- .../annotation/handlers/TimeoutHandler.java | 6 ++- .../TransactionManagementHandler.java | 6 ++- .../ActivationConfigDescriptor.java | 5 +- .../ConcurrentMethodDescriptor.java | 3 +- .../InterceptorBindingDescriptor.java | 3 +- .../descriptor/QueryDescriptor.java | 5 +- .../MdbConnectionFactoryDescriptor.java | 1 + .../deployment/node/ActivationConfigNode.java | 7 +-- .../ejb/deployment/node/AroundInvokeNode.java | 5 +- .../ejb/deployment/node/CmpFieldNode.java | 3 +- .../ejb/deployment/node/EjbRelationNode.java | 5 +- .../ejb/deployment/node/EjbSessionNode.java | 22 ++++++++- .../ejb/deployment/node/ExcludeListNode.java | 1 + .../node/InterceptorBindingNode.java | 6 +-- .../ejb/deployment/node/TimeoutValueNode.java | 5 +- .../node/runtime/BeanCacheNode.java | 5 +- .../deployment/node/runtime/BeanPoolNode.java | 5 +- .../deployment/node/runtime/FinderNode.java | 5 +- .../node/runtime/GFEjbBundleRuntimeNode.java | 5 +- .../runtime/MDBConnectionFactoryNode.java | 5 +- .../deployment/node/runtime/PMInUseNode.java | 5 +- .../ejb/embedded/DeploymentElement.java | 15 +++--- .../ejb/embedded/EJBContainerImpl.java | 19 ++++---- .../embedded/EJBContainerProviderImpl.java | 47 +++++++++++-------- ...EjbSecurityComponentInvocationHandler.java | 14 +++--- .../ejb/startup/EjbContainerStarter.java | 6 ++- .../startup/SingletonLifeCycleManager.java | 9 ++-- .../ejb/upgrade/EJBTimerServiceUpgrade.java | 13 ++--- .../test/java/com/sun/ejb/EJBUtilsTest.java | 2 + ...EjbClassGeneratorFactoryBenchmarkTest.java | 12 ++--- .../containers/EjbContainerUtilImplTest.java | 12 ++--- .../ejb/mdb/MessageBeanContainerFactory.java | 8 ++-- .../ejb/mdb/MessageBeanContextImpl.java | 4 +- .../ejb/mdb/MessageBeanListenerImpl.java | 4 +- .../handlers/MessageDrivenHandler.java | 12 +++-- .../stats/MessageDrivenBeanStatsProvider.java | 13 +++-- .../timer/DistributedEJBTimerService.java | 18 +++---- .../ejb/persistent/timer/TimerBean.java | 40 ++++++++-------- .../ejb/persistent/timer/TimerLocal.java | 12 ++--- .../ejb/persistent/timer/TimerState.java | 14 +++--- .../org/glassfish/ejb/api/EJBInvocation.java | 4 +- .../ejb/api/EjbContainerServices.java | 4 +- .../ejb/api/MessageBeanProtocolManager.java | 6 +-- .../ejb/api/ResourcesExceededException.java | 2 +- .../ejb/spi/EjbContainerInterceptor.java | 4 +- .../ejb/spi/MessageBeanClientFactory.java | 1 + .../ejb/spi/WSEjbEndpointRegistry.java | 5 +- .../sun/ejb/timers/TimerWelcomeServlet.java | 16 ++++--- 147 files changed, 813 insertions(+), 610 deletions(-) diff --git a/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/EJBMetaDataImpl.java b/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/EJBMetaDataImpl.java index 7aae2ad8409..82ae2da86f5 100644 --- a/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/EJBMetaDataImpl.java +++ b/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/EJBMetaDataImpl.java @@ -15,8 +15,14 @@ */ package com.sun.ejb.portable; -import java.io.*; -import jakarta.ejb.*; +import jakarta.ejb.EJBHome; +import jakarta.ejb.HomeHandle; + +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; + import javax.rmi.PortableRemoteObject; /** diff --git a/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/HandleDelegateUtil.java b/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/HandleDelegateUtil.java index 1efb58be903..7a7bef832ac 100644 --- a/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/HandleDelegateUtil.java +++ b/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/HandleDelegateUtil.java @@ -16,15 +16,15 @@ package com.sun.ejb.portable; -import java.util.Properties; +import jakarta.ejb.spi.HandleDelegate; + import java.io.FileInputStream; import java.io.IOException; +import java.util.Properties; import javax.naming.InitialContext; import javax.naming.NamingException; -import jakarta.ejb.spi.HandleDelegate; - /** * Common code for looking up the java:comp/HandleDelegate. * diff --git a/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/HandleImpl.java b/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/HandleImpl.java index 3c191e4734e..1f074ee571e 100644 --- a/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/HandleImpl.java +++ b/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/HandleImpl.java @@ -16,11 +16,17 @@ package com.sun.ejb.portable; -import java.io.*; +import jakarta.ejb.EJBException; +import jakarta.ejb.EJBObject; +import jakarta.ejb.Handle; +import jakarta.ejb.spi.HandleDelegate; + +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; import java.rmi.RemoteException; -import jakarta.ejb.*; -import jakarta.ejb.spi.HandleDelegate; import javax.naming.NamingException; /** diff --git a/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/HomeHandleImpl.java b/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/HomeHandleImpl.java index 2cadd80362f..eced37a9161 100644 --- a/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/HomeHandleImpl.java +++ b/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/HomeHandleImpl.java @@ -15,12 +15,18 @@ */ package com.sun.ejb.portable; -import java.io.*; +import jakarta.ejb.EJBException; +import jakarta.ejb.EJBHome; +import jakarta.ejb.HomeHandle; +import jakarta.ejb.spi.HandleDelegate; + +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; import java.rmi.RemoteException; -import jakarta.ejb.*; -import jakarta.ejb.spi.HandleDelegate; -import javax.naming.*; +import javax.naming.NamingException; /** * A portable implementation of HomeHandle using the HandleDelegate SPI. This class can potentially be instantiated in diff --git a/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/ObjrefEnumeration.java b/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/ObjrefEnumeration.java index d0d806ef669..325a8c3e910 100644 --- a/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/ObjrefEnumeration.java +++ b/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/ObjrefEnumeration.java @@ -15,8 +15,11 @@ */ package com.sun.ejb.portable; -import java.util.*; import java.io.Serializable; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.List; +import java.util.NoSuchElementException; /** * This class is necessary because neither Vector nor Hashtable return a Serializable Enumeration, which can be sent diff --git a/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/config/EjbContainerAvailability.java b/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/config/EjbContainerAvailability.java index 30d195a5951..20e42425798 100644 --- a/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/config/EjbContainerAvailability.java +++ b/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/config/EjbContainerAvailability.java @@ -16,19 +16,19 @@ package org.glassfish.ejb.config; -import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.Element; -import org.jvnet.hk2.config.Configured; -import org.jvnet.hk2.config.ConfigBeanProxy; -import org.jvnet.hk2.config.types.Property; -import org.jvnet.hk2.config.types.PropertyBag; +import com.sun.enterprise.config.serverbeans.AvailabilityServiceExtension; import java.beans.PropertyVetoException; import java.util.List; import org.glassfish.api.admin.config.PropertiesDesc; import org.glassfish.quality.ToDo; -import com.sun.enterprise.config.serverbeans.AvailabilityServiceExtension; +import org.jvnet.hk2.config.Attribute; +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Configured; +import org.jvnet.hk2.config.Element; +import org.jvnet.hk2.config.types.Property; +import org.jvnet.hk2.config.types.PropertyBag; /* @XmlType(name = "", propOrder = { diff --git a/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/config/EjbTimerService.java b/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/config/EjbTimerService.java index f5660e5754c..5b5799036c7 100644 --- a/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/config/EjbTimerService.java +++ b/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/config/EjbTimerService.java @@ -16,21 +16,19 @@ package org.glassfish.ejb.config; -import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.ConfigBeanProxy; -import org.jvnet.hk2.config.Configured; -import org.jvnet.hk2.config.Element; -import org.jvnet.hk2.config.types.Property; -import org.jvnet.hk2.config.types.PropertyBag; +import jakarta.validation.constraints.Min; import java.beans.PropertyVetoException; import java.util.List; import org.glassfish.api.admin.config.PropertiesDesc; - import org.glassfish.quality.ToDo; - -import jakarta.validation.constraints.Min; +import org.jvnet.hk2.config.Attribute; +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Configured; +import org.jvnet.hk2.config.Element; +import org.jvnet.hk2.config.types.Property; +import org.jvnet.hk2.config.types.PropertyBag; /** diff --git a/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/config/MdbContainer.java b/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/config/MdbContainer.java index a9b1717e4ca..fe0a97ba039 100644 --- a/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/config/MdbContainer.java +++ b/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/config/MdbContainer.java @@ -17,6 +17,8 @@ package org.glassfish.ejb.config; +import jakarta.validation.constraints.Min; + import java.beans.PropertyVetoException; import java.util.List; @@ -31,8 +33,6 @@ import org.jvnet.hk2.config.types.Property; import org.jvnet.hk2.config.types.PropertyBag; -import jakarta.validation.constraints.Min; - @Configured public interface MdbContainer extends ConfigBeanProxy, PropertyBag, ConfigExtension { diff --git a/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/deployment/archive/EjbSniffer.java b/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/deployment/archive/EjbSniffer.java index 02007280ea9..9ae9e564683 100644 --- a/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/deployment/archive/EjbSniffer.java +++ b/appserver/ejb/ejb-connector/src/main/java/org/glassfish/ejb/deployment/archive/EjbSniffer.java @@ -16,20 +16,18 @@ package org.glassfish.ejb.deployment.archive; -import org.glassfish.internal.deployment.GenericSniffer; - -import org.glassfish.api.deployment.archive.ReadableArchive; -import org.glassfish.api.deployment.archive.ArchiveType; - - -import org.jvnet.hk2.annotations.Service; import jakarta.inject.Inject; import jakarta.inject.Singleton; import java.io.IOException; -import java.util.List; -import java.util.ArrayList; import java.lang.annotation.Annotation; +import java.util.ArrayList; +import java.util.List; + +import org.glassfish.api.deployment.archive.ArchiveType; +import org.glassfish.api.deployment.archive.ReadableArchive; +import org.glassfish.internal.deployment.GenericSniffer; +import org.jvnet.hk2.annotations.Service; /** * Implementation of the Sniffer for the Ejb container. diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/ComponentContext.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/ComponentContext.java index 1b2b13763cc..7dd8286b791 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/ComponentContext.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/ComponentContext.java @@ -16,11 +16,12 @@ package com.sun.ejb; -import org.glassfish.api.invocation.ResourceHandler; - import jakarta.transaction.Transaction; + import java.util.List; +import org.glassfish.api.invocation.ResourceHandler; + /** * The ComponentContext contains context information about an EJB instance. * EJBContextImpl implements ComponentContext in addition to EJBContext. diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/Container.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/Container.java index 59523c6ab20..c38359a1c9f 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/Container.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/Container.java @@ -17,10 +17,6 @@ package com.sun.ejb; -import java.rmi.Remote; - -import javax.naming.spi.NamingManager; - import com.sun.enterprise.security.SecurityManager; import jakarta.ejb.CreateException; @@ -33,6 +29,10 @@ import jakarta.ejb.FinderException; import jakarta.transaction.TransactionManager; +import java.rmi.Remote; + +import javax.naming.spi.NamingManager; + import org.glassfish.api.invocation.ComponentInvocation; import org.glassfish.ejb.deployment.descriptor.EjbDescriptor; import org.glassfish.enterprise.iiop.api.ProtocolManager; diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/InvocationInfo.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/InvocationInfo.java index a7896019d18..c64cabd7dda 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/InvocationInfo.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/InvocationInfo.java @@ -16,10 +16,11 @@ package com.sun.ejb; -import java.lang.reflect.Method; - import com.sun.ejb.containers.interceptors.InterceptorManager; import com.sun.enterprise.security.ee.authorize.cache.CachedPermission; + +import java.lang.reflect.Method; + import org.glassfish.ejb.deployment.descriptor.EjbRemovalInfo; /** diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/MethodLockInfo.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/MethodLockInfo.java index d8eecf93b53..c0d145a6fef 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/MethodLockInfo.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/MethodLockInfo.java @@ -16,9 +16,10 @@ package com.sun.ejb; -import java.util.concurrent.TimeUnit; import jakarta.ejb.LockType; +import java.util.concurrent.TimeUnit; + /** * MethodLockInfo caches various attributes of lock attributes * diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/container/util/CacheProperties.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/container/util/CacheProperties.java index 81ff5a0968f..3f1b9e2c8bc 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/container/util/CacheProperties.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/container/util/CacheProperties.java @@ -16,13 +16,15 @@ package com.sun.ejb.base.container.util; -import java.util.concurrent.TimeUnit; -import java.util.logging.Logger; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.logging.LogDomains; import jakarta.inject.Inject; import jakarta.inject.Named; -import com.sun.logging.LogDomains; +import java.util.concurrent.TimeUnit; +import java.util.logging.Logger; + import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.ejb.config.EjbContainer; import org.glassfish.ejb.deployment.descriptor.EjbDescriptor; @@ -30,7 +32,6 @@ import org.glassfish.ejb.deployment.descriptor.runtime.BeanCacheDescriptor; import org.glassfish.ejb.deployment.descriptor.runtime.IASEjbExtraDescriptors; import org.glassfish.hk2.api.PostConstruct; -import com.sun.enterprise.config.serverbeans.Config; import org.jvnet.hk2.annotations.Service; /** diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/io/EJBObjectInputStreamHandler.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/io/EJBObjectInputStreamHandler.java index e31c6020bb8..1e776bbb836 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/io/EJBObjectInputStreamHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/io/EJBObjectInputStreamHandler.java @@ -16,12 +16,11 @@ package com.sun.ejb.base.io; -import com.sun.enterprise.container.common.spi.util.SerializableObjectFactory; import com.sun.enterprise.container.common.spi.util.GlassFishInputStreamHandler; - +import com.sun.enterprise.container.common.spi.util.SerializableObjectFactory; import com.sun.logging.LogDomains; -import java.io.*; +import java.io.IOException; import java.rmi.Remote; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/sfsb/util/ScrambledKeyGenerator.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/sfsb/util/ScrambledKeyGenerator.java index 8b6d520acc7..043f9eda714 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/sfsb/util/ScrambledKeyGenerator.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/sfsb/util/ScrambledKeyGenerator.java @@ -17,10 +17,10 @@ package com.sun.ejb.base.sfsb.util; -import org.glassfish.security.common.SharedSecureRandomImpl; - import com.sun.enterprise.util.Utility; +import org.glassfish.security.common.SharedSecureRandomImpl; + /** * A utility class that generates stateful session keys using two longs * The session id generated by this class is guarenteed to be unique as diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/sfsb/util/SimpleKeyGenerator.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/sfsb/util/SimpleKeyGenerator.java index 676527a139d..99bf3607cee 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/sfsb/util/SimpleKeyGenerator.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/sfsb/util/SimpleKeyGenerator.java @@ -18,6 +18,7 @@ import com.sun.ejb.spi.sfsb.util.SFSBUUIDUtil; import com.sun.enterprise.util.Utility; + import org.glassfish.ha.store.util.KeyTransformer; /** diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/stats/HAStatefulSessionStoreStatsImpl.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/stats/HAStatefulSessionStoreStatsImpl.java index 8498bed3f94..4c26355ac04 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/stats/HAStatefulSessionStoreStatsImpl.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/stats/HAStatefulSessionStoreStatsImpl.java @@ -16,16 +16,15 @@ package com.sun.ejb.base.stats; -import org.glassfish.j2ee.statistics.CountStatistic; - import com.sun.ejb.spi.stats.MonitorableSFSBStoreManager; - import com.sun.enterprise.admin.monitor.stats.AverageRangeStatistic; import com.sun.enterprise.admin.monitor.stats.BoundedRangeStatisticImpl; import com.sun.enterprise.admin.monitor.stats.CountStatisticImpl; import com.sun.enterprise.admin.monitor.stats.MutableAverageRangeStatisticImpl; import com.sun.enterprise.admin.monitor.stats.MutableCountStatisticImpl; +import org.glassfish.j2ee.statistics.CountStatistic; + /** * Implementation of StatefulSessionStoreStats * There is once instance of this class per StatefulEJBContainer diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/stats/StatefulSessionStoreStatsImpl.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/stats/StatefulSessionStoreStatsImpl.java index 30cd2f1656e..6a89eb97178 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/stats/StatefulSessionStoreStatsImpl.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/stats/StatefulSessionStoreStatsImpl.java @@ -16,11 +16,7 @@ package com.sun.ejb.base.stats; -import org.glassfish.j2ee.statistics.CountStatistic; -import org.glassfish.j2ee.statistics.RangeStatistic; - import com.sun.ejb.spi.stats.MonitorableSFSBStoreManager; - import com.sun.enterprise.admin.monitor.stats.AverageRangeStatistic; import com.sun.enterprise.admin.monitor.stats.BoundedRangeStatisticImpl; import com.sun.enterprise.admin.monitor.stats.CountStatisticImpl; @@ -28,6 +24,9 @@ import com.sun.enterprise.admin.monitor.stats.MutableBoundedRangeStatisticImpl; import com.sun.enterprise.admin.monitor.stats.MutableCountStatisticImpl; +import org.glassfish.j2ee.statistics.CountStatistic; +import org.glassfish.j2ee.statistics.RangeStatistic; + /** * Implementation of StatefulSessionStoreStats * There is once instance of this class per StatefulEJBContainer diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/stats/StatsImpl.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/stats/StatsImpl.java index 16432482755..cc2d7684645 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/stats/StatsImpl.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/base/stats/StatsImpl.java @@ -16,14 +16,15 @@ package com.sun.ejb.base.stats; -import com.sun.enterprise.admin.monitor.stats.GenericStatsImpl; import com.sun.ejb.containers.EjbContainerUtilImpl; +import com.sun.enterprise.admin.monitor.stats.GenericStatsImpl; + +import java.util.logging.Logger; import org.glassfish.j2ee.statistics.BoundedRangeStatistic; import org.glassfish.j2ee.statistics.CountStatistic; import org.glassfish.j2ee.statistics.Statistic; import org.glassfish.j2ee.statistics.Stats; -import java.util.logging.Logger; /** * Base class for all the StatsImpl. Also provides a couple diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/codegen/StaticRmiStubGenerator.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/codegen/StaticRmiStubGenerator.java index 5be4c227262..899b7ad506d 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/codegen/StaticRmiStubGenerator.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/codegen/StaticRmiStubGenerator.java @@ -17,27 +17,33 @@ package com.sun.ejb.codegen; -import java.io.*; -import java.util.*; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.glassfish.api.deployment.DeploymentContext; -import org.glassfish.deployment.common.ClientArtifactsManager; -import org.glassfish.ejb.spi.CMPDeployer; -import org.glassfish.hk2.api.ServiceLocator; - -import com.sun.enterprise.util.i18n.StringManager; -import com.sun.logging.LogDomains; - import com.sun.enterprise.config.serverbeans.JavaConfig; import com.sun.enterprise.deployment.Application; -import com.sun.enterprise.deployment.EjbDescriptor; import com.sun.enterprise.deployment.EjbBundleDescriptor; +import com.sun.enterprise.deployment.EjbDescriptor; import com.sun.enterprise.deployment.util.TypeUtil; import com.sun.enterprise.util.JDK; import com.sun.enterprise.util.OS; +import com.sun.enterprise.util.i18n.StringManager; +import com.sun.logging.LogDomains; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.StringTokenizer; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.api.deployment.DeploymentContext; +import org.glassfish.deployment.common.ClientArtifactsManager; +import org.glassfish.ejb.spi.CMPDeployer; +import org.glassfish.hk2.api.ServiceLocator; /** * This class is used to generate the RMI-IIOP version of a diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/AbstractSingletonContainer.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/AbstractSingletonContainer.java index b202c6c6ceb..d3b32eafd2b 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/AbstractSingletonContainer.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/AbstractSingletonContainer.java @@ -17,17 +17,6 @@ package com.sun.ejb.containers; -import java.lang.reflect.Method; -import java.rmi.RemoteException; -import java.util.Set; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.logging.Level; -import jakarta.ejb.CreateException; -import jakarta.ejb.EJBException; -import jakarta.ejb.NoSuchEJBException; -import jakarta.ejb.NoSuchObjectLocalException; -import jakarta.ejb.RemoveException; - import com.sun.ejb.ComponentContext; import com.sun.ejb.Container; import com.sun.ejb.EjbInvocation; @@ -41,6 +30,19 @@ import com.sun.enterprise.deployment.MethodDescriptor; import com.sun.enterprise.security.SecurityManager; import com.sun.enterprise.util.Utility; + +import jakarta.ejb.CreateException; +import jakarta.ejb.EJBException; +import jakarta.ejb.NoSuchEJBException; +import jakarta.ejb.NoSuchObjectLocalException; +import jakarta.ejb.RemoveException; + +import java.lang.reflect.Method; +import java.rmi.RemoteException; +import java.util.Set; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.logging.Level; + import org.glassfish.api.invocation.ComponentInvocation; import org.glassfish.ejb.deployment.descriptor.EjbDescriptor; import org.glassfish.ejb.startup.SingletonLifeCycleManager; diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/BMCSingletonContainer.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/BMCSingletonContainer.java index 260dcea2b30..ae040520d6c 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/BMCSingletonContainer.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/BMCSingletonContainer.java @@ -17,14 +17,14 @@ package com.sun.ejb.containers; -import java.util.concurrent.atomic.AtomicInteger; - -import org.glassfish.ejb.deployment.descriptor.EjbDescriptor; - import com.sun.ejb.ComponentContext; import com.sun.ejb.EjbInvocation; import com.sun.enterprise.security.SecurityManager; +import java.util.concurrent.atomic.AtomicInteger; + +import org.glassfish.ejb.deployment.descriptor.EjbDescriptor; + /** * @author Mahesh Kannan */ diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/BaseContainerFactory.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/BaseContainerFactory.java index 9424fd7a502..ab0877f0851 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/BaseContainerFactory.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/BaseContainerFactory.java @@ -17,7 +17,9 @@ package com.sun.ejb.containers; import com.sun.enterprise.security.SecurityManager; + import jakarta.inject.Inject; + import org.glassfish.ejb.deployment.descriptor.EjbDescriptor; import org.glassfish.ejb.security.application.EJBSecurityManager; import org.glassfish.ejb.security.factory.EJBSecurityManagerFactory; diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/CMCSingletonContainer.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/CMCSingletonContainer.java index 5518e61827d..954268cd077 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/CMCSingletonContainer.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/CMCSingletonContainer.java @@ -16,18 +16,20 @@ package com.sun.ejb.containers; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantReadWriteLock; -import jakarta.ejb.ConcurrentAccessException; -import jakarta.ejb.ConcurrentAccessTimeoutException; -import jakarta.ejb.IllegalLoopbackException; -import jakarta.ejb.LockType; - import com.sun.ejb.ComponentContext; import com.sun.ejb.EjbInvocation; import com.sun.ejb.InvocationInfo; import com.sun.ejb.MethodLockInfo; import com.sun.enterprise.security.SecurityManager; + +import jakarta.ejb.ConcurrentAccessException; +import jakarta.ejb.ConcurrentAccessTimeoutException; +import jakarta.ejb.IllegalLoopbackException; +import jakarta.ejb.LockType; + +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantReadWriteLock; + import org.glassfish.ejb.deployment.descriptor.EjbDescriptor; /** diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/ContainerSynchronization.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/ContainerSynchronization.java index e6d0ad7264b..ef45691bca5 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/ContainerSynchronization.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/ContainerSynchronization.java @@ -16,6 +16,13 @@ package com.sun.ejb.containers; +import com.sun.logging.LogDomains; + +import jakarta.ejb.EJBException; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; + import java.util.ArrayList; import java.util.Hashtable; import java.util.Iterator; @@ -23,15 +30,8 @@ import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.ejb.EJBException; -import jakarta.transaction.Synchronization; -import jakarta.transaction.SystemException; -import jakarta.transaction.Transaction; - import org.glassfish.ejb.config.EjbContainerAvailability; -import com.sun.logging.LogDomains; - /** * This class intercepts Synchronization notifications from diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBContainerStateManager.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBContainerStateManager.java index 25613a8e716..e8662721551 100755 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBContainerStateManager.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBContainerStateManager.java @@ -16,11 +16,11 @@ package com.sun.ejb.containers; -import jakarta.ejb.EJBObject; - import com.sun.ejb.Container; import com.sun.ejb.EjbInvocation; +import jakarta.ejb.EJBObject; + /** * * @author mvatkina diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBHomeImpl.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBHomeImpl.java index 8efa71de187..bbf1a3005ac 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBHomeImpl.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBHomeImpl.java @@ -16,17 +16,22 @@ package com.sun.ejb.containers; -import com.sun.ejb.*; -import com.sun.ejb.portable.*; +import com.sun.ejb.Container; +import com.sun.ejb.portable.HomeHandleImpl; -import java.lang.reflect.Method; - -import jakarta.ejb.*; +import jakarta.ejb.CreateException; +import jakarta.ejb.EJBHome; +import jakarta.ejb.EJBMetaData; +import jakarta.ejb.EJBObject; +import jakarta.ejb.Handle; +import jakarta.ejb.HomeHandle; +import jakarta.ejb.RemoveException; -import java.rmi.RemoteException; +import java.lang.reflect.Method; import java.rmi.NoSuchObjectException; - -import java.util.logging.*; +import java.rmi.RemoteException; +import java.util.logging.Level; +import java.util.logging.Logger; /** * This class implements the EJBHome interface. diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBLocalObjectImpl.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBLocalObjectImpl.java index 84754d3c5e9..da36994924d 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBLocalObjectImpl.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBLocalObjectImpl.java @@ -17,12 +17,6 @@ package com.sun.ejb.containers; -import java.io.IOException; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.rmi.RemoteException; -import java.util.HashMap; - import com.sun.enterprise.container.common.spi.util.IndirectlySerializable; import com.sun.enterprise.container.common.spi.util.SerializableObjectFactory; @@ -31,6 +25,12 @@ import jakarta.ejb.EJBLocalObject; import jakarta.ejb.RemoveException; +import java.io.IOException; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.rmi.RemoteException; +import java.util.HashMap; + /** * Implementation of the EJBLocalObject interface. * This is NOT serializable to prevent local references from leaving diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBLocalRemoteObject.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBLocalRemoteObject.java index d6e68965213..8cb31fc69da 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBLocalRemoteObject.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBLocalRemoteObject.java @@ -17,9 +17,9 @@ package com.sun.ejb.containers; -import java.util.logging.Logger; +import com.sun.ejb.Container; -import com.sun.ejb.*; +import java.util.logging.Logger; /** * Implementation common to EJBObjects and EJBLocalObjects. diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBObjectImpl.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBObjectImpl.java index 922a3c6e8a7..93f47d8c2ab 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBObjectImpl.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBObjectImpl.java @@ -16,12 +16,6 @@ package com.sun.ejb.containers; -import java.lang.reflect.Method; -import java.rmi.RemoteException; -import java.util.HashMap; -import java.util.Map; -import java.util.logging.Level; - import com.sun.ejb.portable.HandleImpl; import jakarta.ejb.EJBHome; @@ -29,6 +23,12 @@ import jakarta.ejb.Handle; import jakarta.ejb.RemoveException; +import java.lang.reflect.Method; +import java.rmi.RemoteException; +import java.util.HashMap; +import java.util.Map; +import java.util.logging.Level; + /** * EJBObjectImpl implements EJBObject methods for EJBs. * It is extended by the generated concrete type-specific EJBObject diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBObjectInvocationHandler.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBObjectInvocationHandler.java index 595d20f6784..4439f3cc5cf 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBObjectInvocationHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBObjectInvocationHandler.java @@ -16,22 +16,20 @@ package com.sun.ejb.containers; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import java.util.logging.Level; - -import java.rmi.RemoteException; - -import jakarta.ejb.EJBObject; - import com.sun.ejb.EjbInvocation; import com.sun.ejb.InvocationInfo; import com.sun.ejb.containers.util.MethodMap; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.Utility; +import jakarta.ejb.EJBObject; + +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.rmi.RemoteException; +import java.util.logging.Level; + /** * Handler for EJBObject invocations through EJBObject proxy. * diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerServiceConfigListener.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerServiceConfigListener.java index d0cd08d9042..eb2257f9def 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerServiceConfigListener.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerServiceConfigListener.java @@ -16,18 +16,18 @@ package com.sun.ejb.containers; +import com.sun.logging.LogDomains; + +import jakarta.inject.Inject; + import java.beans.PropertyChangeEvent; import java.util.ArrayList; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.logging.LogDomains; - import org.glassfish.ejb.config.EjbTimerService; - import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; import org.jvnet.hk2.config.ConfigListener; import org.jvnet.hk2.config.UnprocessedChangeEvent; import org.jvnet.hk2.config.UnprocessedChangeEvents; diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerServiceWrapper.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerServiceWrapper.java index f6d9d551ce7..9ba3b16093e 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerServiceWrapper.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerServiceWrapper.java @@ -16,23 +16,21 @@ package com.sun.ejb.containers; -import org.glassfish.ejb.deployment.descriptor.EjbDescriptor; +import jakarta.ejb.CreateException; +import jakarta.ejb.EJBException; +import jakarta.ejb.EntityContext; +import jakarta.ejb.ScheduleExpression; +import jakarta.ejb.Timer; +import jakarta.ejb.TimerConfig; +import jakarta.ejb.TimerService; -import java.util.Date; +import java.io.Serializable; import java.util.Collection; +import java.util.Date; import java.util.HashSet; import java.util.Iterator; -import java.io.Serializable; - -import jakarta.ejb.TimerService; -import jakarta.ejb.Timer; -import jakarta.ejb.TimerConfig; -import jakarta.ejb.ScheduleExpression; -import jakarta.ejb.EJBException; -import jakarta.ejb.CreateException; - -import jakarta.ejb.EntityContext; +import org.glassfish.ejb.deployment.descriptor.EjbDescriptor; /* * EJBTimerServiceWrappers is the application-level representation diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbAsyncInvocationManager.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbAsyncInvocationManager.java index 237679c735f..ef29f8a8db8 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbAsyncInvocationManager.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbAsyncInvocationManager.java @@ -16,17 +16,27 @@ package com.sun.ejb.containers; +import com.sun.ejb.Container; import com.sun.ejb.EjbInvocation; -import java.util.*; -import java.util.concurrent.*; +import com.sun.logging.LogDomains; + +import jakarta.ejb.EJBException; + +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicLong; -import org.jvnet.hk2.annotations.Service; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.ejb.Container; -import com.sun.logging.LogDomains; -import java.lang.reflect.Method; -import jakarta.ejb.EJBException; + +import org.jvnet.hk2.annotations.Service; /** * @author Mahesh Kannan diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbAsyncTask.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbAsyncTask.java index 09d4474458e..2c4fe021318 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbAsyncTask.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbAsyncTask.java @@ -17,15 +17,14 @@ package com.sun.ejb.containers; import com.sun.ejb.EjbInvocation; +import com.sun.enterprise.security.SecurityContext; import com.sun.enterprise.util.Utility; +import java.lang.reflect.InvocationTargetException; import java.util.concurrent.Callable; -import java.util.concurrent.Future; import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; import java.util.concurrent.FutureTask; -import java.lang.reflect.InvocationTargetException; - -import com.sun.enterprise.security.SecurityContext; /** * @author Mahesh Kannan diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbEndpointFacadeImpl.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbEndpointFacadeImpl.java index 274480b84d7..5bc5701ff39 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbEndpointFacadeImpl.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbEndpointFacadeImpl.java @@ -18,18 +18,16 @@ package com.sun.ejb.containers; -import org.glassfish.api.invocation.ComponentInvocation; -import org.glassfish.api.invocation.InvocationManager; - -import com.sun.ejb.EjbInvocation; import com.sun.ejb.Container; - -import org.glassfish.ejb.api.EjbEndpointFacade; - +import com.sun.ejb.EjbInvocation; import java.util.logging.Level; import java.util.logging.Logger; +import org.glassfish.api.invocation.ComponentInvocation; +import org.glassfish.api.invocation.InvocationManager; +import org.glassfish.ejb.api.EjbEndpointFacade; + /** * A facade for container services to be used by web services runtime. diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbFutureTask.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbFutureTask.java index 38a2ee81339..23542761785 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbFutureTask.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbFutureTask.java @@ -18,10 +18,10 @@ import com.sun.ejb.EjbInvocation; -import java.util.concurrent.FutureTask; import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeoutException; +import java.util.concurrent.FutureTask; import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; /** diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbIiopServiceImpl.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbIiopServiceImpl.java index 2d42b048c08..9060c2f9aad 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbIiopServiceImpl.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbIiopServiceImpl.java @@ -16,8 +16,9 @@ package com.sun.ejb.containers; -import org.glassfish.enterprise.iiop.spi.EjbService; import com.sun.enterprise.deployment.EjbDescriptor; + +import org.glassfish.enterprise.iiop.spi.EjbService; import org.jvnet.hk2.annotations.Service; /** diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbRemoteFutureTask.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbRemoteFutureTask.java index 122ec38ff72..a29c11662d0 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbRemoteFutureTask.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbRemoteFutureTask.java @@ -16,16 +16,14 @@ package com.sun.ejb.containers; -import java.util.concurrent.Future; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeoutException; -import java.util.concurrent.TimeUnit; - -import java.rmi.RemoteException; +import jakarta.ejb.EJBException; import java.io.Serializable; - -import jakarta.ejb.EJBException; +import java.rmi.RemoteException; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; /** * @author Ken Saks diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbThreadPoolExecutor.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbThreadPoolExecutor.java index 1c2ed4bb62d..b10e8e6ef3e 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbThreadPoolExecutor.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EjbThreadPoolExecutor.java @@ -18,13 +18,15 @@ import com.sun.enterprise.deployment.xml.RuntimeTagNames; import com.sun.enterprise.transaction.api.JavaEETransactionManager; + import jakarta.transaction.Status; + import java.util.concurrent.BlockingQueue; +import java.util.concurrent.Callable; +import java.util.concurrent.RunnableFuture; import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.concurrent.Callable; -import java.util.concurrent.RunnableFuture; import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/GenericEJBHome.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/GenericEJBHome.java index 3401d0ee830..c543e8d4a01 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/GenericEJBHome.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/GenericEJBHome.java @@ -17,6 +17,7 @@ package com.sun.ejb.containers; import jakarta.ejb.EJBHome; + import java.rmi.RemoteException; import java.util.concurrent.TimeoutException; diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/InvocationHandlerUtil.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/InvocationHandlerUtil.java index c8f802082ab..38f2508daae 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/InvocationHandlerUtil.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/InvocationHandlerUtil.java @@ -16,11 +16,11 @@ package com.sun.ejb.containers; +import jakarta.ejb.EJBException; + import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Proxy; import java.lang.reflect.Method; - -import jakarta.ejb.EJBException; +import java.lang.reflect.Proxy; import java.rmi.RemoteException; public final class InvocationHandlerUtil { diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/JavaGlobalJndiNamingObjectProxy.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/JavaGlobalJndiNamingObjectProxy.java index 5106da37d63..97d26c6741f 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/JavaGlobalJndiNamingObjectProxy.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/JavaGlobalJndiNamingObjectProxy.java @@ -17,10 +17,10 @@ package com.sun.ejb.containers; -import org.glassfish.api.naming.NamingObjectProxy; - import javax.naming.Context; +import org.glassfish.api.naming.NamingObjectProxy; + /** * Used to register portable global JNDI names for LOCAL EJB 2.x / 3.x references. * diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/RemoteBusinessObjectFactory.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/RemoteBusinessObjectFactory.java index e353d038d56..6064dae6488 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/RemoteBusinessObjectFactory.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/RemoteBusinessObjectFactory.java @@ -16,12 +16,16 @@ package com.sun.ejb.containers; -import javax.naming.*; -import javax.naming.spi.*; +import com.sun.ejb.EJBUtils; import java.util.Hashtable; -import com.sun.ejb.EJBUtils; +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.Name; +import javax.naming.RefAddr; +import javax.naming.Reference; +import javax.naming.spi.ObjectFactory; /** * An object factory to handle Remote EJB 30 business interface diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/RemoteBusinessWrapperBase.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/RemoteBusinessWrapperBase.java index fe6c8bc67c3..b0cf47bac16 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/RemoteBusinessWrapperBase.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/RemoteBusinessWrapperBase.java @@ -16,14 +16,13 @@ package com.sun.ejb.containers; -import java.rmi.Remote; +import com.sun.ejb.EJBUtils; +import java.io.IOException; import java.io.ObjectInputStream; -import java.io.WriteAbortedException; import java.io.ObjectStreamException; -import java.io.IOException; - -import com.sun.ejb.EJBUtils; +import java.io.WriteAbortedException; +import java.rmi.Remote; public class RemoteBusinessWrapperBase implements java.io.Serializable { diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/RuntimeTimerState.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/RuntimeTimerState.java index 900dd4658e1..6d9dc6f99ac 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/RuntimeTimerState.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/RuntimeTimerState.java @@ -16,15 +16,14 @@ package com.sun.ejb.containers; -import java.util.logging.Logger; -import java.util.logging.Level; +import com.sun.enterprise.deployment.Application; +import com.sun.enterprise.deployment.EjbDescriptor; -import java.util.Date; -import java.util.Calendar; import java.io.Serializable; - -import com.sun.enterprise.deployment.EjbDescriptor; -import com.sun.enterprise.deployment.Application; +import java.util.Calendar; +import java.util.Date; +import java.util.logging.Level; +import java.util.logging.Logger; /** * RuntimeTimerState holds all runtime state of an EJB diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/SFSBTxCheckpointCoordinator.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/SFSBTxCheckpointCoordinator.java index 8d8b0d0632f..3b9780ff8f8 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/SFSBTxCheckpointCoordinator.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/SFSBTxCheckpointCoordinator.java @@ -16,12 +16,13 @@ package com.sun.ejb.containers; +import com.sun.logging.LogDomains; + import java.io.Serializable; import java.util.ArrayList; +import java.util.logging.Level; +import java.util.logging.Logger; -import java.util.logging.*; - -import com.sun.logging.*; import org.glassfish.ha.store.api.BackingStore; import org.glassfish.ha.store.api.BackingStoreException; import org.glassfish.ha.store.util.SimpleMetadata; diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/SessionContextImpl.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/SessionContextImpl.java index d5cfd354e4f..c57430f1691 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/SessionContextImpl.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/SessionContextImpl.java @@ -17,19 +17,23 @@ package com.sun.ejb.containers; import com.sun.ejb.EjbInvocation; +import com.sun.ejb.containers.StatefulSessionContainer.EEMRefInfo; import com.sun.ejb.spi.container.StatefulEJBContext; import com.sun.enterprise.container.common.impl.PhysicalEntityManagerWrapper; import com.sun.enterprise.deployment.EjbSessionDescriptor; -import org.glassfish.api.invocation.ComponentInvocation; import jakarta.ejb.SessionContext; import jakarta.ejb.TimerService; import jakarta.persistence.EntityManagerFactory; -import java.util.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; import java.util.concurrent.locks.ReentrantReadWriteLock; -import static com.sun.ejb.containers.StatefulSessionContainer.EEMRefInfo; +import org.glassfish.api.invocation.ComponentInvocation; /** * Implementation of EJBContext for SessionBeans diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/SimpleEjbResourceHandlerImpl.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/SimpleEjbResourceHandlerImpl.java index 46a70c30262..a5c2c57f633 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/SimpleEjbResourceHandlerImpl.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/SimpleEjbResourceHandlerImpl.java @@ -16,17 +16,18 @@ package com.sun.ejb.containers; -import org.glassfish.api.invocation.ResourceHandler; - import jakarta.transaction.Synchronization; import jakarta.transaction.Transaction; import jakarta.transaction.TransactionManager; + import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; +import org.glassfish.api.invocation.ResourceHandler; + /* //This class was originally an inner class of AbstractSingletonContainer. I have moved this to a top level // class as it is now used by EjbInvocation.clone() method also. diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/SingletonContainerFactory.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/SingletonContainerFactory.java index 060d5f97f37..92998beacb4 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/SingletonContainerFactory.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/SingletonContainerFactory.java @@ -19,7 +19,9 @@ import com.sun.ejb.Container; import com.sun.ejb.ContainerFactory; import com.sun.enterprise.security.SecurityManager; + import jakarta.inject.Singleton; + import org.glassfish.api.deployment.DeploymentContext; import org.glassfish.ejb.deployment.descriptor.EjbDescriptor; import org.glassfish.ejb.deployment.descriptor.EjbSessionDescriptor; diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatefulContainerFactory.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatefulContainerFactory.java index fbcc2b696e9..b8e5c95a1a6 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatefulContainerFactory.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatefulContainerFactory.java @@ -16,16 +16,6 @@ package com.sun.ejb.containers; -import java.io.File; -import java.io.Serializable; -import java.net.InetAddress; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; - -import jakarta.inject.Inject; -import jakarta.inject.Named; - import com.sun.appserv.util.cache.CacheListener; import com.sun.ejb.Container; import com.sun.ejb.ContainerFactory; @@ -40,6 +30,17 @@ import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.security.SecurityManager; import com.sun.enterprise.util.Utility; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import java.io.File; +import java.io.Serializable; +import java.net.InetAddress; +import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.api.deployment.DeployCommandParameters; import org.glassfish.api.deployment.DeploymentContext; @@ -55,12 +56,12 @@ import org.glassfish.ha.store.api.BackingStoreException; import org.glassfish.ha.store.api.BackingStoreFactory; import org.glassfish.ha.store.util.SimpleMetadata; -import org.jvnet.hk2.annotations.Optional; -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.PostConstruct; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.logging.annotation.LogMessageInfo; +import org.jvnet.hk2.annotations.Optional; +import org.jvnet.hk2.annotations.Service; /** * A builder for StatefulSessionContainer. Takes care of diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatelessContainerFactory.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatelessContainerFactory.java index ee48e779090..fe62913fe66 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatelessContainerFactory.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatelessContainerFactory.java @@ -19,7 +19,9 @@ import com.sun.ejb.Container; import com.sun.ejb.ContainerFactory; import com.sun.enterprise.security.SecurityManager; + import jakarta.inject.Singleton; + import org.glassfish.api.deployment.DeploymentContext; import org.glassfish.ejb.deployment.descriptor.EjbDescriptor; import org.jvnet.hk2.annotations.Service; diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatelessSessionContainer.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatelessSessionContainer.java index b155a01eaf6..8e46e785372 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatelessSessionContainer.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatelessSessionContainer.java @@ -17,9 +17,18 @@ package com.sun.ejb.containers; -import java.lang.reflect.Method; -import java.rmi.RemoteException; -import java.util.logging.Level; +import com.sun.ejb.ComponentContext; +import com.sun.ejb.EjbInvocation; +import com.sun.ejb.containers.util.pool.AbstractPool; +import com.sun.ejb.containers.util.pool.NonBlockingPool; +import com.sun.ejb.containers.util.pool.ObjectFactory; +import com.sun.ejb.monitoring.stats.EjbMonitoringStatsProvider; +import com.sun.ejb.monitoring.stats.EjbPoolStatsProvider; +import com.sun.ejb.monitoring.stats.StatelessSessionBeanStatsProvider; +import com.sun.enterprise.admin.monitor.callflow.ComponentType; +import com.sun.enterprise.deployment.LifecycleCallbackDescriptor.CallbackType; +import com.sun.enterprise.deployment.runtime.BeanPoolDescriptor; +import com.sun.enterprise.security.SecurityManager; import jakarta.ejb.CreateException; import jakarta.ejb.EJBException; @@ -29,24 +38,15 @@ import jakarta.transaction.Status; import jakarta.transaction.Transaction; +import java.lang.reflect.Method; +import java.rmi.RemoteException; +import java.util.logging.Level; + import org.glassfish.api.invocation.ComponentInvocation; import org.glassfish.ejb.config.EjbContainer; import org.glassfish.ejb.deployment.descriptor.EjbDescriptor; import org.glassfish.ejb.deployment.descriptor.runtime.IASEjbExtraDescriptors; -import com.sun.ejb.ComponentContext; -import com.sun.ejb.EjbInvocation; -import com.sun.ejb.containers.util.pool.AbstractPool; -import com.sun.ejb.containers.util.pool.NonBlockingPool; -import com.sun.ejb.containers.util.pool.ObjectFactory; -import com.sun.ejb.monitoring.stats.EjbMonitoringStatsProvider; -import com.sun.ejb.monitoring.stats.EjbPoolStatsProvider; -import com.sun.ejb.monitoring.stats.StatelessSessionBeanStatsProvider; -import com.sun.enterprise.admin.monitor.callflow.ComponentType; -import com.sun.enterprise.deployment.LifecycleCallbackDescriptor.CallbackType; -import com.sun.enterprise.deployment.runtime.BeanPoolDescriptor; -import com.sun.enterprise.security.SecurityManager; - /** This class provides container functionality specific to stateless SessionBeans. * At deployment time, one instance of the StatelessSessionContainer is created * for each stateless SessionBean type (i.e. deployment descriptor) in a JAR. diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/TimerWrapper.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/TimerWrapper.java index 0803d486252..dac94cc6ff2 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/TimerWrapper.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/TimerWrapper.java @@ -16,25 +16,24 @@ package com.sun.ejb.containers; -import java.util.Date; -import java.io.Serializable; +import com.sun.ejb.ComponentContext; +import com.sun.ejb.EjbInvocation; +import com.sun.enterprise.container.common.spi.util.IndirectlySerializable; +import com.sun.enterprise.container.common.spi.util.SerializableObjectFactory; -import jakarta.ejb.NoSuchObjectLocalException; -import jakarta.ejb.NoMoreTimeoutsException; import jakarta.ejb.EJBException; +import jakarta.ejb.FinderException; +import jakarta.ejb.NoMoreTimeoutsException; +import jakarta.ejb.NoSuchObjectLocalException; +import jakarta.ejb.ScheduleExpression; import jakarta.ejb.Timer; import jakarta.ejb.TimerHandle; -import jakarta.ejb.ScheduleExpression; -import jakarta.ejb.FinderException; +import java.io.Serializable; +import java.util.Date; -import com.sun.enterprise.container.common.spi.util.IndirectlySerializable; -import com.sun.enterprise.container.common.spi.util.SerializableObjectFactory; import org.glassfish.api.invocation.ComponentInvocation; -import com.sun.ejb.EjbInvocation; -import com.sun.ejb.ComponentContext; - /* * TimerWrapper is the application-level representation * of a timer. Note that this class is not Serializable. diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/interceptors/CallbackInvocationContext.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/interceptors/CallbackInvocationContext.java index a9328ab538f..dafc0bf03e6 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/interceptors/CallbackInvocationContext.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/interceptors/CallbackInvocationContext.java @@ -17,14 +17,6 @@ package com.sun.ejb.containers.interceptors; -import static com.sun.ejb.containers.interceptors.InterceptorUtil.hasCompatiblePrimitiveWrapper; -import static com.sun.enterprise.deployment.LifecycleCallbackDescriptor.CallbackType.AROUND_CONSTRUCT; - -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.Map; - import com.sun.ejb.containers.BaseContainer; import com.sun.ejb.containers.EJBContextImpl; import com.sun.enterprise.container.common.spi.util.InterceptorInfo; @@ -32,6 +24,14 @@ import jakarta.interceptor.InvocationContext; +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.Map; + +import static com.sun.ejb.containers.interceptors.InterceptorUtil.hasCompatiblePrimitiveWrapper; +import static com.sun.enterprise.deployment.LifecycleCallbackDescriptor.CallbackType.AROUND_CONSTRUCT; + /** * Concrete InvocationContext implementation passed to callback methods defined in interceptor classes. */ diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/interceptors/InterceptorInvocationHandler.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/interceptors/InterceptorInvocationHandler.java index 5eaba424aa8..749915922db 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/interceptors/InterceptorInvocationHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/interceptors/InterceptorInvocationHandler.java @@ -17,17 +17,17 @@ package com.sun.ejb.containers.interceptors; -import static com.sun.ejb.containers.InvocationHandlerUtil.invokeJavaObjectMethod; -import static com.sun.enterprise.deployment.LifecycleCallbackDescriptor.CallbackType.AROUND_CONSTRUCT; -import static com.sun.enterprise.deployment.LifecycleCallbackDescriptor.CallbackType.POST_CONSTRUCT; -import static com.sun.enterprise.deployment.LifecycleCallbackDescriptor.CallbackType.PRE_DESTROY; +import com.sun.enterprise.container.common.spi.InterceptorInvoker; +import com.sun.enterprise.deployment.LifecycleCallbackDescriptor.CallbackType; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import com.sun.enterprise.container.common.spi.InterceptorInvoker; -import com.sun.enterprise.deployment.LifecycleCallbackDescriptor.CallbackType; +import static com.sun.ejb.containers.InvocationHandlerUtil.invokeJavaObjectMethod; +import static com.sun.enterprise.deployment.LifecycleCallbackDescriptor.CallbackType.AROUND_CONSTRUCT; +import static com.sun.enterprise.deployment.LifecycleCallbackDescriptor.CallbackType.POST_CONSTRUCT; +import static com.sun.enterprise.deployment.LifecycleCallbackDescriptor.CallbackType.PRE_DESTROY; /** * diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/interceptors/JavaEEInterceptorBuilderImpl.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/interceptors/JavaEEInterceptorBuilderImpl.java index 5c0160fb308..d2973378018 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/interceptors/JavaEEInterceptorBuilderImpl.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/interceptors/JavaEEInterceptorBuilderImpl.java @@ -17,14 +17,14 @@ package com.sun.ejb.containers.interceptors; -import java.lang.reflect.Proxy; - import com.sun.ejb.codegen.EjbOptionalIntfGenerator; import com.sun.ejb.spi.container.OptionalLocalInterfaceProvider; import com.sun.enterprise.container.common.spi.InterceptorInvoker; import com.sun.enterprise.container.common.spi.JavaEEInterceptorBuilder; import com.sun.enterprise.container.common.spi.util.InterceptorInfo; +import java.lang.reflect.Proxy; + /** * */ diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/util/cache/LruEJBCache.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/util/cache/LruEJBCache.java index 3a1546d4cd4..1e2df54c66b 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/util/cache/LruEJBCache.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/util/cache/LruEJBCache.java @@ -17,7 +17,10 @@ package com.sun.ejb.containers.util.cache; import com.sun.appserv.util.cache.LruCache; -import java.util.logging.*; + +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.ejb.LogFacade; import org.glassfish.logging.annotation.LogMessageInfo; diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/util/cache/NRUSessionCache.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/util/cache/NRUSessionCache.java index cb10dbd5e17..3f0eeb7de2c 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/util/cache/NRUSessionCache.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/util/cache/NRUSessionCache.java @@ -16,10 +16,10 @@ package com.sun.ejb.containers.util.cache; -import java.util.Properties; - import com.sun.ejb.spi.container.SFSBContainerCallback; +import java.util.Properties; + public class NRUSessionCache extends LruSessionCache { diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/util/pool/AbstractPool.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/util/pool/AbstractPool.java index f1f0215d39c..1eebe13ab1a 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/util/pool/AbstractPool.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/util/pool/AbstractPool.java @@ -23,19 +23,19 @@ package com.sun.ejb.containers.util.pool; -import static com.sun.enterprise.util.Utility.setContextClassLoader; -import static java.security.AccessController.doPrivileged; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.WARNING; +import com.sun.ejb.containers.EjbContainerUtilImpl; +import com.sun.ejb.monitoring.probes.EjbPoolProbeProvider; +import com.sun.ejb.monitoring.stats.EjbMonitoringUtils; import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; -import com.sun.ejb.containers.EjbContainerUtilImpl; -import com.sun.ejb.monitoring.probes.EjbPoolProbeProvider; -import com.sun.ejb.monitoring.stats.EjbMonitoringUtils; +import static com.sun.enterprise.util.Utility.setContextClassLoader; +import static java.security.AccessController.doPrivileged; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.WARNING; /** *

      diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/util/pool/NonBlockingPool.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/util/pool/NonBlockingPool.java index 5bec771845f..b9edc69782b 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/util/pool/NonBlockingPool.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/util/pool/NonBlockingPool.java @@ -22,10 +22,8 @@ */ package com.sun.ejb.containers.util.pool; -import static com.sun.enterprise.util.Utility.setContextClassLoader; -import static java.security.AccessController.doPrivileged; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.WARNING; +import com.sun.ejb.containers.EJBContextImpl; +import com.sun.ejb.containers.EjbContainerUtilImpl; import java.security.PrivilegedAction; import java.util.ArrayList; @@ -33,8 +31,10 @@ import java.util.List; import java.util.TimerTask; -import com.sun.ejb.containers.EJBContextImpl; -import com.sun.ejb.containers.EjbContainerUtilImpl; +import static com.sun.enterprise.util.Utility.setContextClassLoader; +import static java.security.AccessController.doPrivileged; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.WARNING; /** *

      diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/probes/EjbCacheProbeProvider.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/probes/EjbCacheProbeProvider.java index 27b2b9c7e83..80e9f573676 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/probes/EjbCacheProbeProvider.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/probes/EjbCacheProbeProvider.java @@ -16,7 +16,9 @@ package com.sun.ejb.monitoring.probes; -import org.glassfish.external.probe.provider.annotations.*; +import org.glassfish.external.probe.provider.annotations.Probe; +import org.glassfish.external.probe.provider.annotations.ProbeParam; +import org.glassfish.external.probe.provider.annotations.ProbeProvider; /** * Probe emitter for the Ejb Pool monitoring events. diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/probes/EjbMonitoringProbeProvider.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/probes/EjbMonitoringProbeProvider.java index c4348a72ac6..84e64c6faf1 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/probes/EjbMonitoringProbeProvider.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/probes/EjbMonitoringProbeProvider.java @@ -16,7 +16,9 @@ package com.sun.ejb.monitoring.probes; -import org.glassfish.external.probe.provider.annotations.*; +import org.glassfish.external.probe.provider.annotations.Probe; +import org.glassfish.external.probe.provider.annotations.ProbeParam; +import org.glassfish.external.probe.provider.annotations.ProbeProvider; /** * Probe emitter for the Ejb monitoring events. Used by the probe framework as an event notifier. diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/probes/EjbPoolProbeProvider.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/probes/EjbPoolProbeProvider.java index 24aa793e285..7ca3f3865fd 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/probes/EjbPoolProbeProvider.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/probes/EjbPoolProbeProvider.java @@ -16,7 +16,9 @@ package com.sun.ejb.monitoring.probes; -import org.glassfish.external.probe.provider.annotations.*; +import org.glassfish.external.probe.provider.annotations.Probe; +import org.glassfish.external.probe.provider.annotations.ProbeParam; +import org.glassfish.external.probe.provider.annotations.ProbeProvider; /** * Probe emitter for the Ejb Pool monitoring events. diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/probes/EjbTimedObjectProbeProvider.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/probes/EjbTimedObjectProbeProvider.java index c4e97b0c283..8f525482055 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/probes/EjbTimedObjectProbeProvider.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/probes/EjbTimedObjectProbeProvider.java @@ -16,7 +16,8 @@ package com.sun.ejb.monitoring.probes; -import org.glassfish.external.probe.provider.annotations.*; +import org.glassfish.external.probe.provider.annotations.Probe; +import org.glassfish.external.probe.provider.annotations.ProbeProvider; /** * Probe emitter for the Ejb Timed Object monitoring events. diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/EjbCacheStatsProvider.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/EjbCacheStatsProvider.java index 3ee062e7af7..f2b62749324 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/EjbCacheStatsProvider.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/EjbCacheStatsProvider.java @@ -16,15 +16,21 @@ package com.sun.ejb.monitoring.stats; -import java.util.logging.Logger; - import com.sun.ejb.containers.EjbContainerUtilImpl; +import java.util.logging.Logger; + import org.glassfish.external.probe.provider.StatsProviderManager; -import org.glassfish.external.probe.provider.annotations.*; -import org.glassfish.external.statistics.*; -import org.glassfish.external.statistics.impl.*; -import org.glassfish.gmbal.*; +import org.glassfish.external.probe.provider.annotations.ProbeListener; +import org.glassfish.external.probe.provider.annotations.ProbeParam; +import org.glassfish.external.statistics.CountStatistic; +import org.glassfish.external.statistics.RangeStatistic; +import org.glassfish.external.statistics.impl.BoundedRangeStatisticImpl; +import org.glassfish.external.statistics.impl.CountStatisticImpl; +import org.glassfish.gmbal.AMXMetadata; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedObject; /** * Probe listener for the Ejb Cache monitoring events. diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/EjbMethodStatsProvider.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/EjbMethodStatsProvider.java index 258afb13f4e..a45d3a60e6c 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/EjbMethodStatsProvider.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/EjbMethodStatsProvider.java @@ -16,11 +16,17 @@ package com.sun.ejb.monitoring.stats; -import java.util.List; import java.util.ArrayList; -import org.glassfish.external.statistics.*; -import org.glassfish.external.statistics.impl.*; -import org.glassfish.gmbal.*; +import java.util.List; + +import org.glassfish.external.statistics.CountStatistic; +import org.glassfish.external.statistics.TimeStatistic; +import org.glassfish.external.statistics.impl.CountStatisticImpl; +import org.glassfish.external.statistics.impl.TimeStatisticImpl; +import org.glassfish.gmbal.AMXMetadata; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedObject; /** * Event listener for the Ejb monitoring events. Used by the probe framework diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/EjbMonitoringStatsProvider.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/EjbMonitoringStatsProvider.java index 3ec883757b1..273719b05a1 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/EjbMonitoringStatsProvider.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/EjbMonitoringStatsProvider.java @@ -16,17 +16,20 @@ package com.sun.ejb.monitoring.stats; -import java.util.*; +import com.sun.ejb.containers.EjbContainerUtilImpl; + +import java.util.HashMap; +import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; import org.glassfish.external.probe.provider.StatsProviderManager; -import org.glassfish.external.probe.provider.annotations.*; -import org.glassfish.external.statistics.*; -import org.glassfish.external.statistics.impl.*; -import org.glassfish.gmbal.*; - -import com.sun.ejb.containers.EjbContainerUtilImpl; +import org.glassfish.external.probe.provider.annotations.ProbeListener; +import org.glassfish.external.probe.provider.annotations.ProbeParam; +import org.glassfish.external.statistics.CountStatistic; +import org.glassfish.external.statistics.impl.CountStatisticImpl; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; /** * Event listener for the Ejb monitoring events. Used by the probe framework diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/EjbMonitoringUtils.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/EjbMonitoringUtils.java index 742b2b34ac4..268013d11a6 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/EjbMonitoringUtils.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/EjbMonitoringUtils.java @@ -16,13 +16,14 @@ package com.sun.ejb.monitoring.stats; +import com.sun.ejb.containers.EjbContainerUtilImpl; + import java.lang.reflect.Method; import java.util.logging.Level; import java.util.logging.Logger; -import org.glassfish.external.probe.provider.StatsProviderManager; import org.glassfish.external.probe.provider.PluginPoint; -import com.sun.ejb.containers.EjbContainerUtilImpl; +import org.glassfish.external.probe.provider.StatsProviderManager; /** * Utility class for Ejb monitoring. diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/EjbPoolStatsProvider.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/EjbPoolStatsProvider.java index 99b9f011822..4eb761fcc3f 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/EjbPoolStatsProvider.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/EjbPoolStatsProvider.java @@ -16,16 +16,22 @@ package com.sun.ejb.monitoring.stats; -import java.util.logging.Logger; - import com.sun.ejb.containers.EjbContainerUtilImpl; import com.sun.ejb.containers.util.pool.AbstractPool; +import java.util.logging.Logger; + import org.glassfish.external.probe.provider.StatsProviderManager; -import org.glassfish.external.probe.provider.annotations.*; -import org.glassfish.external.statistics.*; -import org.glassfish.external.statistics.impl.*; -import org.glassfish.gmbal.*; +import org.glassfish.external.probe.provider.annotations.ProbeListener; +import org.glassfish.external.probe.provider.annotations.ProbeParam; +import org.glassfish.external.statistics.CountStatistic; +import org.glassfish.external.statistics.RangeStatistic; +import org.glassfish.external.statistics.impl.BoundedRangeStatisticImpl; +import org.glassfish.external.statistics.impl.CountStatisticImpl; +import org.glassfish.gmbal.AMXMetadata; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedObject; /** * Probe listener for the Ejb Pool monitoring events. diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/EjbTimedObjectStatsProvider.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/EjbTimedObjectStatsProvider.java index 415469ab77f..4f5b34f5535 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/EjbTimedObjectStatsProvider.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/EjbTimedObjectStatsProvider.java @@ -16,15 +16,18 @@ package com.sun.ejb.monitoring.stats; -import java.util.logging.Logger; - import com.sun.ejb.containers.EjbContainerUtilImpl; +import java.util.logging.Logger; + import org.glassfish.external.probe.provider.StatsProviderManager; -import org.glassfish.external.probe.provider.annotations.*; -import org.glassfish.external.statistics.*; -import org.glassfish.external.statistics.impl.*; -import org.glassfish.gmbal.*; +import org.glassfish.external.probe.provider.annotations.ProbeListener; +import org.glassfish.external.statistics.CountStatistic; +import org.glassfish.external.statistics.impl.CountStatisticImpl; +import org.glassfish.gmbal.AMXMetadata; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedObject; /** * Probe listener for the Ejb Timed Object monitoring events. diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/SingletonBeanStatsProvider.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/SingletonBeanStatsProvider.java index c0c25a53cd7..addc60fe103 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/SingletonBeanStatsProvider.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/SingletonBeanStatsProvider.java @@ -16,7 +16,8 @@ package com.sun.ejb.monitoring.stats; -import org.glassfish.gmbal.*; +import org.glassfish.gmbal.AMXMetadata; +import org.glassfish.gmbal.ManagedObject; /** * Defines SingletonBeanStatsProvider diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/StatefulSessionBeanStatsProvider.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/StatefulSessionBeanStatsProvider.java index 87d3f0d5d72..ca43cf2511f 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/StatefulSessionBeanStatsProvider.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/StatefulSessionBeanStatsProvider.java @@ -17,12 +17,17 @@ package com.sun.ejb.monitoring.stats; import com.sun.ejb.containers.StatefulSessionContainer; + import java.util.concurrent.atomic.AtomicLong; -import org.glassfish.external.probe.provider.annotations.*; -import org.glassfish.external.statistics.*; -import org.glassfish.external.statistics.impl.*; -import org.glassfish.gmbal.*; +import org.glassfish.external.probe.provider.annotations.ProbeListener; +import org.glassfish.external.probe.provider.annotations.ProbeParam; +import org.glassfish.external.statistics.RangeStatistic; +import org.glassfish.external.statistics.impl.BoundedRangeStatisticImpl; +import org.glassfish.gmbal.AMXMetadata; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedObject; /** * Probe listener for the Stateful Session Beans part of the EJB monitoring events. diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/StatelessSessionBeanStatsProvider.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/StatelessSessionBeanStatsProvider.java index 8c624b4ad5d..b4d633647e6 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/StatelessSessionBeanStatsProvider.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/monitoring/stats/StatelessSessionBeanStatsProvider.java @@ -18,9 +18,12 @@ import com.sun.ejb.containers.StatelessSessionContainer; -import org.glassfish.external.statistics.*; -import org.glassfish.external.statistics.impl.*; -import org.glassfish.gmbal.*; +import org.glassfish.external.statistics.RangeStatistic; +import org.glassfish.external.statistics.impl.BoundedRangeStatisticImpl; +import org.glassfish.gmbal.AMXMetadata; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedObject; /** * Probe listener for the Stateless Session Beans part of the EJB monitoring events. diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/LogFacade.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/LogFacade.java index ec30e1592dc..94cd08e4ef7 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/LogFacade.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/LogFacade.java @@ -16,11 +16,11 @@ package org.glassfish.ejb; -import org.glassfish.logging.annotation.LoggerInfo; -import org.glassfish.logging.annotation.LogMessagesResourceBundle; - import java.util.logging.Logger; +import org.glassfish.logging.annotation.LogMessagesResourceBundle; +import org.glassfish.logging.annotation.LoggerInfo; + public final class LogFacade { @LoggerInfo(subsystem = "GlassFish-EJB", description = "GlassFish EJB Container Logger", publish = true) diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/admin/cli/ListTimers.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/admin/cli/ListTimers.java index f48c103c539..abf5a183dbe 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/admin/cli/ListTimers.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/admin/cli/ListTimers.java @@ -16,14 +16,17 @@ package org.glassfish.ejb.admin.cli; +import com.sun.ejb.containers.EJBTimerService; +import com.sun.ejb.containers.EjbContainerUtil; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + import java.util.List; -import com.sun.ejb.containers.EJBTimerService; -import com.sun.ejb.containers.EjbContainerUtil; import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -36,12 +39,10 @@ import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; +import org.glassfish.hk2.api.PerLookup; import org.glassfish.internal.api.Target; -import jakarta.inject.Inject; import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; - @Service(name="list-timers") @PerLookup diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/admin/cli/MigrateTimers.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/admin/cli/MigrateTimers.java index 0e52b841bf9..ac5bc2dd581 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/admin/cli/MigrateTimers.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/admin/cli/MigrateTimers.java @@ -16,6 +16,8 @@ package org.glassfish.ejb.admin.cli; +import com.sun.ejb.containers.EJBTimerService; +import com.sun.ejb.containers.EjbContainerUtil; import com.sun.enterprise.admin.util.ClusterOperationUtil; import com.sun.enterprise.config.serverbeans.Cluster; import com.sun.enterprise.config.serverbeans.Domain; @@ -23,13 +25,14 @@ import com.sun.enterprise.util.SystemPropertyConstants; import com.sun.enterprise.util.i18n.StringManager; import com.sun.logging.LogDomains; + +import jakarta.inject.Inject; + import java.util.Arrays; import java.util.List; -import java.util.logging.Logger; import java.util.logging.Level; +import java.util.logging.Logger; -import com.sun.ejb.containers.EJBTimerService; -import com.sun.ejb.containers.EjbContainerUtil; import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -43,12 +46,10 @@ import org.glassfish.common.util.admin.ParameterMapExtractor; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; -import org.glassfish.internal.api.Target; -import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; - import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Target; +import org.jvnet.hk2.annotations.Service; @Service(name = "migrate-timers") @PerLookup diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AbstractAttributeHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AbstractAttributeHandler.java index ce2873c81b8..94a33cfc586 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AbstractAttributeHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AbstractAttributeHandler.java @@ -16,11 +16,6 @@ package org.glassfish.ejb.deployment.annotation.handlers; -import java.lang.annotation.Annotation; -import java.lang.annotation.ElementType; -import java.lang.reflect.AnnotatedElement; -import java.util.logging.Level; - import com.sun.enterprise.deployment.annotation.context.ComponentContext; import com.sun.enterprise.deployment.annotation.context.EjbBundleContext; import com.sun.enterprise.deployment.annotation.context.EjbContext; @@ -28,6 +23,12 @@ import com.sun.enterprise.deployment.annotation.context.EjbsContext; import com.sun.enterprise.deployment.annotation.handlers.AbstractHandler; import com.sun.enterprise.util.LocalStringManagerImpl; + +import java.lang.annotation.Annotation; +import java.lang.annotation.ElementType; +import java.lang.reflect.AnnotatedElement; +import java.util.logging.Level; + import org.glassfish.apf.AnnotatedElementHandler; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AccessTimeoutHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AccessTimeoutHandler.java index 0d3031b9dad..8f82d052f4a 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AccessTimeoutHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AccessTimeoutHandler.java @@ -16,21 +16,23 @@ package org.glassfish.ejb.deployment.annotation.handlers; +import com.sun.enterprise.deployment.MethodDescriptor; +import com.sun.enterprise.deployment.annotation.context.EjbContext; +import com.sun.enterprise.deployment.annotation.handlers.PostProcessor; +import com.sun.enterprise.deployment.util.TypeUtil; + +import jakarta.ejb.AccessTimeout; +import jakarta.ejb.ConcurrencyManagement; +import jakarta.ejb.Singleton; +import jakarta.ejb.Stateful; + import java.lang.annotation.Annotation; import java.lang.annotation.ElementType; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.List; -import jakarta.ejb.AccessTimeout; -import jakarta.ejb.ConcurrencyManagement; -import jakarta.ejb.Singleton; -import jakarta.ejb.Stateful; -import com.sun.enterprise.deployment.MethodDescriptor; -import com.sun.enterprise.deployment.annotation.context.EjbContext; -import com.sun.enterprise.deployment.annotation.handlers.PostProcessor; -import com.sun.enterprise.deployment.util.TypeUtil; import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AfterBeginHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AfterBeginHandler.java index c86c899dcfd..296dcd54c85 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AfterBeginHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AfterBeginHandler.java @@ -16,14 +16,16 @@ package org.glassfish.ejb.deployment.annotation.handlers; +import com.sun.enterprise.deployment.MethodDescriptor; +import com.sun.enterprise.deployment.annotation.context.EjbContext; + +import jakarta.ejb.AfterBegin; +import jakarta.ejb.Stateful; + import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.logging.Level; -import jakarta.ejb.AfterBegin; -import jakarta.ejb.Stateful; -import com.sun.enterprise.deployment.MethodDescriptor; -import com.sun.enterprise.deployment.annotation.context.EjbContext; import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AfterCompletionHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AfterCompletionHandler.java index 9e3449ae34b..e83b20c04b3 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AfterCompletionHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AfterCompletionHandler.java @@ -16,14 +16,16 @@ package org.glassfish.ejb.deployment.annotation.handlers; +import com.sun.enterprise.deployment.MethodDescriptor; +import com.sun.enterprise.deployment.annotation.context.EjbContext; + +import jakarta.ejb.AfterCompletion; +import jakarta.ejb.Stateful; + import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.logging.Level; -import jakarta.ejb.AfterCompletion; -import jakarta.ejb.Stateful; -import com.sun.enterprise.deployment.MethodDescriptor; -import com.sun.enterprise.deployment.annotation.context.EjbContext; import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AroundConstructHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AroundConstructHandler.java index 44d33a35a74..9501ce3879c 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AroundConstructHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AroundConstructHandler.java @@ -16,16 +16,17 @@ package org.glassfish.ejb.deployment.annotation.handlers; -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.util.logging.Level; - -import jakarta.interceptor.AroundConstruct; - import com.sun.enterprise.deployment.EjbInterceptor; import com.sun.enterprise.deployment.LifecycleCallbackDescriptor; import com.sun.enterprise.deployment.annotation.context.EjbContext; import com.sun.enterprise.deployment.annotation.context.EjbInterceptorContext; + +import jakarta.interceptor.AroundConstruct; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.logging.Level; + import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AroundInvokeHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AroundInvokeHandler.java index fad17ddaba3..b3fbb0a9e41 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AroundInvokeHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AroundInvokeHandler.java @@ -16,14 +16,16 @@ package org.glassfish.ejb.deployment.annotation.handlers; -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import jakarta.interceptor.AroundInvoke; - import com.sun.enterprise.deployment.EjbInterceptor; import com.sun.enterprise.deployment.LifecycleCallbackDescriptor; import com.sun.enterprise.deployment.annotation.context.EjbContext; import com.sun.enterprise.deployment.annotation.context.EjbInterceptorContext; + +import jakarta.interceptor.AroundInvoke; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; + import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AroundTimeoutHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AroundTimeoutHandler.java index 0faed2f4d8f..ccddb6a908d 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AroundTimeoutHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AroundTimeoutHandler.java @@ -16,11 +16,12 @@ package org.glassfish.ejb.deployment.annotation.handlers; -import jakarta.interceptor.AroundTimeout; - import com.sun.enterprise.deployment.EjbInterceptor; import com.sun.enterprise.deployment.annotation.context.EjbContext; import com.sun.enterprise.deployment.annotation.context.EjbInterceptorContext; + +import jakarta.interceptor.AroundTimeout; + import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AsynchronousHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AsynchronousHandler.java index fd6035beba3..863c9045022 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AsynchronousHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AsynchronousHandler.java @@ -16,10 +16,10 @@ package org.glassfish.ejb.deployment.annotation.handlers; -import java.lang.annotation.Annotation; -import java.lang.annotation.ElementType; -import java.lang.reflect.Method; -import java.util.logging.Level; +import com.sun.enterprise.deployment.MethodDescriptor; +import com.sun.enterprise.deployment.annotation.context.EjbContext; +import com.sun.enterprise.deployment.annotation.handlers.PostProcessor; + import jakarta.ejb.Asynchronous; import jakarta.ejb.Local; import jakarta.ejb.Remote; @@ -27,9 +27,11 @@ import jakarta.ejb.Stateful; import jakarta.ejb.Stateless; -import com.sun.enterprise.deployment.MethodDescriptor; -import com.sun.enterprise.deployment.annotation.context.EjbContext; -import com.sun.enterprise.deployment.annotation.handlers.PostProcessor; +import java.lang.annotation.Annotation; +import java.lang.annotation.ElementType; +import java.lang.reflect.Method; +import java.util.logging.Level; + import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/BeforeCompletionHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/BeforeCompletionHandler.java index 4c667ab5695..856cd123685 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/BeforeCompletionHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/BeforeCompletionHandler.java @@ -16,14 +16,16 @@ package org.glassfish.ejb.deployment.annotation.handlers; +import com.sun.enterprise.deployment.MethodDescriptor; +import com.sun.enterprise.deployment.annotation.context.EjbContext; + +import jakarta.ejb.BeforeCompletion; +import jakarta.ejb.Stateful; + import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.logging.Level; -import jakarta.ejb.BeforeCompletion; -import jakarta.ejb.Stateful; -import com.sun.enterprise.deployment.MethodDescriptor; -import com.sun.enterprise.deployment.annotation.context.EjbContext; import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ConcurrencyManagementHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ConcurrencyManagementHandler.java index 5cd9068cb3f..3f6573a8aab 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ConcurrencyManagementHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ConcurrencyManagementHandler.java @@ -16,12 +16,14 @@ package org.glassfish.ejb.deployment.annotation.handlers; -import java.lang.annotation.Annotation; +import com.sun.enterprise.deployment.EjbDescriptor; +import com.sun.enterprise.deployment.annotation.context.EjbContext; + import jakarta.ejb.ConcurrencyManagement; import jakarta.ejb.ConcurrencyManagementType; -import com.sun.enterprise.deployment.EjbDescriptor; -import com.sun.enterprise.deployment.annotation.context.EjbContext; +import java.lang.annotation.Annotation; + import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ExcludeDefaultInterceptorsHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ExcludeDefaultInterceptorsHandler.java index a6b67624bb1..526fb2256dd 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ExcludeDefaultInterceptorsHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ExcludeDefaultInterceptorsHandler.java @@ -16,14 +16,16 @@ package org.glassfish.ejb.deployment.annotation.handlers; +import com.sun.enterprise.deployment.MethodDescriptor; +import com.sun.enterprise.deployment.annotation.context.EjbContext; + +import jakarta.interceptor.ExcludeDefaultInterceptors; + import java.lang.annotation.Annotation; import java.lang.annotation.ElementType; import java.lang.reflect.Constructor; import java.lang.reflect.Method; -import jakarta.interceptor.ExcludeDefaultInterceptors; -import com.sun.enterprise.deployment.MethodDescriptor; -import com.sun.enterprise.deployment.annotation.context.EjbContext; import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/InitHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/InitHandler.java index 7c6113bc759..ac544a83fe3 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/InitHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/InitHandler.java @@ -16,14 +16,16 @@ package org.glassfish.ejb.deployment.annotation.handlers; +import com.sun.enterprise.deployment.MethodDescriptor; +import com.sun.enterprise.deployment.annotation.context.EjbContext; +import com.sun.enterprise.deployment.util.TypeUtil; + +import jakarta.ejb.Init; + import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.logging.Level; -import jakarta.ejb.Init; -import com.sun.enterprise.deployment.MethodDescriptor; -import com.sun.enterprise.deployment.annotation.context.EjbContext; -import com.sun.enterprise.deployment.util.TypeUtil; import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/PostActivateHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/PostActivateHandler.java index f1d1a0479b2..b356b39d9d8 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/PostActivateHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/PostActivateHandler.java @@ -16,14 +16,16 @@ package org.glassfish.ejb.deployment.annotation.handlers; -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import jakarta.ejb.PostActivate; - import com.sun.enterprise.deployment.EjbInterceptor; import com.sun.enterprise.deployment.LifecycleCallbackDescriptor; import com.sun.enterprise.deployment.annotation.context.EjbContext; import com.sun.enterprise.deployment.annotation.context.EjbInterceptorContext; + +import jakarta.ejb.PostActivate; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; + import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/PrePassivateHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/PrePassivateHandler.java index 4a8d6eda58b..23dd76b4076 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/PrePassivateHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/PrePassivateHandler.java @@ -16,14 +16,16 @@ package org.glassfish.ejb.deployment.annotation.handlers; -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import jakarta.ejb.PrePassivate; - import com.sun.enterprise.deployment.EjbInterceptor; import com.sun.enterprise.deployment.LifecycleCallbackDescriptor; import com.sun.enterprise.deployment.annotation.context.EjbContext; import com.sun.enterprise.deployment.annotation.context.EjbInterceptorContext; + +import jakarta.ejb.PrePassivate; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; + import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/RemoveHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/RemoveHandler.java index 6e2119f1c31..41d2cd6819b 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/RemoveHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/RemoveHandler.java @@ -16,12 +16,14 @@ package org.glassfish.ejb.deployment.annotation.handlers; +import com.sun.enterprise.deployment.MethodDescriptor; +import com.sun.enterprise.deployment.annotation.context.EjbContext; + +import jakarta.ejb.Remove; + import java.lang.annotation.Annotation; import java.lang.reflect.Method; -import jakarta.ejb.Remove; -import com.sun.enterprise.deployment.MethodDescriptor; -import com.sun.enterprise.deployment.annotation.context.EjbContext; import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ScheduleHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ScheduleHandler.java index 605bc042884..cbf466dbee4 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ScheduleHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ScheduleHandler.java @@ -16,18 +16,20 @@ package org.glassfish.ejb.deployment.annotation.handlers; -import java.lang.annotation.Annotation; -import java.lang.annotation.ElementType; -import java.lang.reflect.Method; -import java.util.logging.Level; +import com.sun.enterprise.deployment.MethodDescriptor; +import com.sun.enterprise.deployment.ScheduledTimerDescriptor; +import com.sun.enterprise.deployment.annotation.context.EjbContext; + import jakarta.ejb.MessageDriven; import jakarta.ejb.Schedule; import jakarta.ejb.Singleton; import jakarta.ejb.Stateless; -import com.sun.enterprise.deployment.MethodDescriptor; -import com.sun.enterprise.deployment.ScheduledTimerDescriptor; -import com.sun.enterprise.deployment.annotation.context.EjbContext; +import java.lang.annotation.Annotation; +import java.lang.annotation.ElementType; +import java.lang.reflect.Method; +import java.util.logging.Level; + import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/SchedulesHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/SchedulesHandler.java index 2b072d2862f..d68d9076789 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/SchedulesHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/SchedulesHandler.java @@ -16,12 +16,14 @@ package org.glassfish.ejb.deployment.annotation.handlers; -import java.util.ArrayList; -import java.util.List; +import com.sun.enterprise.deployment.annotation.context.EjbContext; + import jakarta.ejb.Schedule; import jakarta.ejb.Schedules; -import com.sun.enterprise.deployment.annotation.context.EjbContext; +import java.util.ArrayList; +import java.util.List; + import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/SingletonHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/SingletonHandler.java index b88073abe37..3ca77a173da 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/SingletonHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/SingletonHandler.java @@ -16,12 +16,13 @@ package org.glassfish.ejb.deployment.annotation.handlers; -import java.lang.annotation.Annotation; -import java.lang.reflect.AnnotatedElement; import jakarta.ejb.DependsOn; import jakarta.ejb.Singleton; import jakarta.ejb.Startup; +import java.lang.annotation.Annotation; +import java.lang.reflect.AnnotatedElement; + import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatefulHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatefulHandler.java index f165e413e71..3d737d96d4e 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatefulHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatefulHandler.java @@ -16,9 +16,10 @@ package org.glassfish.ejb.deployment.annotation.handlers; +import jakarta.ejb.Stateful; + import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; -import jakarta.ejb.Stateful; import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatefulTimeoutHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatefulTimeoutHandler.java index 11bdfe38626..ffb1b01cade 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatefulTimeoutHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatefulTimeoutHandler.java @@ -16,10 +16,12 @@ package org.glassfish.ejb.deployment.annotation.handlers; -import java.lang.annotation.Annotation; +import com.sun.enterprise.deployment.annotation.context.EjbContext; + import jakarta.ejb.StatefulTimeout; -import com.sun.enterprise.deployment.annotation.context.EjbContext; +import java.lang.annotation.Annotation; + import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatelessHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatelessHandler.java index ddfb09288e5..58d4cb513a1 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatelessHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatelessHandler.java @@ -16,9 +16,10 @@ package org.glassfish.ejb.deployment.annotation.handlers; +import jakarta.ejb.Stateless; + import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; -import jakarta.ejb.Stateless; import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TimeoutHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TimeoutHandler.java index 38de0706c47..408cce94fe9 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TimeoutHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TimeoutHandler.java @@ -16,10 +16,12 @@ package org.glassfish.ejb.deployment.annotation.handlers; -import java.lang.annotation.Annotation; +import com.sun.enterprise.deployment.annotation.context.EjbContext; + import jakarta.ejb.Timeout; -import com.sun.enterprise.deployment.annotation.context.EjbContext; +import java.lang.annotation.Annotation; + import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TransactionManagementHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TransactionManagementHandler.java index 999174c4669..cf54f2a31a5 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TransactionManagementHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TransactionManagementHandler.java @@ -17,11 +17,13 @@ package org.glassfish.ejb.deployment.annotation.handlers; -import java.lang.annotation.Annotation; +import com.sun.enterprise.deployment.annotation.context.EjbContext; + import jakarta.ejb.TransactionManagement; import jakarta.ejb.TransactionManagementType; -import com.sun.enterprise.deployment.annotation.context.EjbContext; +import java.lang.annotation.Annotation; + import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/ActivationConfigDescriptor.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/ActivationConfigDescriptor.java index 6a7f1f57480..d3de1a167f5 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/ActivationConfigDescriptor.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/ActivationConfigDescriptor.java @@ -16,10 +16,11 @@ package org.glassfish.ejb.deployment.descriptor; -import java.util.Set; - import com.sun.enterprise.deployment.EnvironmentProperty; import com.sun.enterprise.deployment.OrderedSet; + +import java.util.Set; + import org.glassfish.deployment.common.Descriptor; /** diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/ConcurrentMethodDescriptor.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/ConcurrentMethodDescriptor.java index ab2375d2c0a..d81259a66f7 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/ConcurrentMethodDescriptor.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/ConcurrentMethodDescriptor.java @@ -16,9 +16,10 @@ package org.glassfish.ejb.deployment.descriptor; +import com.sun.enterprise.deployment.MethodDescriptor; + import java.util.concurrent.TimeUnit; -import com.sun.enterprise.deployment.MethodDescriptor; import org.glassfish.deployment.common.Descriptor; public class ConcurrentMethodDescriptor extends Descriptor { diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/InterceptorBindingDescriptor.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/InterceptorBindingDescriptor.java index d3435222730..9924fd42c35 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/InterceptorBindingDescriptor.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/InterceptorBindingDescriptor.java @@ -16,10 +16,11 @@ package org.glassfish.ejb.deployment.descriptor; +import com.sun.enterprise.deployment.MethodDescriptor; + import java.util.LinkedList; import java.util.List; -import com.sun.enterprise.deployment.MethodDescriptor; import org.glassfish.deployment.common.Descriptor; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/QueryDescriptor.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/QueryDescriptor.java index 150edce3fed..024ab67eca9 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/QueryDescriptor.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/QueryDescriptor.java @@ -17,12 +17,13 @@ package org.glassfish.ejb.deployment.descriptor; +import com.sun.enterprise.deployment.MethodDescriptor; +import com.sun.enterprise.deployment.util.DOLUtils; + import java.lang.reflect.Method; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.deployment.MethodDescriptor; -import com.sun.enterprise.deployment.util.DOLUtils; import org.glassfish.deployment.common.Descriptor; /** diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/runtime/MdbConnectionFactoryDescriptor.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/runtime/MdbConnectionFactoryDescriptor.java index 689feb433ff..7ba6a17bd37 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/runtime/MdbConnectionFactoryDescriptor.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/runtime/MdbConnectionFactoryDescriptor.java @@ -18,6 +18,7 @@ package org.glassfish.ejb.deployment.descriptor.runtime; import com.sun.enterprise.deployment.ResourcePrincipalDescriptor; + import org.glassfish.deployment.common.Descriptor; /** diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/ActivationConfigNode.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/ActivationConfigNode.java index 4059cd7fd0d..5cc4b4f5f95 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/ActivationConfigNode.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/ActivationConfigNode.java @@ -16,13 +16,14 @@ package org.glassfish.ejb.deployment.node; +import com.sun.enterprise.deployment.EnvironmentProperty; +import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; +import com.sun.enterprise.deployment.node.XMLElement; + import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import com.sun.enterprise.deployment.EnvironmentProperty; -import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; -import com.sun.enterprise.deployment.node.XMLElement; import org.glassfish.ejb.deployment.EjbTagNames; import org.glassfish.ejb.deployment.descriptor.ActivationConfigDescriptor; import org.w3c.dom.Node; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/AroundInvokeNode.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/AroundInvokeNode.java index caddbec6e3b..867dc56462e 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/AroundInvokeNode.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/AroundInvokeNode.java @@ -16,12 +16,13 @@ package org.glassfish.ejb.deployment.node; -import java.util.Map; - import com.sun.enterprise.deployment.EjbDescriptor; import com.sun.enterprise.deployment.EjbInterceptor; import com.sun.enterprise.deployment.LifecycleCallbackDescriptor; import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; + +import java.util.Map; + import org.glassfish.deployment.common.Descriptor; import org.glassfish.ejb.deployment.EjbTagNames; import org.w3c.dom.Node; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/CmpFieldNode.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/CmpFieldNode.java index a732823c46b..e753ff1c2fe 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/CmpFieldNode.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/CmpFieldNode.java @@ -16,9 +16,10 @@ package org.glassfish.ejb.deployment.node; +import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; + import java.util.Map; -import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; import org.glassfish.ejb.deployment.EjbTagNames; import org.glassfish.ejb.deployment.descriptor.FieldDescriptor; import org.w3c.dom.Node; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/EjbRelationNode.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/EjbRelationNode.java index a460dff3310..a6539db18e2 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/EjbRelationNode.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/EjbRelationNode.java @@ -16,10 +16,11 @@ package org.glassfish.ejb.deployment.node; -import java.util.Map; - import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; import com.sun.enterprise.deployment.node.XMLElement; + +import java.util.Map; + import org.glassfish.ejb.deployment.EjbTagNames; import org.glassfish.ejb.deployment.descriptor.RelationRoleDescriptor; import org.glassfish.ejb.deployment.descriptor.RelationshipDescriptor; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/EjbSessionNode.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/EjbSessionNode.java index 7ff1fc7f96b..36ced141099 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/EjbSessionNode.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/EjbSessionNode.java @@ -40,7 +40,27 @@ import org.w3c.dom.Node; import org.xml.sax.Attributes; -import static org.glassfish.ejb.deployment.EjbTagNames.*; +import static org.glassfish.ejb.deployment.EjbTagNames.AFTER_BEGIN_METHOD; +import static org.glassfish.ejb.deployment.EjbTagNames.AFTER_COMPLETION_METHOD; +import static org.glassfish.ejb.deployment.EjbTagNames.AROUND_INVOKE_METHOD; +import static org.glassfish.ejb.deployment.EjbTagNames.AROUND_TIMEOUT_METHOD; +import static org.glassfish.ejb.deployment.EjbTagNames.ASYNC_METHOD; +import static org.glassfish.ejb.deployment.EjbTagNames.BEFORE_COMPLETION_METHOD; +import static org.glassfish.ejb.deployment.EjbTagNames.CONCURRENCY_MANAGEMENT_TYPE; +import static org.glassfish.ejb.deployment.EjbTagNames.CONCURRENT_METHOD; +import static org.glassfish.ejb.deployment.EjbTagNames.DEPENDS_ON; +import static org.glassfish.ejb.deployment.EjbTagNames.INIT_METHOD; +import static org.glassfish.ejb.deployment.EjbTagNames.INIT_ON_STARTUP; +import static org.glassfish.ejb.deployment.EjbTagNames.LOCAL_BEAN; +import static org.glassfish.ejb.deployment.EjbTagNames.PASSIVATION_CAPABLE; +import static org.glassfish.ejb.deployment.EjbTagNames.POST_ACTIVATE_METHOD; +import static org.glassfish.ejb.deployment.EjbTagNames.PRE_PASSIVATE_METHOD; +import static org.glassfish.ejb.deployment.EjbTagNames.REMOVE_METHOD; +import static org.glassfish.ejb.deployment.EjbTagNames.SESSION_TYPE; +import static org.glassfish.ejb.deployment.EjbTagNames.STATEFUL_TIMEOUT; +import static org.glassfish.ejb.deployment.EjbTagNames.TIMEOUT_METHOD; +import static org.glassfish.ejb.deployment.EjbTagNames.TIMER; +import static org.glassfish.ejb.deployment.EjbTagNames.TRANSACTION_TYPE; /** * This class handles all information pertinent to session beans diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/ExcludeListNode.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/ExcludeListNode.java index 3da21391f12..6141635688f 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/ExcludeListNode.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/ExcludeListNode.java @@ -22,6 +22,7 @@ import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; import com.sun.enterprise.deployment.node.MethodNode; import com.sun.enterprise.deployment.node.XMLElement; + import org.glassfish.ejb.deployment.EjbTagNames; /** diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/InterceptorBindingNode.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/InterceptorBindingNode.java index 566e6c5707e..ac7c8960b54 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/InterceptorBindingNode.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/InterceptorBindingNode.java @@ -17,9 +17,6 @@ package org.glassfish.ejb.deployment.node; -import java.util.List; -import java.util.Map; - import com.sun.enterprise.deployment.EjbInterceptor; import com.sun.enterprise.deployment.MethodDescriptor; import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; @@ -27,6 +24,9 @@ import com.sun.enterprise.deployment.node.XMLElement; import com.sun.enterprise.deployment.xml.TagNames; +import java.util.List; +import java.util.Map; + import org.glassfish.ejb.deployment.EjbTagNames; import org.glassfish.ejb.deployment.descriptor.EjbDescriptor; import org.glassfish.ejb.deployment.descriptor.InterceptorBindingDescriptor; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/TimeoutValueNode.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/TimeoutValueNode.java index a476186deb8..71d88846e85 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/TimeoutValueNode.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/TimeoutValueNode.java @@ -17,13 +17,14 @@ package org.glassfish.ejb.deployment.node; +import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; +import com.sun.enterprise.deployment.node.XMLElement; + import java.util.HashMap; import java.util.Iterator; import java.util.Map; import java.util.concurrent.TimeUnit; -import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; -import com.sun.enterprise.deployment.node.XMLElement; import org.glassfish.ejb.deployment.EjbTagNames; import org.glassfish.ejb.deployment.descriptor.TimeoutValueDescriptor; import org.w3c.dom.Node; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/BeanCacheNode.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/BeanCacheNode.java index 3c7bc9101a0..f892b8205d5 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/BeanCacheNode.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/BeanCacheNode.java @@ -16,11 +16,12 @@ package org.glassfish.ejb.deployment.node.runtime; -import java.util.Map; - import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; import com.sun.enterprise.deployment.node.XMLElement; import com.sun.enterprise.deployment.xml.RuntimeTagNames; + +import java.util.Map; + import org.glassfish.ejb.deployment.descriptor.runtime.BeanCacheDescriptor; import org.w3c.dom.Node; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/BeanPoolNode.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/BeanPoolNode.java index 5b96eb59f35..7d84f0d8a86 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/BeanPoolNode.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/BeanPoolNode.java @@ -16,11 +16,12 @@ package org.glassfish.ejb.deployment.node.runtime; -import java.util.Map; - import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; import com.sun.enterprise.deployment.runtime.BeanPoolDescriptor; import com.sun.enterprise.deployment.xml.RuntimeTagNames; + +import java.util.Map; + import org.w3c.dom.Node; /** diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/FinderNode.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/FinderNode.java index d14d34289fc..6f4263fbb9a 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/FinderNode.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/FinderNode.java @@ -16,10 +16,11 @@ package org.glassfish.ejb.deployment.node.runtime; -import java.util.Map; - import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; import com.sun.enterprise.deployment.xml.RuntimeTagNames; + +import java.util.Map; + import org.glassfish.ejb.deployment.descriptor.runtime.IASEjbCMPFinder; import org.w3c.dom.Node; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/GFEjbBundleRuntimeNode.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/GFEjbBundleRuntimeNode.java index b43d0c64560..f98ece039a9 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/GFEjbBundleRuntimeNode.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/GFEjbBundleRuntimeNode.java @@ -17,11 +17,12 @@ package org.glassfish.ejb.deployment.node.runtime; -import java.util.Map; - import com.sun.enterprise.deployment.node.XMLElement; import com.sun.enterprise.deployment.xml.DTDRegistry; import com.sun.enterprise.deployment.xml.RuntimeTagNames; + +import java.util.Map; + import org.glassfish.ejb.deployment.descriptor.EjbBundleDescriptorImpl; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/MDBConnectionFactoryNode.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/MDBConnectionFactoryNode.java index 72574c388b5..acc6034b685 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/MDBConnectionFactoryNode.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/MDBConnectionFactoryNode.java @@ -16,13 +16,14 @@ package org.glassfish.ejb.deployment.node.runtime; -import java.util.Map; - import com.sun.enterprise.deployment.ResourcePrincipalDescriptor; import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; import com.sun.enterprise.deployment.node.XMLElement; import com.sun.enterprise.deployment.node.runtime.DefaultResourcePrincipalNode; import com.sun.enterprise.deployment.xml.RuntimeTagNames; + +import java.util.Map; + import org.glassfish.ejb.deployment.descriptor.runtime.MdbConnectionFactoryDescriptor; import org.w3c.dom.Node; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/PMInUseNode.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/PMInUseNode.java index f4734c5ddf8..9c9b9f020d4 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/PMInUseNode.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/node/runtime/PMInUseNode.java @@ -17,11 +17,12 @@ package org.glassfish.ejb.deployment.node.runtime; +import com.sun.enterprise.deployment.node.runtime.RuntimeDescriptorNode; +import com.sun.enterprise.deployment.xml.RuntimeTagNames; + import java.util.HashMap; import java.util.Map; -import com.sun.enterprise.deployment.node.runtime.RuntimeDescriptorNode; -import com.sun.enterprise.deployment.xml.RuntimeTagNames; import org.glassfish.ejb.deployment.descriptor.runtime.PersistenceManagerInUse; import org.w3c.dom.Node; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/embedded/DeploymentElement.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/embedded/DeploymentElement.java index 1dcc97d4819..44e257532a7 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/embedded/DeploymentElement.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/embedded/DeploymentElement.java @@ -16,21 +16,22 @@ package org.glassfish.ejb.embedded; +import com.sun.ejb.containers.EjbContainerUtilImpl; +import com.sun.enterprise.util.io.FileUtils; +import com.sun.logging.LogDomains; + +import jakarta.ejb.EJBException; + import java.io.File; import java.io.IOException; import java.util.Arrays; import java.util.List; import java.util.Set; -import java.util.logging.Logger; import java.util.logging.Level; +import java.util.logging.Logger; -import jakarta.ejb.EJBException; - -import org.glassfish.embeddable.archive.ScatteredArchive; import org.glassfish.deployment.common.ModuleExploder; -import com.sun.enterprise.util.io.FileUtils; -import com.sun.logging.LogDomains; -import com.sun.ejb.containers.EjbContainerUtilImpl; +import org.glassfish.embeddable.archive.ScatteredArchive; /** * Wrapper that allows to distinguish between an EJB module and a library reference. diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/embedded/EJBContainerImpl.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/embedded/EJBContainerImpl.java index 46d5e39cf72..c337c309ba9 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/embedded/EJBContainerImpl.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/embedded/EJBContainerImpl.java @@ -17,22 +17,23 @@ package org.glassfish.ejb.embedded; +import com.sun.appserv.connectors.internal.api.ConnectorRuntime; +import com.sun.ejb.containers.EjbContainerUtilImpl; +import com.sun.enterprise.util.io.FileUtils; +import com.sun.logging.LogDomains; + +import jakarta.ejb.EJBException; +import jakarta.ejb.embeddable.EJBContainer; +import jakarta.transaction.TransactionManager; + import java.io.File; import java.util.Map; import java.util.Set; -import java.util.logging.Logger; import java.util.logging.Level; +import java.util.logging.Logger; import javax.naming.Context; import javax.naming.InitialContext; -import jakarta.ejb.embeddable.EJBContainer; -import jakarta.ejb.EJBException; -import jakarta.transaction.TransactionManager; - -import com.sun.logging.LogDomains; -import com.sun.ejb.containers.EjbContainerUtilImpl; -import com.sun.appserv.connectors.internal.api.ConnectorRuntime; -import com.sun.enterprise.util.io.FileUtils; import org.glassfish.embeddable.Deployer; import org.glassfish.embeddable.GlassFish; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/embedded/EJBContainerProviderImpl.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/embedded/EJBContainerProviderImpl.java index 2510e432b01..bf94e370d5c 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/embedded/EJBContainerProviderImpl.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/embedded/EJBContainerProviderImpl.java @@ -17,37 +17,44 @@ package org.glassfish.ejb.embedded; -import java.io.*; -import java.util.*; -import java.util.logging.Logger; -import java.util.logging.Level; -import java.util.jar.JarFile; -import java.util.jar.Manifest; -import java.util.jar.Attributes; +import com.sun.enterprise.deploy.shared.ArchiveFactory; +import com.sun.enterprise.deployment.EjbBundleDescriptor; +import com.sun.enterprise.module.bootstrap.Which; +import com.sun.enterprise.security.EmbeddedSecurity; +import com.sun.enterprise.util.i18n.StringManager; +import com.sun.logging.LogDomains; import jakarta.ejb.EJBException; import jakarta.ejb.embeddable.EJBContainer; import jakarta.ejb.spi.EJBContainerProvider; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.jar.Attributes; +import java.util.jar.JarFile; +import java.util.jar.Manifest; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.container.Sniffer; import org.glassfish.api.deployment.archive.ReadableArchive; - -import org.glassfish.deployment.common.ModuleDescriptor; -import org.glassfish.embeddable.*; - -import org.glassfish.deployment.common.GenericAnnotationDetector; import org.glassfish.deployment.common.DeploymentUtils; -import com.sun.enterprise.deployment.EjbBundleDescriptor; +import org.glassfish.deployment.common.GenericAnnotationDetector; +import org.glassfish.deployment.common.ModuleDescriptor; import org.glassfish.ejb.deployment.io.EjbDeploymentDescriptorFile; +import org.glassfish.embeddable.BootstrapProperties; +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishProperties; +import org.glassfish.embeddable.GlassFishRuntime; import org.glassfish.hk2.api.ServiceLocator; -import com.sun.enterprise.deploy.shared.ArchiveFactory; -import com.sun.enterprise.util.i18n.StringManager; -import com.sun.logging.LogDomains; -import com.sun.enterprise.security.EmbeddedSecurity; - -import com.sun.enterprise.module.bootstrap.Which; - /** * GlassFish implementation of the EJBContainerProvider. * diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/EjbSecurityComponentInvocationHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/EjbSecurityComponentInvocationHandler.java index cdcc24f5ca3..678d775e4d2 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/EjbSecurityComponentInvocationHandler.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/EjbSecurityComponentInvocationHandler.java @@ -16,8 +16,11 @@ package org.glassfish.ejb.security.application; -import static java.util.logging.Level.SEVERE; -import static org.glassfish.api.invocation.ComponentInvocation.ComponentInvocationType.EJB_INVOCATION; +import com.sun.ejb.EjbInvocation; +import com.sun.logging.LogDomains; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.util.logging.Logger; @@ -29,11 +32,8 @@ import org.glassfish.api.invocation.RegisteredComponentInvocationHandler; import org.jvnet.hk2.annotations.Service; -import com.sun.ejb.EjbInvocation; -import com.sun.logging.LogDomains; - -import jakarta.inject.Inject; -import jakarta.inject.Singleton; +import static java.util.logging.Level.SEVERE; +import static org.glassfish.api.invocation.ComponentInvocation.ComponentInvocationType.EJB_INVOCATION; @Service(name = "ejbSecurityCIH") @Singleton diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/startup/EjbContainerStarter.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/startup/EjbContainerStarter.java index f08430ab42b..2ca5d26b41b 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/startup/EjbContainerStarter.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/startup/EjbContainerStarter.java @@ -17,11 +17,13 @@ package org.glassfish.ejb.startup; import com.sun.ejb.containers.EjbContainerUtil; -import org.glassfish.api.container.Container; + import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; + +import org.glassfish.api.container.Container; import org.glassfish.hk2.api.PostConstruct; import org.glassfish.hk2.api.PreDestroy; +import org.jvnet.hk2.annotations.Service; /** diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/startup/SingletonLifeCycleManager.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/startup/SingletonLifeCycleManager.java index 808ce6c5979..7e651bb132b 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/startup/SingletonLifeCycleManager.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/startup/SingletonLifeCycleManager.java @@ -16,6 +16,11 @@ package org.glassfish.ejb.startup; +import com.sun.ejb.containers.AbstractSingletonContainer; +import com.sun.enterprise.deployment.Application; +import com.sun.enterprise.deployment.BundleDescriptor; +import com.sun.logging.LogDomains; + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -29,10 +34,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.ejb.containers.AbstractSingletonContainer; -import com.sun.enterprise.deployment.Application; -import com.sun.enterprise.deployment.BundleDescriptor; -import com.sun.logging.LogDomains; import org.glassfish.ejb.deployment.descriptor.EjbDescriptor; import org.glassfish.ejb.deployment.descriptor.EjbSessionDescriptor; diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/upgrade/EJBTimerServiceUpgrade.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/upgrade/EJBTimerServiceUpgrade.java index 4fc1ffa6136..da9057d1b72 100644 --- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/upgrade/EJBTimerServiceUpgrade.java +++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/upgrade/EJBTimerServiceUpgrade.java @@ -16,19 +16,20 @@ package org.glassfish.ejb.upgrade; +import com.sun.ejb.containers.EjbContainerUtil; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Configs; + +import jakarta.inject.Inject; + import java.beans.PropertyVetoException; import java.util.List; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Configs; import org.glassfish.api.admin.config.ConfigurationUpgrade; -import com.sun.ejb.containers.EjbContainerUtil; import org.glassfish.ejb.config.EjbContainer; import org.glassfish.ejb.config.EjbTimerService; - -import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PostConstruct; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; diff --git a/appserver/ejb/ejb-container/src/test/java/com/sun/ejb/EJBUtilsTest.java b/appserver/ejb/ejb-container/src/test/java/com/sun/ejb/EJBUtilsTest.java index 4c38299b230..6c95681967b 100644 --- a/appserver/ejb/ejb-container/src/test/java/com/sun/ejb/EJBUtilsTest.java +++ b/appserver/ejb/ejb-container/src/test/java/com/sun/ejb/EJBUtilsTest.java @@ -17,12 +17,14 @@ package com.sun.ejb; import com.sun.ejb.codegen.EjbClassGeneratorFactory; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/appserver/ejb/ejb-container/src/test/java/com/sun/ejb/EjbClassGeneratorFactoryBenchmarkTest.java b/appserver/ejb/ejb-container/src/test/java/com/sun/ejb/EjbClassGeneratorFactoryBenchmarkTest.java index c770da31663..8b495c56cb6 100644 --- a/appserver/ejb/ejb-container/src/test/java/com/sun/ejb/EjbClassGeneratorFactoryBenchmarkTest.java +++ b/appserver/ejb/ejb-container/src/test/java/com/sun/ejb/EjbClassGeneratorFactoryBenchmarkTest.java @@ -16,11 +16,7 @@ package com.sun.ejb; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.lessThan; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import com.sun.ejb.codegen.EjbClassGeneratorFactory; import java.util.Collection; import java.util.concurrent.TimeUnit; @@ -38,7 +34,11 @@ import org.openjdk.jmh.runner.options.OptionsBuilder; import org.openjdk.jmh.runner.options.TimeValue; -import com.sun.ejb.codegen.EjbClassGeneratorFactory; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.lessThan; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @author David Matejcek diff --git a/appserver/ejb/ejb-container/src/test/java/com/sun/ejb/containers/EjbContainerUtilImplTest.java b/appserver/ejb/ejb-container/src/test/java/com/sun/ejb/containers/EjbContainerUtilImplTest.java index c0129992100..82c303deb9d 100644 --- a/appserver/ejb/ejb-container/src/test/java/com/sun/ejb/containers/EjbContainerUtilImplTest.java +++ b/appserver/ejb/ejb-container/src/test/java/com/sun/ejb/containers/EjbContainerUtilImplTest.java @@ -16,27 +16,27 @@ package com.sun.ejb.containers; +import com.sun.enterprise.deployment.xml.RuntimeTagNames; + import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; +import java.lang.reflect.Field; import java.util.logging.FileHandler; import java.util.logging.Level; import java.util.logging.Logger; import java.util.logging.SimpleFormatter; -import org.glassfish.kernel.KernelLoggerInfo; import org.glassfish.ejb.config.EjbContainer; -import com.sun.enterprise.deployment.xml.RuntimeTagNames; - +import org.glassfish.kernel.KernelLoggerInfo; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import static org.hamcrest.MatcherAssert.assertThat; + import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.stringContainsInOrder; -import java.lang.reflect.Field; - public class EjbContainerUtilImplTest { private static final String LINE_SEP = System.getProperty("line.separator"); private static final String FILE_SEP = System.getProperty("file.separator"); diff --git a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/MessageBeanContainerFactory.java b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/MessageBeanContainerFactory.java index b217ce389d5..0afb9b138d8 100644 --- a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/MessageBeanContainerFactory.java +++ b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/MessageBeanContainerFactory.java @@ -17,16 +17,16 @@ package org.glassfish.ejb.mdb; -import org.glassfish.api.deployment.DeploymentContext; -import org.glassfish.ejb.deployment.descriptor.EjbDescriptor; -import org.jvnet.hk2.annotations.Service; - import com.sun.ejb.Container; import com.sun.ejb.ContainerFactory; import com.sun.ejb.containers.BaseContainerFactory; import jakarta.inject.Singleton; +import org.glassfish.api.deployment.DeploymentContext; +import org.glassfish.ejb.deployment.descriptor.EjbDescriptor; +import org.jvnet.hk2.annotations.Service; + @Service(name = "MessageBeanContainerFactory") @Singleton public final class MessageBeanContainerFactory extends BaseContainerFactory implements ContainerFactory { diff --git a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/MessageBeanContextImpl.java b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/MessageBeanContextImpl.java index 28c97519483..16afe3ca3d4 100644 --- a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/MessageBeanContextImpl.java +++ b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/MessageBeanContextImpl.java @@ -17,8 +17,6 @@ package org.glassfish.ejb.mdb; -import org.glassfish.api.invocation.ComponentInvocation; - import com.sun.ejb.EjbInvocation; import com.sun.ejb.containers.BaseContainer; import com.sun.ejb.containers.EJBContextImpl; @@ -33,6 +31,8 @@ import jakarta.ejb.TimerService; import jakarta.transaction.UserTransaction; +import org.glassfish.api.invocation.ComponentInvocation; + /** * Implementation of EJBContext for message-driven beans * diff --git a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/MessageBeanListenerImpl.java b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/MessageBeanListenerImpl.java index a0461d7dd41..7c9524d3807 100644 --- a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/MessageBeanListenerImpl.java +++ b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/MessageBeanListenerImpl.java @@ -17,13 +17,13 @@ package org.glassfish.ejb.mdb; -import static org.glassfish.ejb.mdb.MessageBeanContainer.MessageDeliveryType.Message; +import com.sun.appserv.connectors.internal.api.ResourceHandle; import java.lang.reflect.Method; import org.glassfish.ejb.api.MessageBeanListener; -import com.sun.appserv.connectors.internal.api.ResourceHandle; +import static org.glassfish.ejb.mdb.MessageBeanContainer.MessageDeliveryType.Message; /** * diff --git a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/deployment/annotation/handlers/MessageDrivenHandler.java b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/deployment/annotation/handlers/MessageDrivenHandler.java index 0fe77ff2de7..0ce3635f40a 100644 --- a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/deployment/annotation/handlers/MessageDrivenHandler.java +++ b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/deployment/annotation/handlers/MessageDrivenHandler.java @@ -16,19 +16,21 @@ package org.glassfish.ejb.mdb.deployment.annotation.handlers; +import com.sun.enterprise.deployment.EnvironmentProperty; +import com.sun.enterprise.deployment.annotation.context.EjbBundleContext; + +import jakarta.ejb.ActivationConfigProperty; +import jakarta.ejb.MessageDriven; + import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; import java.util.logging.Level; -import jakarta.ejb.ActivationConfigProperty; -import jakarta.ejb.MessageDriven; -import org.glassfish.ejb.deployment.annotation.handlers.AbstractEjbHandler; -import com.sun.enterprise.deployment.EnvironmentProperty; -import com.sun.enterprise.deployment.annotation.context.EjbBundleContext; import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; import org.glassfish.apf.HandlerProcessingResult; +import org.glassfish.ejb.deployment.annotation.handlers.AbstractEjbHandler; import org.glassfish.ejb.deployment.descriptor.EjbBundleDescriptorImpl; import org.glassfish.ejb.deployment.descriptor.EjbDescriptor; import org.glassfish.ejb.deployment.descriptor.EjbMessageBeanDescriptor; diff --git a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/monitoring/stats/MessageDrivenBeanStatsProvider.java b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/monitoring/stats/MessageDrivenBeanStatsProvider.java index 9f63ea279f9..0aa6a6f38e4 100644 --- a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/monitoring/stats/MessageDrivenBeanStatsProvider.java +++ b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/monitoring/stats/MessageDrivenBeanStatsProvider.java @@ -17,10 +17,15 @@ package org.glassfish.ejb.mdb.monitoring.stats; import com.sun.ejb.monitoring.stats.EjbMonitoringStatsProvider; -import org.glassfish.external.probe.provider.annotations.*; -import org.glassfish.external.statistics.*; -import org.glassfish.external.statistics.impl.*; -import org.glassfish.gmbal.*; + +import org.glassfish.external.probe.provider.annotations.ProbeListener; +import org.glassfish.external.probe.provider.annotations.ProbeParam; +import org.glassfish.external.statistics.CountStatistic; +import org.glassfish.external.statistics.impl.CountStatisticImpl; +import org.glassfish.gmbal.AMXMetadata; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedObject; /** * Probe listener for the Message-Driven Beans part of the EJB monitoring events. diff --git a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/DistributedEJBTimerService.java b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/DistributedEJBTimerService.java index 16160878ef0..3b953811a34 100644 --- a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/DistributedEJBTimerService.java +++ b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/DistributedEJBTimerService.java @@ -17,25 +17,25 @@ package org.glassfish.ejb.persistent.timer; import com.sun.ejb.PersistentTimerService; +import com.sun.ejb.containers.EJBTimerService; import com.sun.ejb.containers.EjbContainerUtil; import com.sun.ejb.containers.EjbContainerUtilImpl; -import com.sun.ejb.containers.EJBTimerService; -import com.sun.enterprise.transaction.api.RecoveryResourceRegistry; -import com.sun.enterprise.transaction.spi.RecoveryEventListener; - -import org.glassfish.gms.bootstrap.GMSAdapter; -import org.glassfish.gms.bootstrap.GMSAdapterService; import com.sun.enterprise.ee.cms.core.CallBack; import com.sun.enterprise.ee.cms.core.GMSConstants; import com.sun.enterprise.ee.cms.core.PlannedShutdownSignal; import com.sun.enterprise.ee.cms.core.Signal; +import com.sun.enterprise.transaction.api.RecoveryResourceRegistry; +import com.sun.enterprise.transaction.spi.RecoveryEventListener; -import org.jvnet.hk2.annotations.Service; import jakarta.inject.Inject; -import org.glassfish.hk2.api.PostConstruct; -import java.util.logging.Logger; import java.util.logging.Level; +import java.util.logging.Logger; + +import org.glassfish.gms.bootstrap.GMSAdapter; +import org.glassfish.gms.bootstrap.GMSAdapterService; +import org.glassfish.hk2.api.PostConstruct; +import org.jvnet.hk2.annotations.Service; @Service public class DistributedEJBTimerService diff --git a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/TimerBean.java b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/TimerBean.java index e51d10a9564..fa63c85f83a 100644 --- a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/TimerBean.java +++ b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/TimerBean.java @@ -16,38 +16,36 @@ package org.glassfish.ejb.persistent.timer; -import java.io.Serializable; -import java.io.IOException; -import java.io.ObjectStreamException; - -import java.util.Date; -import java.util.Collection; -import java.util.Iterator; -import java.util.Set; -import java.util.HashSet; -import java.util.logging.Logger; -import java.util.logging.Level; +import com.sun.ejb.containers.EJBContextImpl; +import com.sun.ejb.containers.EJBTimerSchedule; +import com.sun.ejb.containers.EJBTimerService; +import com.sun.ejb.containers.TimerPrimaryKey; +import com.sun.logging.LogDomains; +import jakarta.annotation.Resource; import jakarta.ejb.CreateException; import jakarta.ejb.FinderException; import jakarta.ejb.SessionContext; import jakarta.ejb.Stateless; import jakarta.ejb.TimerConfig; - import jakarta.persistence.EntityManager; -import jakarta.persistence.Query; import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; -import jakarta.annotation.Resource; -import javax.naming.InitialContext; -import javax.sql.DataSource; +import java.io.IOException; +import java.io.ObjectStreamException; +import java.io.Serializable; import java.sql.Connection; +import java.util.Collection; +import java.util.Date; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; -import com.sun.ejb.containers.EJBContextImpl; -import com.sun.ejb.containers.EJBTimerService; -import com.sun.ejb.containers.EJBTimerSchedule; -import com.sun.ejb.containers.TimerPrimaryKey; -import com.sun.logging.LogDomains; +import javax.naming.InitialContext; +import javax.sql.DataSource; /** * TimerBean is a facade for the persistent state of an EJB Timer. diff --git a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/TimerLocal.java b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/TimerLocal.java index facfece437c..bd92427d597 100644 --- a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/TimerLocal.java +++ b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/TimerLocal.java @@ -16,16 +16,16 @@ package org.glassfish.ejb.persistent.timer; -import java.util.Collection; -import java.util.Date; -import java.util.Set; +import com.sun.ejb.containers.EJBTimerSchedule; +import com.sun.ejb.containers.TimerPrimaryKey; import jakarta.ejb.CreateException; -import jakarta.ejb.TimerConfig; import jakarta.ejb.Local; +import jakarta.ejb.TimerConfig; -import com.sun.ejb.containers.EJBTimerSchedule; -import com.sun.ejb.containers.TimerPrimaryKey; +import java.util.Collection; +import java.util.Date; +import java.util.Set; /** * Local view of the persistent representation of an EJB timer. diff --git a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/TimerState.java b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/TimerState.java index 048879b05c6..049dbe28316 100644 --- a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/TimerState.java +++ b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/TimerState.java @@ -16,6 +16,11 @@ package org.glassfish.ejb.persistent.timer; +import com.sun.ejb.EJBUtils; +import com.sun.ejb.containers.EJBTimerSchedule; +import com.sun.ejb.containers.EJBTimerService; +import com.sun.logging.LogDomains; + import jakarta.persistence.Basic; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -23,23 +28,18 @@ import jakarta.persistence.Id; import jakarta.persistence.IdClass; import jakarta.persistence.Lob; -import jakarta.persistence.NamedQuery; import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; import jakarta.persistence.PostLoad; import jakarta.persistence.Table; import jakarta.persistence.Transient; -import java.io.Serializable; import java.io.IOException; +import java.io.Serializable; import java.util.Date; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.ejb.EJBUtils; -import com.sun.ejb.containers.EJBTimerService; -import com.sun.ejb.containers.EJBTimerSchedule; -import com.sun.logging.LogDomains; - /** * TimerState represents the state of a persistent EJB Timer. * It is part of the EJB container and is implemented as an Entity. diff --git a/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/api/EJBInvocation.java b/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/api/EJBInvocation.java index 3a8b28af1cb..9c0d31e704f 100644 --- a/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/api/EJBInvocation.java +++ b/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/api/EJBInvocation.java @@ -16,10 +16,10 @@ package org.glassfish.ejb.api; -import java.lang.reflect.Method; - import jakarta.ejb.EJBContext; +import java.lang.reflect.Method; + /** * This interface provides access to the exported portions of the ejb invocation object. * diff --git a/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/api/EjbContainerServices.java b/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/api/EjbContainerServices.java index f122e2e1ec9..50735d8de73 100644 --- a/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/api/EjbContainerServices.java +++ b/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/api/EjbContainerServices.java @@ -17,6 +17,8 @@ package org.glassfish.ejb.api; +import java.io.Serializable; + /** * * @author Kenneth Saks @@ -24,8 +26,6 @@ import org.jvnet.hk2.annotations.Contract; -import java.io.Serializable; - /** * Various container services needed by other modules. E.g., the CDI integration module. */ diff --git a/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/api/MessageBeanProtocolManager.java b/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/api/MessageBeanProtocolManager.java index f16effa8d84..8cf539cca60 100644 --- a/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/api/MessageBeanProtocolManager.java +++ b/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/api/MessageBeanProtocolManager.java @@ -16,12 +16,12 @@ package org.glassfish.ejb.api; +import com.sun.appserv.connectors.internal.api.ResourceHandle; +import com.sun.enterprise.deployment.runtime.BeanPoolDescriptor; + import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; -import com.sun.enterprise.deployment.runtime.BeanPoolDescriptor; -import com.sun.appserv.connectors.internal.api.ResourceHandle; - /** * MessageBeanProtocolManager is implemented by the MessageBeanContainer * and allows MessageBeanClients to create message bean listeners diff --git a/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/api/ResourcesExceededException.java b/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/api/ResourcesExceededException.java index f76e161b921..27786486f86 100644 --- a/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/api/ResourcesExceededException.java +++ b/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/api/ResourcesExceededException.java @@ -16,8 +16,8 @@ package org.glassfish.ejb.api; -import java.io.PrintWriter; import java.io.PrintStream; +import java.io.PrintWriter; public class ResourcesExceededException extends Exception { diff --git a/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/spi/EjbContainerInterceptor.java b/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/spi/EjbContainerInterceptor.java index af6f369c292..970205abe6b 100644 --- a/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/spi/EjbContainerInterceptor.java +++ b/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/spi/EjbContainerInterceptor.java @@ -16,10 +16,10 @@ package org.glassfish.ejb.spi; -import org.jvnet.hk2.annotations.Contract; - import com.sun.enterprise.deployment.EjbDescriptor; +import org.jvnet.hk2.annotations.Contract; + /** * Contract interface for registering EjbContainerInterceptor to * the Ejb Container. It can be inherited by anyone who want to diff --git a/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/spi/MessageBeanClientFactory.java b/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/spi/MessageBeanClientFactory.java index c2ce15feb14..9f12a8a3232 100644 --- a/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/spi/MessageBeanClientFactory.java +++ b/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/spi/MessageBeanClientFactory.java @@ -17,6 +17,7 @@ package org.glassfish.ejb.spi; import com.sun.enterprise.deployment.EjbMessageBeanDescriptor; + import org.jvnet.hk2.annotations.Contract; /* diff --git a/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/spi/WSEjbEndpointRegistry.java b/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/spi/WSEjbEndpointRegistry.java index dad5f2c26bd..975c129fd73 100644 --- a/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/spi/WSEjbEndpointRegistry.java +++ b/appserver/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/spi/WSEjbEndpointRegistry.java @@ -16,10 +16,11 @@ package org.glassfish.ejb.spi; -import org.jvnet.hk2.annotations.Contract; -import org.glassfish.ejb.api.EjbEndpointFacade; import com.sun.enterprise.deployment.WebServiceEndpoint; +import org.glassfish.ejb.api.EjbEndpointFacade; +import org.jvnet.hk2.annotations.Contract; + /* * This interface is the contract for the service WebServiceEjbEndpointRegistry * which will lie in the webservices module diff --git a/appserver/ejb/ejb-timer-service-app/src/main/java/com/sun/ejb/timers/TimerWelcomeServlet.java b/appserver/ejb/ejb-timer-service-app/src/main/java/com/sun/ejb/timers/TimerWelcomeServlet.java index 91338a431d2..244b0bd44c1 100644 --- a/appserver/ejb/ejb-timer-service-app/src/main/java/com/sun/ejb/timers/TimerWelcomeServlet.java +++ b/appserver/ejb/ejb-timer-service-app/src/main/java/com/sun/ejb/timers/TimerWelcomeServlet.java @@ -21,15 +21,19 @@ package com.sun.ejb.timers; -import java.io.*; -import java.util.Set; +import com.sun.ejb.containers.EJBTimerService; -import jakarta.servlet.*; -import jakarta.ejb.*; -import jakarta.servlet.http.*; +import jakarta.ejb.EJB; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Set; import org.glassfish.ejb.persistent.timer.TimerLocal; -import com.sun.ejb.containers.EJBTimerService; /** * From de3d1f3645a5e2cd49bf430b4e62eb64c0cf772d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 00:16:02 +0200 Subject: [PATCH 13/40] Imports: transaction modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../transaction/api/JavaEETransaction.java | 5 +- .../api/RecoveryResourceRegistry.java | 9 +-- .../transaction/api/TransactionImport.java | 3 +- .../transaction/api/XAResourceWrapper.java | 9 ++- .../config/TransactionService.java | 15 ++--- .../spi/JavaEETransactionManagerDelegate.java | 22 ++++--- .../spi/RecoveryResourceHandler.java | 4 +- .../transaction/spi/TransactionInternal.java | 6 +- .../spi/TransactionOperationsManager.java | 1 + .../spi/TransactionalResource.java | 1 + .../transaction/JavaEETransactionImpl.java | 26 ++++---- .../JavaEETransactionManagerSimplified.java | 60 +++++++++--------- ...ETransactionManagerSimplifiedDelegate.java | 24 +++---- .../TransactionInvocationHandler.java | 8 +-- .../transaction/TransactionManagerHelper.java | 24 +++---- .../TransactionServiceConfigListener.java | 22 +++---- ...ransactionSynchronizationRegistryImpl.java | 14 ++--- .../transaction/UserTransactionImpl.java | 26 ++++---- .../TransactionServiceStatsProvider.java | 6 +- .../jta/admin/cli/RollbackTransaction.java | 22 +++---- .../admin/cli/UnFreezeTransactionService.java | 36 +++++------ ...avaEETransactionManagerSimplifiedTest.java | 18 +++--- .../jts/ResourceRecoveryManagerImpl.java | 48 +++++++------- .../iiop/TransactionClientInterceptor.java | 4 +- .../TransactionIIOPInterceptorFactory.java | 24 +++---- .../iiop/TransactionInterceptorFactory.java | 4 +- .../iiop/TransactionServerInterceptor.java | 4 +- .../jts/iiop/TxIORInterceptor.java | 8 +-- .../transaction/jts/recovery/GMSCallBack.java | 26 ++++---- .../jts/recovery/OracleXAResource.java | 12 ++-- .../jts/recovery/RecoveryLockFile.java | 16 ++--- .../jts/recovery/SybaseXAResource.java | 8 +-- .../sun/jts/CosTransactions/AdminUtil.java | 4 +- .../jts/CosTransactions/Configuration.java | 1 - .../sun/jts/CosTransactions/ControlImpl.java | 41 ++++++++---- .../jts/CosTransactions/CoordinatorImpl.java | 45 ++++++++++--- .../jts/CosTransactions/CoordinatorLog.java | 25 +++++--- .../CosTransactions/CoordinatorLogPool.java | 5 +- .../CoordinatorResourceImpl.java | 33 ++++++---- .../CoordinatorSynchronizationImpl.java | 22 ++++--- .../jts/CosTransactions/CoordinatorTerm.java | 1 - .../sun/jts/CosTransactions/CurrentImpl.java | 1 - .../CosTransactions/CurrentTransaction.java | 1 - .../DefaultTransactionService.java | 36 +++++++---- .../DelegatedTimeoutManager.java | 13 ++-- .../sun/jts/CosTransactions/GlobalTID.java | 14 ++--- .../java/com/sun/jts/CosTransactions/Log.java | 9 +-- .../sun/jts/CosTransactions/LogControl.java | 11 ++-- .../CosTransactions/LogControlDescriptor.java | 4 +- .../sun/jts/CosTransactions/LogCursor.java | 1 - .../sun/jts/CosTransactions/LogExtent.java | 3 +- .../com/sun/jts/CosTransactions/LogFile.java | 9 ++- .../jts/CosTransactions/LogFileHandle.java | 6 +- .../sun/jts/CosTransactions/LogHandle.java | 9 ++- .../com/sun/jts/CosTransactions/LogLSN.java | 4 +- .../jts/CosTransactions/LogRecordEnding.java | 4 +- .../jts/CosTransactions/LogRecordHeader.java | 2 +- .../CosTransactions/LogRestartDescriptor.java | 2 +- .../com/sun/jts/CosTransactions/Messages.java | 4 +- .../sun/jts/CosTransactions/NestingInfo.java | 6 +- .../com/sun/jts/CosTransactions/RWLock.java | 5 +- .../RecoveryCoordinatorImpl.java | 22 +++++-- .../CosTransactions/RegisteredStatics.java | 6 +- .../jts/CosTransactions/StaticResource.java | 2 +- .../jts/CosTransactions/SubCoordinator.java | 17 ++++- .../sun/jts/CosTransactions/SuperiorInfo.java | 6 +- .../jts/CosTransactions/TerminatorImpl.java | 32 +++++++--- .../jts/CosTransactions/TopCoordinator.java | 47 +++++++++++--- .../TransactionFactoryImpl.java | 34 +++++++--- .../CosTransactions/TxInflowCoordinator.java | 2 +- .../TxInflowRecoveryCoordinator.java | 4 +- .../com/sun/jts/jta/NativeXAResource.java | 3 +- .../com/sun/jts/jta/SynchronizationImpl.java | 4 +- .../java/com/sun/jts/jta/TransactionImpl.java | 12 ++-- .../sun/jts/jta/TransactionManagerImpl.java | 63 ++++++++++++------- .../jts/jta/TransactionServiceProperties.java | 31 +++++---- .../com/sun/jts/jta/TransactionState.java | 40 ++++++++---- .../sun/jts/jta/UserTransactionFactory.java | 6 +- .../com/sun/jts/jta/UserTransactionImpl.java | 15 ++++- .../com/sun/jts/jtsxa/OTSResourceImpl.java | 42 +++++++++---- .../main/java/com/sun/jts/jtsxa/Utility.java | 9 ++- .../src/main/java/com/sun/jts/jtsxa/XID.java | 10 +-- .../com/sun/jts/pi/IORInterceptorImpl.java | 25 ++++---- .../java/com/sun/jts/pi/InterceptorImpl.java | 57 ++++++++++------- .../sun/jts/pi/InvocationPolicyFactory.java | 8 +-- .../com/sun/jts/pi/InvocationPolicyImpl.java | 5 +- .../com/sun/jts/pi/ORBInitializerImpl.java | 25 +++++--- .../java/com/sun/jts/pi/OTSPolicyFactory.java | 6 +- .../java/com/sun/jts/pi/OTSPolicyImpl.java | 5 +- .../sun/jts/trace/TraceRecordFormatter.java | 9 ++- .../utils/RecoveryHooks/FailureInducer.java | 19 +++--- .../jts/JavaEETransactionManagerTest.java | 22 ++++--- 92 files changed, 851 insertions(+), 573 deletions(-) diff --git a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/api/JavaEETransaction.java b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/api/JavaEETransaction.java index 7dda2298f9f..13ff58305ba 100644 --- a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/api/JavaEETransaction.java +++ b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/api/JavaEETransaction.java @@ -16,13 +16,14 @@ package com.sun.enterprise.transaction.api; -import org.jvnet.hk2.annotations.Contract; +import com.sun.enterprise.transaction.spi.TransactionalResource; import jakarta.persistence.EntityManagerFactory; import jakarta.transaction.Transaction; + import java.util.Set; -import com.sun.enterprise.transaction.spi.TransactionalResource; +import org.jvnet.hk2.annotations.Contract; @Contract public interface JavaEETransaction diff --git a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/api/RecoveryResourceRegistry.java b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/api/RecoveryResourceRegistry.java index c784a7be74a..8677a74d0f7 100644 --- a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/api/RecoveryResourceRegistry.java +++ b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/api/RecoveryResourceRegistry.java @@ -16,14 +16,15 @@ package com.sun.enterprise.transaction.api; -import org.jvnet.hk2.annotations.Service; +import com.sun.enterprise.transaction.spi.RecoveryEventListener; +import com.sun.enterprise.transaction.spi.RecoveryResourceListener; import jakarta.inject.Singleton; -import java.util.*; +import java.util.HashSet; +import java.util.Set; -import com.sun.enterprise.transaction.spi.RecoveryResourceListener; -import com.sun.enterprise.transaction.spi.RecoveryEventListener; +import org.jvnet.hk2.annotations.Service; /** diff --git a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/api/TransactionImport.java b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/api/TransactionImport.java index eb9b0888aa2..da723c10375 100644 --- a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/api/TransactionImport.java +++ b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/api/TransactionImport.java @@ -16,10 +16,11 @@ package com.sun.enterprise.transaction.api; +import jakarta.resource.spi.XATerminator; import jakarta.transaction.SystemException; + import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import jakarta.resource.spi.XATerminator; /** * Transaction Manager extensions to support transaction inflow w/o resource adapter. diff --git a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/api/XAResourceWrapper.java b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/api/XAResourceWrapper.java index 000993291c8..ad047908ad1 100644 --- a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/api/XAResourceWrapper.java +++ b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/api/XAResourceWrapper.java @@ -16,11 +16,14 @@ package com.sun.enterprise.transaction.api; -import javax.transaction.xa.*; -import javax.security.auth.Subject; +import com.sun.enterprise.util.i18n.StringManager; + import jakarta.resource.spi.ManagedConnection; -import com.sun.enterprise.util.i18n.StringManager; +import javax.security.auth.Subject; +import javax.transaction.xa.XAException; +import javax.transaction.xa.XAResource; +import javax.transaction.xa.Xid; /** * Wrappers over XAResources extend from this class. This class simply implements the diff --git a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/config/TransactionService.java b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/config/TransactionService.java index 6016c103d3c..522120714e8 100644 --- a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/config/TransactionService.java +++ b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/config/TransactionService.java @@ -16,23 +16,20 @@ package com.sun.enterprise.transaction.config; +import java.beans.PropertyVetoException; +import java.util.List; + import org.glassfish.api.admin.config.ConfigExtension; import org.glassfish.api.admin.config.Container; +import org.glassfish.api.admin.config.PropertiesDesc; +import org.glassfish.api.admin.config.PropertyDesc; +import org.glassfish.config.support.datatypes.PositiveInteger; import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.Element; import org.jvnet.hk2.config.types.Property; import org.jvnet.hk2.config.types.PropertyBag; - -import java.util.List; - -import java.beans.PropertyVetoException; - - -import org.glassfish.config.support.datatypes.PositiveInteger; -import org.glassfish.api.admin.config.PropertyDesc; -import org.glassfish.api.admin.config.PropertiesDesc; /** * Configuration for Transaction Manager */ diff --git a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/spi/JavaEETransactionManagerDelegate.java b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/spi/JavaEETransactionManagerDelegate.java index eb80980490b..af8843f12b7 100644 --- a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/spi/JavaEETransactionManagerDelegate.java +++ b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/spi/JavaEETransactionManagerDelegate.java @@ -16,17 +16,25 @@ package com.sun.enterprise.transaction.spi; -import java.util.concurrent.locks.Lock; - -import jakarta.transaction.*; -import javax.transaction.xa.*; -import jakarta.resource.spi.XATerminator; -import jakarta.resource.spi.work.WorkException; - import com.sun.enterprise.transaction.api.JavaEETransaction; import com.sun.enterprise.transaction.api.JavaEETransactionManager; import com.sun.enterprise.transaction.api.TransactionAdminBean; import com.sun.enterprise.transaction.api.XAResourceWrapper; + +import jakarta.resource.spi.XATerminator; +import jakarta.resource.spi.work.WorkException; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.InvalidTransactionException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; + +import java.util.concurrent.locks.Lock; + +import javax.transaction.xa.XAResource; +import javax.transaction.xa.Xid; + import org.jvnet.hk2.annotations.Contract; @Contract diff --git a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/spi/RecoveryResourceHandler.java b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/spi/RecoveryResourceHandler.java index 3abd48deede..19e55a1f23b 100644 --- a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/spi/RecoveryResourceHandler.java +++ b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/spi/RecoveryResourceHandler.java @@ -16,10 +16,10 @@ package com.sun.enterprise.transaction.spi; -import org.jvnet.hk2.annotations.Contract; - import java.util.List; +import org.jvnet.hk2.annotations.Contract; + /** * RecoveryResourceHandler will be used by transaction-manager to get resource instances.
      * Using these resource instances, transaction recovery will be done.
      diff --git a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/spi/TransactionInternal.java b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/spi/TransactionInternal.java index 615985986ea..94c53b00cec 100644 --- a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/spi/TransactionInternal.java +++ b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/spi/TransactionInternal.java @@ -16,7 +16,11 @@ package com.sun.enterprise.transaction.spi; -import jakarta.transaction.*; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionSynchronizationRegistry; public interface TransactionInternal extends Transaction { diff --git a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/spi/TransactionOperationsManager.java b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/spi/TransactionOperationsManager.java index 03c59c8b1d0..26a64d1c83a 100644 --- a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/spi/TransactionOperationsManager.java +++ b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/spi/TransactionOperationsManager.java @@ -17,6 +17,7 @@ package com.sun.enterprise.transaction.spi; import javax.naming.NameNotFoundException; + import org.jvnet.hk2.annotations.Contract; /** diff --git a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/spi/TransactionalResource.java b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/spi/TransactionalResource.java index 929d0caae0a..a6206d8a783 100644 --- a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/spi/TransactionalResource.java +++ b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/spi/TransactionalResource.java @@ -17,6 +17,7 @@ package com.sun.enterprise.transaction.spi; import jakarta.transaction.Transaction; + import javax.transaction.xa.XAResource; /** diff --git a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/JavaEETransactionImpl.java b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/JavaEETransactionImpl.java index c60c0b4e98e..966f39aec10 100644 --- a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/JavaEETransactionImpl.java +++ b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/JavaEETransactionImpl.java @@ -17,19 +17,6 @@ package com.sun.enterprise.transaction; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; -import java.util.Timer; -import java.util.TimerTask; -import java.util.Vector; -import java.util.logging.Level; -import java.util.logging.Logger; - -import javax.transaction.xa.XAResource; -import javax.transaction.xa.Xid; - import com.sun.enterprise.transaction.api.JavaEETransaction; import com.sun.enterprise.transaction.api.JavaEETransactionManager; import com.sun.enterprise.transaction.api.SimpleResource; @@ -47,6 +34,19 @@ import jakarta.transaction.Synchronization; import jakarta.transaction.SystemException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.Timer; +import java.util.TimerTask; +import java.util.Vector; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.transaction.xa.XAResource; +import javax.transaction.xa.Xid; + /** * This class implements the JTA Transaction API for the J2EE RI. It is a wrapper over the JTS Transaction object that * provides optimized local transaction support when a transaction uses zero/one non-XA resource, and delegates to JTS diff --git a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/JavaEETransactionManagerSimplified.java b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/JavaEETransactionManagerSimplified.java index adc6bfcb0c7..8a0f764fa0c 100644 --- a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/JavaEETransactionManagerSimplified.java +++ b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/JavaEETransactionManagerSimplified.java @@ -17,36 +17,6 @@ package com.sun.enterprise.transaction; -import java.rmi.RemoteException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Timer; -import java.util.TimerTask; -import java.util.logging.Level; -import java.util.logging.Logger; - -import javax.transaction.xa.XAException; -import javax.transaction.xa.XAResource; -import javax.transaction.xa.Xid; - -import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.api.invocation.ComponentInvocation; -import org.glassfish.api.invocation.InvocationException; -import org.glassfish.api.invocation.InvocationManager; -import org.glassfish.api.invocation.ResourceHandler; -import org.glassfish.common.util.Constants; -import org.glassfish.external.probe.provider.PluginPoint; -import org.glassfish.external.probe.provider.StatsProviderManager; -import org.glassfish.hk2.api.PostConstruct; -import org.glassfish.hk2.api.Rank; -import org.glassfish.hk2.api.ServiceLocator; -import org.jvnet.hk2.annotations.ContractsProvided; -import org.jvnet.hk2.annotations.Service; - import com.sun.appserv.util.cache.BaseCache; import com.sun.appserv.util.cache.Cache; import com.sun.enterprise.config.serverbeans.ModuleMonitoringLevels; @@ -77,6 +47,36 @@ import jakarta.transaction.Transaction; import jakarta.transaction.TransactionManager; +import java.rmi.RemoteException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Timer; +import java.util.TimerTask; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.transaction.xa.XAException; +import javax.transaction.xa.XAResource; +import javax.transaction.xa.Xid; + +import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.api.invocation.ComponentInvocation; +import org.glassfish.api.invocation.InvocationException; +import org.glassfish.api.invocation.InvocationManager; +import org.glassfish.api.invocation.ResourceHandler; +import org.glassfish.common.util.Constants; +import org.glassfish.external.probe.provider.PluginPoint; +import org.glassfish.external.probe.provider.StatsProviderManager; +import org.glassfish.hk2.api.PostConstruct; +import org.glassfish.hk2.api.Rank; +import org.glassfish.hk2.api.ServiceLocator; +import org.jvnet.hk2.annotations.ContractsProvided; +import org.jvnet.hk2.annotations.Service; + /** * Implementation of jakarta.transaction.TransactionManager interface. This class provides non-XA local transaction * support and delegates to implementation of the JavaEETransactionManagerDelegate for XA or LAO optimization, and diff --git a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/JavaEETransactionManagerSimplifiedDelegate.java b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/JavaEETransactionManagerSimplifiedDelegate.java index 6c3c57e2c7c..dc15cfcdd78 100644 --- a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/JavaEETransactionManagerSimplifiedDelegate.java +++ b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/JavaEETransactionManagerSimplifiedDelegate.java @@ -17,18 +17,6 @@ package com.sun.enterprise.transaction; -import java.util.concurrent.Semaphore; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantReadWriteLock; -import java.util.logging.Level; -import java.util.logging.Logger; - -import javax.transaction.xa.XAResource; -import javax.transaction.xa.Xid; - -import org.glassfish.hk2.api.PostConstruct; -import org.jvnet.hk2.annotations.Service; - import com.sun.enterprise.transaction.api.JavaEETransaction; import com.sun.enterprise.transaction.api.JavaEETransactionManager; import com.sun.enterprise.transaction.api.TransactionAdminBean; @@ -47,6 +35,18 @@ import jakarta.transaction.SystemException; import jakarta.transaction.Transaction; +import java.util.concurrent.Semaphore; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantReadWriteLock; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.transaction.xa.XAResource; +import javax.transaction.xa.Xid; + +import org.glassfish.hk2.api.PostConstruct; +import org.jvnet.hk2.annotations.Service; + /** ** Implementation of JavaEETransactionManagerDelegate that supports only local transactions with a single non-XA * resource. diff --git a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionInvocationHandler.java b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionInvocationHandler.java index 90fd04eae4c..b966c105ece 100644 --- a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionInvocationHandler.java +++ b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionInvocationHandler.java @@ -17,6 +17,10 @@ package com.sun.enterprise.transaction; +import com.sun.enterprise.transaction.api.JavaEETransactionManager; + +import jakarta.inject.Inject; + import org.glassfish.api.invocation.ComponentInvocation; import org.glassfish.api.invocation.ComponentInvocation.ComponentInvocationType; import org.glassfish.api.invocation.ComponentInvocationHandler; @@ -24,10 +28,6 @@ import org.glassfish.hk2.api.ServiceLocator; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.transaction.api.JavaEETransactionManager; - -import jakarta.inject.Inject; - @Service public class TransactionInvocationHandler implements ComponentInvocationHandler { diff --git a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionManagerHelper.java b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionManagerHelper.java index 1a6bdbd9669..dc6e2252ae8 100644 --- a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionManagerHelper.java +++ b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionManagerHelper.java @@ -17,18 +17,6 @@ package com.sun.enterprise.transaction; -import static org.glassfish.api.invocation.ComponentInvocation.ComponentInvocationType.SERVLET_INVOCATION; - -import java.rmi.RemoteException; - -import javax.transaction.xa.XAResource; -import javax.transaction.xa.Xid; - -import org.glassfish.api.invocation.ComponentInvocation; -import org.glassfish.api.invocation.InvocationManager; -import org.jvnet.hk2.annotations.ContractsProvided; -import org.jvnet.hk2.annotations.Service; - import com.sun.enterprise.transaction.api.JavaEETransactionManager; import com.sun.enterprise.transaction.api.TransactionImport; @@ -43,6 +31,18 @@ import jakarta.transaction.Transaction; import jakarta.transaction.TransactionManager; +import java.rmi.RemoteException; + +import javax.transaction.xa.XAResource; +import javax.transaction.xa.Xid; + +import org.glassfish.api.invocation.ComponentInvocation; +import org.glassfish.api.invocation.InvocationManager; +import org.jvnet.hk2.annotations.ContractsProvided; +import org.jvnet.hk2.annotations.Service; + +import static org.glassfish.api.invocation.ComponentInvocation.ComponentInvocationType.SERVLET_INVOCATION; + /** * This class is wrapper for the actual transaction manager implementation. JNDI lookup name * "java:appserver/TransactionManager" see the com/sun/enterprise/naming/java/javaURLContext.java diff --git a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionServiceConfigListener.java b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionServiceConfigListener.java index 1c1729f0855..2ad5d65e41e 100644 --- a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionServiceConfigListener.java +++ b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionServiceConfigListener.java @@ -17,8 +17,15 @@ package com.sun.enterprise.transaction; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.INFO; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.ModuleMonitoringLevels; +import com.sun.enterprise.config.serverbeans.ServerTags; +import com.sun.enterprise.transaction.api.JavaEETransactionManager; +import com.sun.enterprise.transaction.config.TransactionService; +import com.sun.enterprise.util.i18n.StringManager; +import com.sun.logging.LogDomains; + +import jakarta.inject.Inject; import java.beans.PropertyChangeEvent; import java.util.ArrayList; @@ -37,15 +44,8 @@ import org.jvnet.hk2.config.UnprocessedChangeEvents; import org.jvnet.hk2.config.types.Property; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.ModuleMonitoringLevels; -import com.sun.enterprise.config.serverbeans.ServerTags; -import com.sun.enterprise.transaction.api.JavaEETransactionManager; -import com.sun.enterprise.transaction.config.TransactionService; -import com.sun.enterprise.util.i18n.StringManager; -import com.sun.logging.LogDomains; - -import jakarta.inject.Inject; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.INFO; /** * ConfigListener class for TransactionService and TransactionService monitoring level changes diff --git a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionSynchronizationRegistryImpl.java b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionSynchronizationRegistryImpl.java index aff9dc6590b..f45291be6b5 100644 --- a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionSynchronizationRegistryImpl.java +++ b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/TransactionSynchronizationRegistryImpl.java @@ -17,13 +17,6 @@ package com.sun.enterprise.transaction; -import static jakarta.transaction.Status.STATUS_MARKED_ROLLBACK; -import static jakarta.transaction.Status.STATUS_NO_TRANSACTION; -import static jakarta.transaction.Status.STATUS_ROLLING_BACK; - -import org.jvnet.hk2.annotations.ContractsProvided; -import org.jvnet.hk2.annotations.Service; - import com.sun.enterprise.util.i18n.StringManager; import jakarta.inject.Inject; @@ -33,6 +26,13 @@ import jakarta.transaction.TransactionManager; import jakarta.transaction.TransactionSynchronizationRegistry; +import org.jvnet.hk2.annotations.ContractsProvided; +import org.jvnet.hk2.annotations.Service; + +import static jakarta.transaction.Status.STATUS_MARKED_ROLLBACK; +import static jakarta.transaction.Status.STATUS_NO_TRANSACTION; +import static jakarta.transaction.Status.STATUS_ROLLING_BACK; + @Service @ContractsProvided({ TransactionSynchronizationRegistryImpl.class, TransactionSynchronizationRegistry.class }) // Needed because we can't change spec provided class public class TransactionSynchronizationRegistryImpl implements TransactionSynchronizationRegistry { diff --git a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/UserTransactionImpl.java b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/UserTransactionImpl.java index 773dba913ac..a88daad1f0b 100644 --- a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/UserTransactionImpl.java +++ b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/UserTransactionImpl.java @@ -17,7 +17,18 @@ package com.sun.enterprise.transaction; -import static java.util.logging.Level.SEVERE; +import com.sun.enterprise.transaction.api.JavaEETransactionManager; +import com.sun.enterprise.transaction.spi.TransactionOperationsManager; +import com.sun.enterprise.util.i18n.StringManager; +import com.sun.logging.LogDomains; + +import jakarta.inject.Inject; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.UserTransaction; import java.io.ObjectStreamException; import java.io.Serializable; @@ -32,18 +43,7 @@ import org.jvnet.hk2.annotations.ContractsProvided; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.transaction.api.JavaEETransactionManager; -import com.sun.enterprise.transaction.spi.TransactionOperationsManager; -import com.sun.enterprise.util.i18n.StringManager; -import com.sun.logging.LogDomains; - -import jakarta.inject.Inject; -import jakarta.transaction.HeuristicMixedException; -import jakarta.transaction.HeuristicRollbackException; -import jakarta.transaction.NotSupportedException; -import jakarta.transaction.RollbackException; -import jakarta.transaction.SystemException; -import jakarta.transaction.UserTransaction; +import static java.util.logging.Level.SEVERE; /** * This class implements jakarta.transaction.UserTransaction . Its methods are called from TX_BEAN_MANAGED EJB code. diff --git a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/monitoring/TransactionServiceStatsProvider.java b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/monitoring/TransactionServiceStatsProvider.java index 18506e78f46..42e4a0b88db 100644 --- a/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/monitoring/TransactionServiceStatsProvider.java +++ b/appserver/transaction/jta/src/main/java/com/sun/enterprise/transaction/monitoring/TransactionServiceStatsProvider.java @@ -17,6 +17,9 @@ package com.sun.enterprise.transaction.monitoring; +import com.sun.enterprise.transaction.api.JavaEETransactionManager; +import com.sun.enterprise.transaction.api.TransactionAdminBean; + import java.util.List; import java.util.logging.Logger; @@ -31,9 +34,6 @@ import org.glassfish.gmbal.ManagedAttribute; import org.glassfish.gmbal.ManagedObject; -import com.sun.enterprise.transaction.api.JavaEETransactionManager; -import com.sun.enterprise.transaction.api.TransactionAdminBean; - /** * Collects the Transaction Service monitoring data and provides it to the callers. * diff --git a/appserver/transaction/jta/src/main/java/org/glassfish/jta/admin/cli/RollbackTransaction.java b/appserver/transaction/jta/src/main/java/org/glassfish/jta/admin/cli/RollbackTransaction.java index 4b18178e871..da1fee82559 100644 --- a/appserver/transaction/jta/src/main/java/org/glassfish/jta/admin/cli/RollbackTransaction.java +++ b/appserver/transaction/jta/src/main/java/org/glassfish/jta/admin/cli/RollbackTransaction.java @@ -17,12 +17,11 @@ package org.glassfish.jta.admin.cli; -import static org.glassfish.api.ActionReport.ExitCode.FAILURE; -import static org.glassfish.api.ActionReport.ExitCode.SUCCESS; -import static org.glassfish.api.admin.RuntimeType.INSTANCE; -import static org.glassfish.config.support.CommandTarget.CLUSTERED_INSTANCE; -import static org.glassfish.config.support.CommandTarget.DAS; -import static org.glassfish.config.support.CommandTarget.STANDALONE_INSTANCE; +import com.sun.enterprise.transaction.api.JavaEETransactionManager; +import com.sun.enterprise.util.SystemPropertyConstants; +import com.sun.enterprise.util.i18n.StringManager; + +import jakarta.inject.Inject; import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; @@ -34,11 +33,12 @@ import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.transaction.api.JavaEETransactionManager; -import com.sun.enterprise.util.SystemPropertyConstants; -import com.sun.enterprise.util.i18n.StringManager; - -import jakarta.inject.Inject; +import static org.glassfish.api.ActionReport.ExitCode.FAILURE; +import static org.glassfish.api.ActionReport.ExitCode.SUCCESS; +import static org.glassfish.api.admin.RuntimeType.INSTANCE; +import static org.glassfish.config.support.CommandTarget.CLUSTERED_INSTANCE; +import static org.glassfish.config.support.CommandTarget.DAS; +import static org.glassfish.config.support.CommandTarget.STANDALONE_INSTANCE; @Service(name = "rollback-transaction") @TargetType({ DAS, STANDALONE_INSTANCE, CLUSTERED_INSTANCE }) diff --git a/appserver/transaction/jta/src/main/java/org/glassfish/jta/admin/cli/UnFreezeTransactionService.java b/appserver/transaction/jta/src/main/java/org/glassfish/jta/admin/cli/UnFreezeTransactionService.java index ad0be06471a..8054b35efb8 100644 --- a/appserver/transaction/jta/src/main/java/org/glassfish/jta/admin/cli/UnFreezeTransactionService.java +++ b/appserver/transaction/jta/src/main/java/org/glassfish/jta/admin/cli/UnFreezeTransactionService.java @@ -17,15 +17,15 @@ package org.glassfish.jta.admin.cli; -import static org.glassfish.api.ActionReport.ExitCode.FAILURE; -import static org.glassfish.api.ActionReport.ExitCode.SUCCESS; -import static org.glassfish.api.admin.RestEndpoint.OpType.POST; -import static org.glassfish.api.admin.RuntimeType.INSTANCE; -import static org.glassfish.config.support.CommandTarget.CLUSTER; -import static org.glassfish.config.support.CommandTarget.CLUSTERED_INSTANCE; -import static org.glassfish.config.support.CommandTarget.CONFIG; -import static org.glassfish.config.support.CommandTarget.DAS; -import static org.glassfish.config.support.CommandTarget.STANDALONE_INSTANCE; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.transaction.api.JavaEETransactionManager; +import com.sun.enterprise.util.SystemPropertyConstants; +import com.sun.enterprise.util.i18n.StringManager; +import com.sun.logging.LogDomains; + +import jakarta.inject.Inject; import java.util.logging.Logger; @@ -42,15 +42,15 @@ import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.Cluster; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.Server; -import com.sun.enterprise.transaction.api.JavaEETransactionManager; -import com.sun.enterprise.util.SystemPropertyConstants; -import com.sun.enterprise.util.i18n.StringManager; -import com.sun.logging.LogDomains; - -import jakarta.inject.Inject; +import static org.glassfish.api.ActionReport.ExitCode.FAILURE; +import static org.glassfish.api.ActionReport.ExitCode.SUCCESS; +import static org.glassfish.api.admin.RestEndpoint.OpType.POST; +import static org.glassfish.api.admin.RuntimeType.INSTANCE; +import static org.glassfish.config.support.CommandTarget.CLUSTER; +import static org.glassfish.config.support.CommandTarget.CLUSTERED_INSTANCE; +import static org.glassfish.config.support.CommandTarget.CONFIG; +import static org.glassfish.config.support.CommandTarget.DAS; +import static org.glassfish.config.support.CommandTarget.STANDALONE_INSTANCE; @Service(name = "unfreeze-transaction-service") @TargetType({ DAS, STANDALONE_INSTANCE, CLUSTER, CLUSTERED_INSTANCE, CONFIG }) diff --git a/appserver/transaction/jta/src/test/java/com/sun/enterprise/transaction/JavaEETransactionManagerSimplifiedTest.java b/appserver/transaction/jta/src/test/java/com/sun/enterprise/transaction/JavaEETransactionManagerSimplifiedTest.java index de8176bf36b..0557e48303b 100644 --- a/appserver/transaction/jta/src/test/java/com/sun/enterprise/transaction/JavaEETransactionManagerSimplifiedTest.java +++ b/appserver/transaction/jta/src/test/java/com/sun/enterprise/transaction/JavaEETransactionManagerSimplifiedTest.java @@ -21,6 +21,15 @@ import com.sun.enterprise.transaction.api.JavaEETransactionManager; import com.sun.enterprise.transaction.spi.JavaEETransactionManagerDelegate; +import jakarta.transaction.InvalidTransactionException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; + import java.beans.PropertyChangeEvent; import java.util.logging.Level; @@ -33,15 +42,6 @@ import org.junit.jupiter.api.Test; import org.jvnet.hk2.config.UnprocessedChangeEvents; -import jakarta.transaction.InvalidTransactionException; -import jakarta.transaction.NotSupportedException; -import jakarta.transaction.RollbackException; -import jakarta.transaction.Synchronization; -import jakarta.transaction.SystemException; -import jakarta.transaction.Transaction; -import jakarta.transaction.TransactionManager; -import jakarta.transaction.UserTransaction; - import static com.sun.enterprise.transaction.JavaEETransactionManagerSimplified.getStatusAsString; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/ResourceRecoveryManagerImpl.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/ResourceRecoveryManagerImpl.java index a61484df8f4..5d7a1af7224 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/ResourceRecoveryManagerImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/ResourceRecoveryManagerImpl.java @@ -17,36 +17,42 @@ package com.sun.enterprise.transaction.jts; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.SEVERE; -import static java.util.logging.Level.WARNING; - -import java.util.*; -import java.util.logging.Logger; -import jakarta.inject.Inject; -import javax.transaction.xa.XAResource; - import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.transaction.config.TransactionService; -import com.sun.enterprise.util.i18n.StringManager; -import com.sun.logging.LogDomains; - +import com.sun.enterprise.transaction.JavaEETransactionManagerSimplified; import com.sun.enterprise.transaction.api.JavaEETransactionManager; -import com.sun.enterprise.transaction.api.ResourceRecoveryManager; import com.sun.enterprise.transaction.api.RecoveryResourceRegistry; -import com.sun.enterprise.transaction.spi.RecoveryResourceListener; -import com.sun.enterprise.transaction.spi.RecoveryResourceHandler; +import com.sun.enterprise.transaction.api.ResourceRecoveryManager; +import com.sun.enterprise.transaction.config.TransactionService; import com.sun.enterprise.transaction.spi.RecoveryEventListener; -import com.sun.enterprise.transaction.JavaEETransactionManagerSimplified; - -import com.sun.jts.CosTransactions.DelegatedRecoveryManager; +import com.sun.enterprise.transaction.spi.RecoveryResourceHandler; +import com.sun.enterprise.transaction.spi.RecoveryResourceListener; +import com.sun.enterprise.util.i18n.StringManager; import com.sun.jts.CosTransactions.Configuration; +import com.sun.jts.CosTransactions.DelegatedRecoveryManager; import com.sun.jts.CosTransactions.RecoveryManager; -import org.glassfish.api.admin.ServerEnvironment; +import com.sun.logging.LogDomains; -import org.jvnet.hk2.annotations.Service; +import jakarta.inject.Inject; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.Vector; +import java.util.logging.Logger; + +import javax.transaction.xa.XAResource; + +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.hk2.api.PostConstruct; import org.glassfish.hk2.api.ServiceLocator; +import org.jvnet.hk2.annotations.Service; + +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.SEVERE; +import static java.util.logging.Level.WARNING; /** * Resource recovery manager to recover transactions. diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionClientInterceptor.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionClientInterceptor.java index 24b14b59b6b..a6abb058c64 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionClientInterceptor.java +++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionClientInterceptor.java @@ -17,14 +17,14 @@ package com.sun.enterprise.transaction.jts.iiop; -import static com.sun.corba.ee.spi.presentation.rmi.StubAdapter.isLocal; +import com.sun.enterprise.transaction.api.JavaEETransactionManager; import org.glassfish.hk2.api.ServiceLocator; import org.omg.CORBA.LocalObject; import org.omg.PortableInterceptor.ClientRequestInfo; import org.omg.PortableInterceptor.ClientRequestInterceptor; -import com.sun.enterprise.transaction.api.JavaEETransactionManager; +import static com.sun.corba.ee.spi.presentation.rmi.StubAdapter.isLocal; public class TransactionClientInterceptor extends LocalObject implements ClientRequestInterceptor, Comparable { diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionIIOPInterceptorFactory.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionIIOPInterceptorFactory.java index a8c7332d69c..19ab55db3ac 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionIIOPInterceptorFactory.java +++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionIIOPInterceptorFactory.java @@ -17,6 +17,18 @@ package com.sun.enterprise.transaction.jts.iiop; +import com.sun.corba.ee.impl.txpoa.TSIdentificationImpl; +import com.sun.corba.ee.spi.legacy.interceptor.ORBInitInfoExt; +import com.sun.corba.ee.spi.logging.POASystemException; +import com.sun.corba.ee.spi.misc.ORBConstants; +import com.sun.jts.CosTransactions.Configuration; +import com.sun.jts.CosTransactions.DefaultTransactionService; +import com.sun.jts.jta.TransactionServiceProperties; +import com.sun.jts.pi.InterceptorImpl; +import com.sun.logging.LogDomains; + +import jakarta.inject.Inject; + import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; @@ -34,18 +46,6 @@ import org.omg.PortableInterceptor.ORBInitInfo; import org.omg.PortableInterceptor.ServerRequestInterceptor; -import com.sun.corba.ee.impl.txpoa.TSIdentificationImpl; -import com.sun.corba.ee.spi.legacy.interceptor.ORBInitInfoExt; -import com.sun.corba.ee.spi.logging.POASystemException; -import com.sun.corba.ee.spi.misc.ORBConstants; -import com.sun.jts.CosTransactions.Configuration; -import com.sun.jts.CosTransactions.DefaultTransactionService; -import com.sun.jts.jta.TransactionServiceProperties; -import com.sun.jts.pi.InterceptorImpl; -import com.sun.logging.LogDomains; - -import jakarta.inject.Inject; - /** * * @author mvatkina diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionInterceptorFactory.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionInterceptorFactory.java index 1ed0ede3d04..939d1e85a63 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionInterceptorFactory.java +++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionInterceptorFactory.java @@ -17,6 +17,8 @@ package com.sun.enterprise.transaction.jts.iiop; +import jakarta.inject.Inject; + import org.glassfish.enterprise.iiop.api.IIOPInterceptorFactory; import org.glassfish.hk2.api.ServiceLocator; import org.jvnet.hk2.annotations.Service; @@ -25,8 +27,6 @@ import org.omg.PortableInterceptor.ORBInitInfo; import org.omg.PortableInterceptor.ServerRequestInterceptor; -import jakarta.inject.Inject; - /** * * @author mvatkina diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionServerInterceptor.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionServerInterceptor.java index df738fab8ff..eaeee9c44a8 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionServerInterceptor.java +++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionServerInterceptor.java @@ -17,14 +17,14 @@ package com.sun.enterprise.transaction.jts.iiop; +import com.sun.enterprise.transaction.api.JavaEETransactionManager; + import org.glassfish.enterprise.iiop.api.GlassFishORBHelper; import org.glassfish.hk2.api.ServiceLocator; import org.omg.CORBA.LocalObject; import org.omg.PortableInterceptor.ServerRequestInfo; import org.omg.PortableInterceptor.ServerRequestInterceptor; -import com.sun.enterprise.transaction.api.JavaEETransactionManager; - public class TransactionServerInterceptor extends LocalObject implements ServerRequestInterceptor, Comparable { private static final long serialVersionUID = 1L; diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TxIORInterceptor.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TxIORInterceptor.java index c7b368b7819..8d101e6e0d5 100755 --- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TxIORInterceptor.java +++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TxIORInterceptor.java @@ -17,8 +17,8 @@ package com.sun.enterprise.transaction.jts.iiop; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.WARNING; +import com.sun.jts.pi.InterceptorImpl; +import com.sun.logging.LogDomains; import java.util.logging.Logger; @@ -39,8 +39,8 @@ import org.omg.PortableInterceptor.IORInfo; import org.omg.PortableInterceptor.IORInterceptor; -import com.sun.jts.pi.InterceptorImpl; -import com.sun.logging.LogDomains; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.WARNING; public class TxIORInterceptor extends LocalObject implements IORInterceptor { diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/GMSCallBack.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/GMSCallBack.java index 8e30fee9eaa..76a0007f7a0 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/GMSCallBack.java +++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/GMSCallBack.java @@ -17,19 +17,6 @@ package com.sun.enterprise.transaction.jts.recovery; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.INFO; -import static java.util.logging.Level.WARNING; - -import java.io.Serializable; -import java.util.Map; -import java.util.Properties; -import java.util.logging.Logger; - -import org.glassfish.gms.bootstrap.GMSAdapter; -import org.glassfish.gms.bootstrap.GMSAdapterService; -import org.glassfish.hk2.api.ServiceLocator; - import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.config.serverbeans.Servers; import com.sun.enterprise.ee.cms.core.CallBack; @@ -43,6 +30,19 @@ import com.sun.jts.jta.TransactionServiceProperties; import com.sun.logging.LogDomains; +import java.io.Serializable; +import java.util.Map; +import java.util.Properties; +import java.util.logging.Logger; + +import org.glassfish.gms.bootstrap.GMSAdapter; +import org.glassfish.gms.bootstrap.GMSAdapterService; +import org.glassfish.hk2.api.ServiceLocator; + +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.INFO; +import static java.util.logging.Level.WARNING; + public class GMSCallBack implements CallBack { private static final String component = "TRANSACTION-RECOVERY-SERVICE"; diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/OracleXAResource.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/OracleXAResource.java index 5ac544864cc..fcd161c0c72 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/OracleXAResource.java +++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/OracleXAResource.java @@ -19,8 +19,10 @@ package com.sun.enterprise.transaction.jts.recovery; -import static com.sun.logging.LogDomains.JTA_LOGGER; -import static java.util.logging.Level.FINEST; +import com.sun.enterprise.transaction.JavaEETransactionManagerSimplified; +import com.sun.enterprise.transaction.api.XAResourceWrapper; +import com.sun.enterprise.util.i18n.StringManager; +import com.sun.logging.LogDomains; import java.sql.Connection; import java.sql.ResultSet; @@ -33,10 +35,8 @@ import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import com.sun.enterprise.transaction.JavaEETransactionManagerSimplified; -import com.sun.enterprise.transaction.api.XAResourceWrapper; -import com.sun.enterprise.util.i18n.StringManager; -import com.sun.logging.LogDomains; +import static com.sun.logging.LogDomains.JTA_LOGGER; +import static java.util.logging.Level.FINEST; /** * This implements workaround for Oracle XAResource. Oracle's 8.1.7 XAResource implementation doesn't work fine while diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/RecoveryLockFile.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/RecoveryLockFile.java index 135e70694ae..f26286e3c42 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/RecoveryLockFile.java +++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/RecoveryLockFile.java @@ -25,8 +25,12 @@ package com.sun.enterprise.transaction.jts.recovery; -import static java.util.logging.Level.INFO; -import static java.util.logging.Level.WARNING; +import com.sun.enterprise.transaction.jts.api.DelegatedTransactionRecoveryFence; +import com.sun.enterprise.transaction.jts.api.TransactionRecoveryFence; +import com.sun.jts.CosTransactions.Configuration; +import com.sun.jts.CosTransactions.LogControl; +import com.sun.jts.CosTransactions.RecoveryManager; +import com.sun.logging.LogDomains; import java.io.BufferedReader; import java.io.File; @@ -38,12 +42,8 @@ import java.util.List; import java.util.logging.Logger; -import com.sun.enterprise.transaction.jts.api.DelegatedTransactionRecoveryFence; -import com.sun.enterprise.transaction.jts.api.TransactionRecoveryFence; -import com.sun.jts.CosTransactions.Configuration; -import com.sun.jts.CosTransactions.LogControl; -import com.sun.jts.CosTransactions.RecoveryManager; -import com.sun.logging.LogDomains; +import static java.util.logging.Level.INFO; +import static java.util.logging.Level.WARNING; /** * This class manages lock file required for delegated recovery. diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/SybaseXAResource.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/SybaseXAResource.java index ef7ade7b2c7..4b06b52f476 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/SybaseXAResource.java +++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/SybaseXAResource.java @@ -19,15 +19,15 @@ package com.sun.enterprise.transaction.jts.recovery; -import javax.transaction.xa.XAException; -import javax.transaction.xa.XAResource; -import javax.transaction.xa.Xid; - import com.sun.enterprise.transaction.api.XAResourceWrapper; import com.sun.enterprise.util.i18n.StringManager; import jakarta.resource.ResourceException; +import javax.transaction.xa.XAException; +import javax.transaction.xa.XAResource; +import javax.transaction.xa.Xid; + /** * XA Resource wrapper class for sybase XA Resource with jConnect 5.2. * diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/AdminUtil.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/AdminUtil.java index a3d62d7fcf5..49f1342a452 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/AdminUtil.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/AdminUtil.java @@ -16,7 +16,9 @@ package com.sun.jts.CosTransactions; -import java.util.*; +import java.util.Collection; +import java.util.Enumeration; +import java.util.Iterator; /** * AdminUtil - Utility class for monitoring and administering jts. diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/Configuration.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/Configuration.java index a5ce4274a6b..cf1e8bbe714 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/Configuration.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/Configuration.java @@ -34,7 +34,6 @@ import com.sun.jts.utils.LogFormatter; import com.sun.logging.LogDomains; -// Import required classes. import java.io.File; import java.util.Hashtable; import java.util.Properties; diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/ControlImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/ControlImpl.java index bcd40833c35..5aa7c9f8e20 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/ControlImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/ControlImpl.java @@ -30,19 +30,38 @@ package com.sun.jts.CosTransactions; -// Import required classes. - -import org.omg.CORBA.*; -import org.omg.PortableServer.*; -import org.omg.CosTransactions.*; -import org.omg.PortableServer.POAPackage.ServantNotActive; -import org.omg.PortableServer.POAPackage.ServantAlreadyActive; +import com.sun.jts.codegen.otsidl.JControl; +import com.sun.jts.codegen.otsidl.JControlPOA; +import com.sun.jts.utils.LogFormatter; +import com.sun.logging.LogDomains; -import com.sun.jts.codegen.otsidl.*; -import java.util.logging.Logger; import java.util.logging.Level; -import com.sun.logging.LogDomains; -import com.sun.jts.utils.LogFormatter; +import java.util.logging.Logger; + +import org.omg.CORBA.CompletionStatus; +import org.omg.CORBA.Context; +import org.omg.CORBA.ContextList; +import org.omg.CORBA.ExceptionList; +import org.omg.CORBA.INTERNAL; +import org.omg.CORBA.INVALID_TRANSACTION; +import org.omg.CORBA.NVList; +import org.omg.CORBA.NamedValue; +import org.omg.CORBA.OBJECT_NOT_EXIST; +import org.omg.CORBA.Request; +import org.omg.CORBA.SystemException; +import org.omg.CORBA.TRANSACTION_ROLLEDBACK; +import org.omg.CosTransactions.Control; +import org.omg.CosTransactions.ControlHelper; +import org.omg.CosTransactions.Coordinator; +import org.omg.CosTransactions.PropagationContext; +import org.omg.CosTransactions.Status; +import org.omg.CosTransactions.StatusHolder; +import org.omg.CosTransactions.Terminator; +import org.omg.CosTransactions.Unavailable; +import org.omg.CosTransactions.otid_t; +import org.omg.PortableServer.POA; +import org.omg.PortableServer.POAPackage.ServantAlreadyActive; +import org.omg.PortableServer.POAPackage.ServantNotActive; /**The ControlImpl interface is our implementation of the standard Control * interface. It provides operations to set and subsequently obtain the * Terminator and Coordinator objects from the given context. Our diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorImpl.java index 74b7367c8e6..7e8ec609434 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorImpl.java @@ -30,17 +30,44 @@ package com.sun.jts.CosTransactions; -// Import required classes. - -import org.omg.CORBA.*; -import org.omg.PortableServer.*; -import org.omg.CosTransactions.*; +import com.sun.jts.codegen.otsidl.JCoordinator; +import com.sun.jts.codegen.otsidl.JCoordinatorHelper; +import com.sun.jts.codegen.otsidl.JCoordinatorPOA; +import com.sun.jts.utils.LogFormatter; +import com.sun.logging.LogDomains; -import com.sun.jts.codegen.otsidl.*; -import java.util.logging.Logger; import java.util.logging.Level; -import com.sun.logging.LogDomains; -import com.sun.jts.utils.LogFormatter; +import java.util.logging.Logger; + +import org.omg.CORBA.Context; +import org.omg.CORBA.ContextList; +import org.omg.CORBA.ExceptionList; +import org.omg.CORBA.INVALID_TRANSACTION; +import org.omg.CORBA.NVList; +import org.omg.CORBA.NamedValue; +import org.omg.CORBA.Request; +import org.omg.CORBA.SystemException; +import org.omg.CosTransactions.Control; +import org.omg.CosTransactions.Coordinator; +import org.omg.CosTransactions.CoordinatorHelper; +import org.omg.CosTransactions.HeuristicHazard; +import org.omg.CosTransactions.HeuristicMixed; +import org.omg.CosTransactions.Inactive; +import org.omg.CosTransactions.NotPrepared; +import org.omg.CosTransactions.NotSubtransaction; +import org.omg.CosTransactions.PropagationContext; +import org.omg.CosTransactions.RecoveryCoordinator; +import org.omg.CosTransactions.Resource; +import org.omg.CosTransactions.Status; +import org.omg.CosTransactions.SubtransactionAwareResource; +import org.omg.CosTransactions.SubtransactionsUnavailable; +import org.omg.CosTransactions.Synchronization; +import org.omg.CosTransactions.SynchronizationUnavailable; +import org.omg.CosTransactions.TransIdentity; +import org.omg.CosTransactions.Unavailable; +import org.omg.CosTransactions.Vote; +import org.omg.CosTransactions.otid_t; +import org.omg.PortableServer.POA; /**The CoordinatorImpl interface is an extension to the standard Coordinator * interface that provides the common operations for top-level transactions and diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorLog.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorLog.java index dbb24d12000..706e3006c56 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorLog.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorLog.java @@ -30,19 +30,24 @@ package com.sun.jts.CosTransactions; -// Import required classes. - -import java.util.*; -import java.io.*; - -import org.omg.CORBA.*; +import com.sun.jts.utils.LogFormatter; +import com.sun.logging.LogDomains; -import java.io.DataOutputStream; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.DataInputStream; -import java.util.logging.Logger; +import java.io.DataOutputStream; +import java.io.IOException; + +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Stack; +import java.util.Vector; import java.util.logging.Level; -import com.sun.logging.LogDomains; -import com.sun.jts.utils.LogFormatter; +import java.util.logging.Logger; + +import org.omg.CORBA.MARSHAL; +import org.omg.CORBA.ORB; /**The CoordinatorLog interface provides operations to record transaction- * specific information that needs to be persistently stored at a particular diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorLogPool.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorLogPool.java index f0e49742cba..94c699d2edc 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorLogPool.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorLogPool.java @@ -16,9 +16,8 @@ package com.sun.jts.CosTransactions; -// Import required classes. - -import java.util.*; +import java.util.Hashtable; +import java.util.Stack; /** diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorResourceImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorResourceImpl.java index f7c7a73f427..5abe4667042 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorResourceImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorResourceImpl.java @@ -30,20 +30,31 @@ package com.sun.jts.CosTransactions; -// Import required classes. +import com.sun.jts.codegen.otsidl.CoordinatorResource; +import com.sun.jts.codegen.otsidl.CoordinatorResourceHelper; +import com.sun.jts.codegen.otsidl.CoordinatorResourcePOA; +import com.sun.jts.utils.LogFormatter; +import com.sun.logging.LogDomains; + +import java.util.logging.Level; +import java.util.logging.Logger; -import org.omg.CORBA.*; -import org.omg.PortableServer.*; +import org.omg.CORBA.CompletionStatus; +import org.omg.CORBA.INTERNAL; +import org.omg.CORBA.OBJECT_NOT_EXIST; +import org.omg.CORBA.SystemException; +import org.omg.CORBA.TRANSACTION_ROLLEDBACK; +import org.omg.CosTransactions.Coordinator; +import org.omg.CosTransactions.HeuristicCommit; +import org.omg.CosTransactions.HeuristicHazard; +import org.omg.CosTransactions.HeuristicMixed; +import org.omg.CosTransactions.HeuristicRollback; +import org.omg.CosTransactions.NotPrepared; +import org.omg.CosTransactions.Resource; +import org.omg.CosTransactions.Vote; +import org.omg.PortableServer.POA; import org.omg.PortableServer.POAPackage.ServantAlreadyActive; import org.omg.PortableServer.POAPackage.ServantNotActive; -import org.omg.CosTransactions.*; - -import com.sun.jts.codegen.otsidl.*; - -import java.util.logging.Logger; -import java.util.logging.Level; -import com.sun.logging.LogDomains; -import com.sun.jts.utils.LogFormatter; /**The CoordinatorResourceImpl interface provides operations that allow a * Coordinator to be represented among the registered Resources of a diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorSynchronizationImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorSynchronizationImpl.java index ca11b6a5222..092fae0dcec 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorSynchronizationImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorSynchronizationImpl.java @@ -30,18 +30,22 @@ package com.sun.jts.CosTransactions; -// Import required classes. +import com.sun.jts.utils.LogFormatter; +import com.sun.logging.LogDomains; + +import java.util.logging.Level; +import java.util.logging.Logger; -import org.omg.CORBA.*; -import org.omg.PortableServer.*; +import org.omg.CORBA.CompletionStatus; +import org.omg.CORBA.INTERNAL; +import org.omg.CORBA.SystemException; +import org.omg.CosTransactions.Status; +import org.omg.CosTransactions.Synchronization; +import org.omg.CosTransactions.SynchronizationHelper; +import org.omg.CosTransactions.SynchronizationPOA; +import org.omg.PortableServer.POA; import org.omg.PortableServer.POAPackage.ServantAlreadyActive; import org.omg.PortableServer.POAPackage.ServantNotActive; -import org.omg.CosTransactions.*; - -import java.util.logging.Logger; -import java.util.logging.Level; -import com.sun.logging.LogDomains; -import com.sun.jts.utils.LogFormatter; /**The CoordinatorSynchronizationImpl interface allows a subordinate Coordinator * to be informed of the completion of a transaction, both before the transaction diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorTerm.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorTerm.java index b82e0f567cb..38941022659 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorTerm.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorTerm.java @@ -36,7 +36,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -// Import required classes. import org.omg.CORBA.CompletionStatus; import org.omg.CORBA.INTERNAL; import org.omg.CORBA.INVALID_TRANSACTION; diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CurrentImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CurrentImpl.java index 91beebe9271..08788d30e36 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CurrentImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CurrentImpl.java @@ -38,7 +38,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -// Import required classes. import org.omg.CORBA.CompletionStatus; import org.omg.CORBA.INVALID_TRANSACTION; import org.omg.CORBA.NO_PERMISSION; diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CurrentTransaction.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CurrentTransaction.java index c9d3272ba9f..8a0926cfd48 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CurrentTransaction.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CurrentTransaction.java @@ -35,7 +35,6 @@ import com.sun.jts.utils.LogFormatter; import com.sun.logging.LogDomains; -// Import required classes. import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DefaultTransactionService.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DefaultTransactionService.java index 00bcd1e17da..b27d60c5a9b 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DefaultTransactionService.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DefaultTransactionService.java @@ -30,24 +30,34 @@ package com.sun.jts.CosTransactions; -// Import required classes. +import com.sun.corba.ee.spi.presentation.rmi.StubAdapter; +import com.sun.logging.LogDomains; -import java.util.*; import java.net.InetAddress; import java.net.UnknownHostException; -import org.omg.CORBA.*; -import org.omg.CORBA.ORBPackage.InvalidName; -import org.omg.CosTransactions.*; -import org.omg.CosNaming.*; -import org.omg.PortableServer.*; -import org.omg.CORBA.LocalObject; - -import com.sun.corba.ee.spi.presentation.rmi.StubAdapter; - -import java.util.logging.Logger; +import java.util.Properties; import java.util.logging.Level; -import com.sun.logging.LogDomains; +import java.util.logging.Logger; + +import org.omg.CORBA.CompletionStatus; +import org.omg.CORBA.INTERNAL; +import org.omg.CORBA.LocalObject; +import org.omg.CORBA.ORB; +import org.omg.CORBA.Policy; +import org.omg.CORBA.TSIdentification; +import org.omg.CORBA.ORBPackage.InvalidName; +import org.omg.CosNaming.NameComponent; +import org.omg.CosNaming.NamingContext; +import org.omg.CosNaming.NamingContextHelper; +import org.omg.CosTransactions.TransactionFactory; +import org.omg.CosTransactions.TransactionFactoryHelper; +import org.omg.PortableServer.AdapterActivator; +import org.omg.PortableServer.LifespanPolicyValue; +import org.omg.PortableServer.POA; +import org.omg.PortableServer.RequestProcessingPolicyValue; +import org.omg.PortableServer.Servant; +import org.omg.PortableServer.ServantActivator; /**The DefaultTransactionService is our implemention of the * com.sun.CosTransactions.TransactionService class. diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DelegatedTimeoutManager.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DelegatedTimeoutManager.java index 4a0316e494b..f35abd0431d 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DelegatedTimeoutManager.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DelegatedTimeoutManager.java @@ -17,14 +17,17 @@ package com.sun.jts.CosTransactions; -import java.util.*; - -import org.omg.CosTransactions.*; import com.sun.jts.jtsxa.XID; +import com.sun.logging.LogDomains; -import java.util.logging.Logger; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; import java.util.logging.Level; -import com.sun.logging.LogDomains; +import java.util.logging.Logger; + +import org.omg.CosTransactions.Status; /** * This class records state for timing out transactions, and runs a thread diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/GlobalTID.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/GlobalTID.java index 4db3b38821f..de79ca79ab9 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/GlobalTID.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/GlobalTID.java @@ -30,16 +30,14 @@ package com.sun.jts.CosTransactions; -// Import required classes. - -import java.io.*; - -import org.omg.CosTransactions.*; - +import com.sun.logging.LogDomains; -import java.util.logging.Logger; +import java.io.DataInputStream; +import java.io.DataOutputStream; import java.util.logging.Level; -import com.sun.logging.LogDomains; +import java.util.logging.Logger; + +import org.omg.CosTransactions.otid_t; /**This class provides a wrapper for the otid_t class in the * org.omg.CosTSInteroperation package to allow us to add operations. diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/Log.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/Log.java index 06de0c14c01..5d939a77b48 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/Log.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/Log.java @@ -30,12 +30,13 @@ package com.sun.jts.CosTransactions; -// Import required classes. +import com.sun.jts.utils.LogFormatter; +import com.sun.logging.LogDomains; -import java.util.logging.Logger; import java.util.logging.Level; -import com.sun.logging.LogDomains; -import com.sun.jts.utils.LogFormatter; + + +import java.util.logging.Logger; /**The Log class provides operations that control the physical log diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogControl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogControl.java index 9c794dd803e..c45110d7527 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogControl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogControl.java @@ -30,15 +30,14 @@ package com.sun.jts.CosTransactions; -// Import required classes. +import com.sun.enterprise.util.i18n.StringManager; +import com.sun.logging.LogDomains; + +import java.io.File; -import java.util.*; +import java.util.Vector; import java.util.logging.Level; import java.util.logging.Logger; -import java.io.*; - -import com.sun.enterprise.util.i18n.StringManager; -import com.sun.logging.LogDomains; /**This class holds the top level information for an instance of the log, * diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogControlDescriptor.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogControlDescriptor.java index 13d1c4d0742..0b5413a5caf 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogControlDescriptor.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogControlDescriptor.java @@ -30,9 +30,7 @@ package com.sun.jts.CosTransactions; -// Import required classes - -import java.io.*; +import java.io.Serializable; /**A class containing control information relating to an open log file. * diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogCursor.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogCursor.java index 77e8cd214ae..7e2f4520ab9 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogCursor.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogCursor.java @@ -30,7 +30,6 @@ package com.sun.jts.CosTransactions; -// Import required classes. import com.sun.enterprise.util.i18n.StringManager; diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogExtent.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogExtent.java index ca148e33a36..2c2f7f3688d 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogExtent.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogExtent.java @@ -31,8 +31,7 @@ package com.sun.jts.CosTransactions; // Import required definitions. - -import java.io.*; +import java.io.File; //------------------------------------------------------------------------------ // LogExtent class diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogFile.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogFile.java index 92b0cd935e2..0adb932d777 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogFile.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogFile.java @@ -30,13 +30,12 @@ package com.sun.jts.CosTransactions; -// Import required classes. +import com.sun.jts.utils.LogFormatter; +import com.sun.logging.LogDomains; -import java.util.*; -import java.util.logging.Logger; +import java.util.Vector; import java.util.logging.Level; -import com.sun.logging.LogDomains; -import com.sun.jts.utils.LogFormatter; +import java.util.logging.Logger; /**The LogFile interface provides operations that control the * individual log entries that make up the physical log. It allows writing to diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogFileHandle.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogFileHandle.java index 6ab07020690..cfea6173663 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogFileHandle.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogFileHandle.java @@ -30,10 +30,12 @@ package com.sun.jts.CosTransactions; -// Import required classes. import com.sun.enterprise.util.i18n.StringManager; -import java.io.*; + +import java.io.File; +import java.io.FileDescriptor; +import java.io.RandomAccessFile; /**This class encapsulates file I/O operations and the file handle. * diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogHandle.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogHandle.java index 9c4e4d560e9..c89ee428c37 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogHandle.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogHandle.java @@ -30,11 +30,14 @@ package com.sun.jts.CosTransactions; -// Import required classes. import com.sun.enterprise.util.i18n.StringManager; -import java.util.*; -import java.io.*; + +import java.io.File; +import java.util.ArrayList; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; /**A class containing attributes of an open log file. * diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogLSN.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogLSN.java index 233de1cae9a..2aa7b2eaf07 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogLSN.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogLSN.java @@ -30,9 +30,7 @@ package com.sun.jts.CosTransactions; -// Import required classes - -import java.io.*; +import java.io.Serializable; /**A structure containing 2 unsigned integers. * extent: the extent file number diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogRecordEnding.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogRecordEnding.java index 0a511bd6e08..6b9335f25ef 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogRecordEnding.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogRecordEnding.java @@ -30,9 +30,7 @@ package com.sun.jts.CosTransactions; -// Import required classes - -import java.io.*; +import java.io.Serializable; /**A class containing ending information for a log record. * diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogRecordHeader.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogRecordHeader.java index e370ebd29e2..79e85146a8c 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogRecordHeader.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogRecordHeader.java @@ -30,7 +30,7 @@ package com.sun.jts.CosTransactions; -import java.io.*; +import java.io.Serializable; /** * A class containing header information for a log record. diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogRestartDescriptor.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogRestartDescriptor.java index 7df1b3bdf43..1e237962b2a 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogRestartDescriptor.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogRestartDescriptor.java @@ -30,7 +30,7 @@ package com.sun.jts.CosTransactions; -import java.io.*; +import java.io.Serializable; /** * A class containing restart information. diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/Messages.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/Messages.java index f0b612647db..9d043307550 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/Messages.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/Messages.java @@ -30,8 +30,8 @@ package com.sun.jts.CosTransactions; -import java.util.*; -import java.text.*; +import java.text.MessageFormat; +import java.util.ListResourceBundle; /** * This class provides a ListResourceBundle which contains the message formats diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/NestingInfo.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/NestingInfo.java index a6241d14c49..250634993cc 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/NestingInfo.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/NestingInfo.java @@ -30,10 +30,10 @@ package com.sun.jts.CosTransactions; -import java.util.*; +import java.util.Vector; -import org.omg.CORBA.*; -import org.omg.CosTransactions.*; +import org.omg.CORBA.SystemException; +import org.omg.CosTransactions.Coordinator; /** * The NestingInfo interface provides operations that record all nesting diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RWLock.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RWLock.java index a8baadd516a..8b3a25b2b74 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RWLock.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RWLock.java @@ -15,10 +15,11 @@ */ package com.sun.jts.CosTransactions; +import com.sun.logging.LogDomains; + import java.util.LinkedList; -import java.util.logging.Logger; import java.util.logging.Level; -import com.sun.logging.LogDomains; +import java.util.logging.Logger; /** diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RecoveryCoordinatorImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RecoveryCoordinatorImpl.java index e43419d3145..bd9ff1a6840 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RecoveryCoordinatorImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RecoveryCoordinatorImpl.java @@ -30,13 +30,23 @@ package com.sun.jts.CosTransactions; -import org.omg.CORBA.*; -import org.omg.PortableServer.*; -import org.omg.CosTransactions.*; -import java.util.logging.Logger; -import java.util.logging.Level; -import com.sun.logging.LogDomains; import com.sun.jts.utils.LogFormatter; +import com.sun.logging.LogDomains; + +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.omg.CORBA.SystemException; +import org.omg.CosTransactions.HeuristicCommit; +import org.omg.CosTransactions.HeuristicHazard; +import org.omg.CosTransactions.HeuristicMixed; +import org.omg.CosTransactions.NotPrepared; +import org.omg.CosTransactions.RecoveryCoordinator; +import org.omg.CosTransactions.RecoveryCoordinatorHelper; +import org.omg.CosTransactions.RecoveryCoordinatorPOA; +import org.omg.CosTransactions.Resource; +import org.omg.CosTransactions.Status; +import org.omg.PortableServer.POA; /** * The RecoveryCoordinatorImpl interface is our implementation of the standard diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RegisteredStatics.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RegisteredStatics.java index ae41a3f8907..b6f9ceaf2b3 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RegisteredStatics.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RegisteredStatics.java @@ -30,10 +30,10 @@ package com.sun.jts.CosTransactions; -import java.util.*; +import java.util.Vector; -import org.omg.CORBA.*; -import org.omg.CosTransactions.*; +import org.omg.CORBA.INVALID_TRANSACTION; +import org.omg.CosTransactions.Unavailable; /** * The RegisteredStatics class provides operations that manage the set of diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/StaticResource.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/StaticResource.java index 7d367e92667..2b128a84fa5 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/StaticResource.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/StaticResource.java @@ -30,7 +30,7 @@ package com.sun.jts.CosTransactions; -import org.omg.CosTransactions.*; +import org.omg.CosTransactions.Coordinator; /** * The StaticResource interface provides operations that allow an object to diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/SubCoordinator.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/SubCoordinator.java index 8dc9ededcac..837e3fd305a 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/SubCoordinator.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/SubCoordinator.java @@ -47,7 +47,22 @@ import org.omg.CORBA.OBJECT_NOT_EXIST; import org.omg.CORBA.SystemException; import org.omg.CORBA.TRANSACTION_ROLLEDBACK; -import org.omg.CosTransactions.*; +import org.omg.CosTransactions.Control; +import org.omg.CosTransactions.Coordinator; +import org.omg.CosTransactions.CoordinatorHelper; +import org.omg.CosTransactions.Inactive; +import org.omg.CosTransactions.PropagationContext; +import org.omg.CosTransactions.RecoveryCoordinator; +import org.omg.CosTransactions.Resource; +import org.omg.CosTransactions.Status; +import org.omg.CosTransactions.SubtransactionAwareResource; +import org.omg.CosTransactions.SubtransactionAwareResourceHelper; +import org.omg.CosTransactions.Synchronization; +import org.omg.CosTransactions.SynchronizationUnavailable; +import org.omg.CosTransactions.TransIdentity; +import org.omg.CosTransactions.Unavailable; +import org.omg.CosTransactions.Vote; +import org.omg.CosTransactions.otid_t; /** * The SubCoordinator interface is our implementation of the standard diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/SuperiorInfo.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/SuperiorInfo.java index 1a245577b0e..04ed6f6a65a 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/SuperiorInfo.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/SuperiorInfo.java @@ -30,7 +30,11 @@ package com.sun.jts.CosTransactions; -import org.omg.CosTransactions.*; +import org.omg.CosTransactions.Coordinator; +import org.omg.CosTransactions.RecoveryCoordinator; +import org.omg.CosTransactions.RecoveryCoordinatorHelper; +import org.omg.CosTransactions.SubtransactionAwareResource; +import org.omg.CosTransactions.SubtransactionAwareResourceHelper; /** * The SuperiorInfo interface provides operations that record the local diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TerminatorImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TerminatorImpl.java index 26618041b9b..b5ef3df3793 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TerminatorImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TerminatorImpl.java @@ -30,15 +30,33 @@ package com.sun.jts.CosTransactions; -import org.omg.CORBA.*; -import org.omg.PortableServer.*; +import com.sun.jts.utils.LogFormatter; +import com.sun.logging.LogDomains; + +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.omg.CORBA.CompletionStatus; +import org.omg.CORBA.Context; +import org.omg.CORBA.ContextList; +import org.omg.CORBA.ExceptionList; +import org.omg.CORBA.INTERNAL; +import org.omg.CORBA.INVALID_TRANSACTION; +import org.omg.CORBA.NVList; +import org.omg.CORBA.NamedValue; +import org.omg.CORBA.Request; +import org.omg.CORBA.SystemException; +import org.omg.CORBA.TRANSACTION_ROLLEDBACK; +import org.omg.CosTransactions.HeuristicHazard; +import org.omg.CosTransactions.HeuristicMixed; +import org.omg.CosTransactions.Status; +import org.omg.CosTransactions.StatusHolder; +import org.omg.CosTransactions.Terminator; +import org.omg.CosTransactions.TerminatorHelper; +import org.omg.CosTransactions.TerminatorPOA; +import org.omg.PortableServer.POA; import org.omg.PortableServer.POAPackage.ServantAlreadyActive; import org.omg.PortableServer.POAPackage.ServantNotActive; -import org.omg.CosTransactions.*; -import java.util.logging.Logger; -import java.util.logging.Level; -import com.sun.logging.LogDomains; -import com.sun.jts.utils.LogFormatter; /** * The TerminatorImpl interface is our implementation of the * standard Terminator diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TopCoordinator.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TopCoordinator.java index 0bed882b74e..7439ad5720d 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TopCoordinator.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TopCoordinator.java @@ -31,25 +31,54 @@ package com.sun.jts.CosTransactions; -import java.util.*; - -import org.omg.CORBA.*; -import org.omg.CosTransactions.*; - -import com.sun.jts.codegen.otsidl.*; +import com.sun.jts.codegen.otsidl.CoordinatorResource; +import com.sun.jts.codegen.otsidl.JCoordinator; +import com.sun.jts.codegen.otsidl.JCoordinatorHelper; import com.sun.jts.jtsxa.OTSResourceImpl; //import com.sun.jts.codegen.otsidl.JCoordinatorHelper; //import com.sun.jts.codegen.otsidl.JCoordinatorOperations; //import java.io.PrintStream; //import java.util.Vector; +import com.sun.jts.utils.LogFormatter; +import com.sun.logging.LogDomains; + +import java.util.Vector; +import java.util.logging.Level; //import com.sun.enterprise.transaction.OTSResourceImpl; //import com.sun.enterprise.transaction.SynchronizationImpl; import java.util.logging.Logger; -import java.util.logging.Level; -import com.sun.logging.LogDomains; -import com.sun.jts.utils.LogFormatter; + +import org.omg.CORBA.Any; +import org.omg.CORBA.BAD_PARAM; +import org.omg.CORBA.COMM_FAILURE; +import org.omg.CORBA.CompletionStatus; +import org.omg.CORBA.INTERNAL; +import org.omg.CORBA.INVALID_TRANSACTION; +import org.omg.CORBA.OBJECT_NOT_EXIST; +import org.omg.CORBA.SystemException; +import org.omg.CORBA.TRANSACTION_ROLLEDBACK; +import org.omg.CORBA.TRANSIENT; +import org.omg.CosTransactions.Control; +import org.omg.CosTransactions.Coordinator; +import org.omg.CosTransactions.CoordinatorHelper; +import org.omg.CosTransactions.HeuristicHazard; +import org.omg.CosTransactions.HeuristicMixed; +import org.omg.CosTransactions.Inactive; +import org.omg.CosTransactions.NotPrepared; +import org.omg.CosTransactions.NotSubtransaction; +import org.omg.CosTransactions.PropagationContext; +import org.omg.CosTransactions.RecoveryCoordinator; +import org.omg.CosTransactions.Resource; +import org.omg.CosTransactions.Status; +import org.omg.CosTransactions.SubtransactionAwareResource; +import org.omg.CosTransactions.Synchronization; +import org.omg.CosTransactions.SynchronizationUnavailable; +import org.omg.CosTransactions.TransIdentity; +import org.omg.CosTransactions.Unavailable; +import org.omg.CosTransactions.Vote; +import org.omg.CosTransactions.otid_t; /** * The TopCoordinator interface is our implementation of the standard diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TransactionFactoryImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TransactionFactoryImpl.java index 4437498b34c..67babdcf03c 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TransactionFactoryImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TransactionFactoryImpl.java @@ -31,15 +31,35 @@ package com.sun.jts.CosTransactions; -import org.omg.CORBA.*; -import org.omg.PortableServer.*; -import org.omg.CosTransactions.*; +import com.sun.jts.utils.LogFormatter; +import com.sun.logging.LogDomains; -import org.omg.CosNaming.*; -import java.util.logging.Logger; import java.util.logging.Level; -import com.sun.logging.LogDomains; -import com.sun.jts.utils.LogFormatter; +import java.util.logging.Logger; + +import org.omg.CORBA.CompletionStatus; +import org.omg.CORBA.Context; +import org.omg.CORBA.ContextList; +import org.omg.CORBA.ExceptionList; +import org.omg.CORBA.INTERNAL; +import org.omg.CORBA.INVALID_TRANSACTION; +import org.omg.CORBA.NO_PERMISSION; +import org.omg.CORBA.NVList; +import org.omg.CORBA.NamedValue; +import org.omg.CORBA.Request; +import org.omg.CORBA.SystemException; +import org.omg.CORBA.TRANSACTION_ROLLEDBACK; +import org.omg.CosNaming.NameComponent; +import org.omg.CosNaming.NamingContext; +import org.omg.CosNaming.NamingContextHelper; +import org.omg.CosTransactions.Control; +import org.omg.CosTransactions.Coordinator; +import org.omg.CosTransactions.PropagationContext; +import org.omg.CosTransactions.Status; +import org.omg.CosTransactions.TransactionFactory; +import org.omg.CosTransactions.TransactionFactoryHelper; +import org.omg.CosTransactions.TransactionFactoryPOA; +import org.omg.PortableServer.POA; /** * The TransactionFactoryImpl interface is our implementation of the standard diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TxInflowCoordinator.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TxInflowCoordinator.java index c5ee3879b5d..29bf131239d 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TxInflowCoordinator.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TxInflowCoordinator.java @@ -16,9 +16,9 @@ package com.sun.jts.CosTransactions; +import org.omg.CosTransactions.RecoveryCoordinator; import org.omg.CosTransactions.Resource; import org.omg.CosTransactions.Synchronization; -import org.omg.CosTransactions.RecoveryCoordinator; /** * This used for mimicking a superior TopCoordinator behavior. diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TxInflowRecoveryCoordinator.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TxInflowRecoveryCoordinator.java index 5d296bba513..23b2b23436f 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TxInflowRecoveryCoordinator.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TxInflowRecoveryCoordinator.java @@ -16,9 +16,9 @@ package com.sun.jts.CosTransactions; -import org.omg.CosTransactions.Status; -import org.omg.CosTransactions.Resource; import org.omg.CosTransactions.RecoveryCoordinator; +import org.omg.CosTransactions.Resource; +import org.omg.CosTransactions.Status; /** * This used for mimicking a RecoveryCoordinator behavior. diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/jta/NativeXAResource.java b/appserver/transaction/jts/src/main/java/com/sun/jts/jta/NativeXAResource.java index f202945c8a8..e8804fca206 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/jta/NativeXAResource.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/jta/NativeXAResource.java @@ -16,7 +16,8 @@ package com.sun.jts.jta; - import javax.transaction.xa.*; + import javax.transaction.xa.XAException; +import javax.transaction.xa.XAResource; /** * This interface extends JTA XAResource interface and defines diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/jta/SynchronizationImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/jta/SynchronizationImpl.java index 64ead9b6d4e..012c512549f 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/jta/SynchronizationImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/jta/SynchronizationImpl.java @@ -19,6 +19,8 @@ import com.sun.jts.CosTransactions.Configuration; import com.sun.logging.LogDomains; +import jakarta.transaction.Synchronization; + import java.util.Enumeration; import java.util.Vector; import java.util.logging.Level; @@ -35,8 +37,6 @@ import org.omg.CosTransactions.SynchronizationPOA; import org.omg.PortableServer.POA; -import jakarta.transaction.Synchronization; - /** * An implementation of org.omg.CosTransactions.Synchronization * this object is activated at creation time and de-activated diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/jta/TransactionImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/jta/TransactionImpl.java index 99b32cbf24f..76db5b2b5f6 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/jta/TransactionImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/jta/TransactionImpl.java @@ -22,6 +22,12 @@ import com.sun.jts.CosTransactions.GlobalTID; import com.sun.logging.LogDomains; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; + import java.util.logging.Level; import java.util.logging.Logger; @@ -38,12 +44,6 @@ import org.omg.CosTransactions.Status; import org.omg.CosTransactions.Unavailable; -import jakarta.transaction.HeuristicMixedException; -import jakarta.transaction.HeuristicRollbackException; -import jakarta.transaction.RollbackException; -import jakarta.transaction.Synchronization; -import jakarta.transaction.SystemException; - /** * An implementation of jakarta.transaction.Transaction using JTS * XXX TODO should catch all org.omg.CORBA.SystemException diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/jta/TransactionManagerImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/jta/TransactionManagerImpl.java index e002d4f3404..56eb8b06ae2 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/jta/TransactionManagerImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/jta/TransactionManagerImpl.java @@ -17,34 +17,53 @@ package com.sun.jts.jta; -import java.util.*; -import jakarta.transaction.*; -import java.io.File; -import org.omg.CosTransactions.*; -import org.omg.CORBA.*; -import org.omg.CORBA.ORBPackage.InvalidName; - -import com.sun.jts.CosTransactions.*; -import com.sun.jts.codegen.otsidl.*; - -import jakarta.transaction.SystemException; -import org.omg.CosTransactions.Status; -import org.omg.CosTransactions.Current; -import org.omg.CosTransactions.NoTransaction; -import org.omg.CosTransactions.HeuristicMixed; -import org.omg.CosTransactions.HeuristicHazard; +import com.sun.jts.CosTransactions.Configuration; +import com.sun.jts.CosTransactions.ControlImpl; +import com.sun.jts.CosTransactions.CurrentTransaction; +import com.sun.jts.CosTransactions.DefaultTransactionService; import com.sun.jts.CosTransactions.GlobalTID; +import com.sun.jts.CosTransactions.MinorCode; +import com.sun.jts.CosTransactions.RecoveryManager; +import com.sun.jts.CosTransactions.XATerminatorImpl; +import com.sun.jts.codegen.otsidl.JControlHelper; +import com.sun.jts.utils.LogFormatter; +import com.sun.logging.LogDomains; -import javax.transaction.xa.Xid; -import jakarta.resource.spi.work.WorkException; import jakarta.resource.spi.work.WorkCompletedException; +import jakarta.resource.spi.work.WorkException; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.InvalidTransactionException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; - -import java.util.logging.Logger; +import java.io.File; +import java.util.Enumeration; +import java.util.Properties; import java.util.logging.Level; -import com.sun.logging.LogDomains; -import com.sun.jts.utils.LogFormatter; +import java.util.logging.Logger; + +import javax.transaction.xa.Xid; + import org.glassfish.internal.api.Globals; +import org.omg.CORBA.INTERNAL; +import org.omg.CORBA.INVALID_TRANSACTION; +import org.omg.CORBA.NO_PERMISSION; +import org.omg.CORBA.ORB; +import org.omg.CORBA.TRANSACTION_ROLLEDBACK; +import org.omg.CORBA.ORBPackage.InvalidName; +import org.omg.CosTransactions.Control; +import org.omg.CosTransactions.Current; +import org.omg.CosTransactions.HeuristicHazard; +import org.omg.CosTransactions.HeuristicMixed; +import org.omg.CosTransactions.InvalidControl; +import org.omg.CosTransactions.NoTransaction; +import org.omg.CosTransactions.Status; +import org.omg.CosTransactions.SubtransactionsUnavailable; +import org.omg.CosTransactions.Unavailable; /** * An implementation of jakarta.transaction.TransactionManager using JTA. diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/jta/TransactionServiceProperties.java b/appserver/transaction/jts/src/main/java/com/sun/jts/jta/TransactionServiceProperties.java index cadddf02baa..bf9711a7a45 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/jta/TransactionServiceProperties.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/jta/TransactionServiceProperties.java @@ -16,31 +16,30 @@ package com.sun.jts.jta; -import java.io.File; -import java.util.Properties; -import java.util.logging.Logger; -import java.util.logging.Level; - -import com.sun.enterprise.transaction.config.TransactionService; -import com.sun.jts.CosTransactions.Configuration; -import com.sun.jts.CosTransactions.RecoveryManager; -import com.sun.jts.utils.RecoveryHooks.FailureInducer; - -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.internal.api.ServerContext; -import org.glassfish.api.admin.ProcessEnvironment; -import org.glassfish.enterprise.iiop.api.GlassFishORBHelper; -import com.sun.enterprise.transaction.api.ResourceRecoveryManager; import com.sun.enterprise.config.serverbeans.Cluster; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.config.serverbeans.SystemProperty; import com.sun.enterprise.config.serverbeans.SystemPropertyBag; +import com.sun.enterprise.transaction.api.ResourceRecoveryManager; +import com.sun.enterprise.transaction.config.TransactionService; import com.sun.enterprise.util.i18n.StringManager; +import com.sun.jts.CosTransactions.Configuration; +import com.sun.jts.CosTransactions.RecoveryManager; +import com.sun.jts.utils.RecoveryHooks.FailureInducer; import com.sun.logging.LogDomains; -import org.glassfish.api.admin.ServerEnvironment; +import java.io.File; +import java.util.Properties; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.glassfish.api.admin.ProcessEnvironment; +import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.enterprise.iiop.api.GlassFishORBHelper; +import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.hk2.utilities.BuilderHelper; +import org.glassfish.internal.api.ServerContext; import org.jvnet.hk2.config.types.Property; /** diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/jta/TransactionState.java b/appserver/transaction/jts/src/main/java/com/sun/jts/jta/TransactionState.java index 141b23ee0f6..671ebc1e973 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/jta/TransactionState.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/jta/TransactionState.java @@ -16,25 +16,39 @@ package com.sun.jts.jta; -import java.util.*; -import javax.transaction.xa.*; -import org.omg.CosTransactions.*; -import com.sun.jts.jtsxa.XID; -import com.sun.jts.codegen.jtsxa.OTSResource; -import com.sun.jts.jtsxa.OTSResourceImpl; -import jakarta.transaction.SystemException; -import jakarta.transaction.RollbackException; -import jakarta.transaction.Synchronization; -import com.sun.jts.jtsxa.Utility; import com.sun.jts.CosTransactions.Configuration; import com.sun.jts.CosTransactions.ControlImpl; -import org.omg.CORBA.TRANSACTION_ROLLEDBACK; import com.sun.jts.CosTransactions.GlobalTID; +import com.sun.jts.codegen.jtsxa.OTSResource; +import com.sun.jts.jtsxa.OTSResourceImpl; +import com.sun.jts.jtsxa.Utility; +import com.sun.jts.jtsxa.XID; +import com.sun.logging.LogDomains; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; -import java.util.logging.Logger; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.logging.Level; -import com.sun.logging.LogDomains; +import java.util.logging.Logger; + +import javax.transaction.xa.XAException; +import javax.transaction.xa.XAResource; +import javax.transaction.xa.Xid; + +import org.omg.CORBA.TRANSACTION_ROLLEDBACK; +import org.omg.CosTransactions.Control; +import org.omg.CosTransactions.Inactive; +import org.omg.CosTransactions.Unavailable; /** * keep track of per-transaction state * diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/jta/UserTransactionFactory.java b/appserver/transaction/jts/src/main/java/com/sun/jts/jta/UserTransactionFactory.java index 8033d42deee..25e1d6680e6 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/jta/UserTransactionFactory.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/jta/UserTransactionFactory.java @@ -16,8 +16,10 @@ package com.sun.jts.jta; -import javax.naming.*; -import javax.naming.spi.*; +import javax.naming.Context; +import javax.naming.Name; +import javax.naming.Reference; +import javax.naming.spi.ObjectFactory; /** * Factory for producing the UserTransactionImpl objects. diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/jta/UserTransactionImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/jta/UserTransactionImpl.java index 51a1f9670e9..cb014071dbb 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/jta/UserTransactionImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/jta/UserTransactionImpl.java @@ -16,11 +16,20 @@ package com.sun.jts.jta; -import jakarta.transaction.*; -import javax.naming.*; +import com.sun.logging.LogDomains; + +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.TransactionRolledbackException; import java.util.logging.Logger; -import com.sun.logging.LogDomains; + +import javax.naming.NamingException; +import javax.naming.Reference; /** * This class implements the jakarta.transaction.UserTransaction interface * which defines methods that allow an application to explicitly manage diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/OTSResourceImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/OTSResourceImpl.java index 05ca593835c..d508bb457d8 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/OTSResourceImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/OTSResourceImpl.java @@ -16,21 +16,41 @@ package com.sun.jts.jtsxa; -import org.omg.CosTransactions.*; -import org.omg.CORBA.*; -import org.omg.PortableServer.*; - -import com.sun.jts.CosTransactions.*; - -import javax.transaction.xa.*; +import com.sun.jts.CosTransactions.Configuration; +import com.sun.jts.codegen.jtsxa.OTSResource; +import com.sun.jts.codegen.jtsxa.OTSResourceHelper; +import com.sun.jts.codegen.jtsxa.OTSResourcePOA; //import com.sun.jts.etsjdbc.odbc.NativeXAResourceImpl; import com.sun.jts.jta.TransactionState; -import com.sun.jts.codegen.jtsxa.*; +import com.sun.jts.utils.LogFormatter; +import com.sun.logging.LogDomains; -import java.util.logging.Logger; import java.util.logging.Level; -import com.sun.logging.LogDomains; -import com.sun.jts.utils.LogFormatter; +import java.util.logging.Logger; + +import javax.transaction.xa.XAException; +import javax.transaction.xa.XAResource; +import javax.transaction.xa.Xid; + +import org.omg.CORBA.CompletionStatus; +import org.omg.CORBA.Context; +import org.omg.CORBA.ContextList; +import org.omg.CORBA.ExceptionList; +import org.omg.CORBA.INTERNAL; +import org.omg.CORBA.NVList; +import org.omg.CORBA.NamedValue; +import org.omg.CORBA.Request; +import org.omg.CORBA.SystemException; +import org.omg.CORBA.TRANSACTION_ROLLEDBACK; +import org.omg.CORBA.TRANSIENT; +import org.omg.CosTransactions.HeuristicCommit; +import org.omg.CosTransactions.HeuristicHazard; +import org.omg.CosTransactions.HeuristicMixed; +import org.omg.CosTransactions.HeuristicRollback; +import org.omg.CosTransactions.NotPrepared; +import org.omg.CosTransactions.Vote; +import org.omg.CosTransactions.otid_t; +import org.omg.PortableServer.POA; /* An implementation of org.omg.CosTransactions.Resource to support * X/Open XA compliant resource managers. diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/Utility.java b/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/Utility.java index e4a726c527a..dc1be1c3649 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/Utility.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/Utility.java @@ -16,9 +16,12 @@ package com.sun.jts.jtsxa; -import org.omg.CosTransactions.*; -import com.sun.jts.codegen.otsidl.*; -import com.sun.jts.CosTransactions.*; +import com.sun.jts.CosTransactions.Configuration; +import com.sun.jts.codegen.otsidl.JCoordinatorHelper; + +import org.omg.CosTransactions.Control; +import org.omg.CosTransactions.Coordinator; +import org.omg.CosTransactions.otid_t; /** * This is an Utility class containing helper functions. diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/XID.java b/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/XID.java index eced0b02b67..11d5384dbf2 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/XID.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/XID.java @@ -30,12 +30,14 @@ package com.sun.jts.jtsxa; -import org.omg.CosTransactions.*; -import javax.transaction.xa.Xid; +import com.sun.logging.LogDomains; -import java.util.logging.Logger; import java.util.logging.Level; -import com.sun.logging.LogDomains; +import java.util.logging.Logger; + +import javax.transaction.xa.Xid; + +import org.omg.CosTransactions.otid_t; /** * The XID class provides an implementation of the X/Open diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/pi/IORInterceptorImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/pi/IORInterceptorImpl.java index 5c86035c0e7..acf61ba68c4 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/pi/IORInterceptorImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/pi/IORInterceptorImpl.java @@ -16,21 +16,22 @@ package com.sun.jts.pi; -import org.omg.IOP.Codec; -import org.omg.IOP.TaggedComponent; -import org.omg.IOP.CodecPackage.InvalidTypeForEncoding; - -import org.omg.CORBA.ORB; import org.omg.CORBA.Any; -import org.omg.CORBA.LocalObject; -import org.omg.CORBA.INV_POLICY; import org.omg.CORBA.INTERNAL; - -import org.omg.CosTransactions.*; - -import org.omg.CosTSInteroperation.TAG_OTS_POLICY; +import org.omg.CORBA.INV_POLICY; +import org.omg.CORBA.LocalObject; +import org.omg.CORBA.ORB; import org.omg.CosTSInteroperation.TAG_INV_POLICY; - +import org.omg.CosTSInteroperation.TAG_OTS_POLICY; +import org.omg.CosTransactions.EITHER; +import org.omg.CosTransactions.FORBIDS; +import org.omg.CosTransactions.INVOCATION_POLICY_TYPE; +import org.omg.CosTransactions.InvocationPolicy; +import org.omg.CosTransactions.OTSPolicy; +import org.omg.CosTransactions.OTS_POLICY_TYPE; +import org.omg.IOP.Codec; +import org.omg.IOP.TaggedComponent; +import org.omg.IOP.CodecPackage.InvalidTypeForEncoding; import org.omg.PortableInterceptor.IORInfo; import org.omg.PortableInterceptor.IORInterceptor; diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/pi/InterceptorImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/pi/InterceptorImpl.java index 34fb6a24fc3..3f4dc8914fc 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/pi/InterceptorImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/pi/InterceptorImpl.java @@ -16,14 +16,15 @@ package com.sun.jts.pi; -import org.omg.IOP.Codec; -import org.omg.IOP.ServiceContext; -import org.omg.IOP.TaggedComponent; -import org.omg.IOP.CodecPackage.*; - +import com.sun.corba.ee.impl.txpoa.TSIdentificationImpl; +import com.sun.corba.ee.spi.misc.ORBConstants; +import com.sun.corba.ee.spi.oa.rfm.ReferenceFactoryManager; import com.sun.corba.ee.spi.presentation.rmi.StubAdapter; -import org.omg.CORBA.portable.InputStream; -import org.omg.PortableInterceptor.Current; +import com.sun.jts.CosTransactions.CurrentTransaction; +import com.sun.logging.LogDomains; + +import java.util.logging.Level; +import java.util.logging.Logger; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; @@ -36,27 +37,37 @@ import org.omg.CORBA.ORB; import org.omg.CORBA.SystemException; import org.omg.CORBA.TCKind; -import org.omg.CORBA.TRANSACTION_ROLLEDBACK; import org.omg.CORBA.TRANSACTION_REQUIRED; +import org.omg.CORBA.TRANSACTION_ROLLEDBACK; import org.omg.CORBA.TRANSACTION_UNAVAILABLE; import org.omg.CORBA.TSIdentification; import org.omg.CORBA.TypeCode; -import org.omg.CosTransactions.*; -import org.omg.PortableInterceptor.*; - -import org.omg.CosTSPortability.Sender; -import org.omg.CosTSPortability.Receiver; - +import org.omg.CORBA.portable.InputStream; import org.omg.CosTSInteroperation.TAG_OTS_POLICY; - -import com.sun.jts.CosTransactions.CurrentTransaction; -import com.sun.corba.ee.impl.txpoa.TSIdentificationImpl; -import com.sun.corba.ee.spi.oa.rfm.ReferenceFactoryManager; -import com.sun.corba.ee.spi.misc.ORBConstants; - -import java.util.logging.Logger; -import java.util.logging.Level; -import com.sun.logging.LogDomains; +import org.omg.CosTSPortability.Receiver; +import org.omg.CosTSPortability.Sender; +import org.omg.CosTransactions.FORBIDS; +import org.omg.CosTransactions.OTSPolicy; +import org.omg.CosTransactions.OTSPolicyValueHelper; +import org.omg.CosTransactions.OTS_POLICY_TYPE; +import org.omg.CosTransactions.PropagationContext; +import org.omg.CosTransactions.PropagationContextHelper; +import org.omg.CosTransactions.PropagationContextHolder; +import org.omg.CosTransactions.REQUIRES; +import org.omg.CosTransactions.TransIdentity; +import org.omg.CosTransactions.otid_t; +import org.omg.IOP.Codec; +import org.omg.IOP.ServiceContext; +import org.omg.IOP.TaggedComponent; +import org.omg.IOP.CodecPackage.FormatMismatch; +import org.omg.IOP.CodecPackage.InvalidTypeForEncoding; +import org.omg.IOP.CodecPackage.TypeMismatch; +import org.omg.PortableInterceptor.ClientRequestInfo; +import org.omg.PortableInterceptor.ClientRequestInterceptor; +import org.omg.PortableInterceptor.Current; +import org.omg.PortableInterceptor.ForwardRequest; +import org.omg.PortableInterceptor.ServerRequestInfo; +import org.omg.PortableInterceptor.ServerRequestInterceptor; /** * This is the implementation of the JTS PI-based client/server interceptor. diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/pi/InvocationPolicyFactory.java b/appserver/transaction/jts/src/main/java/com/sun/jts/pi/InvocationPolicyFactory.java index a92e5b85582..b22dd4898bc 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/pi/InvocationPolicyFactory.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/pi/InvocationPolicyFactory.java @@ -17,16 +17,14 @@ package com.sun.jts.pi; import org.omg.CORBA.Any; +import org.omg.CORBA.LocalObject; import org.omg.CORBA.Policy; import org.omg.CORBA.PolicyError; -import org.omg.CORBA.LocalObject; - -import org.omg.CosTransactions.SHARED; -import org.omg.CosTransactions.UNSHARED; import org.omg.CosTransactions.EITHER; import org.omg.CosTransactions.INVOCATION_POLICY_TYPE; import org.omg.CosTransactions.InvocationPolicyValueHelper; - +import org.omg.CosTransactions.SHARED; +import org.omg.CosTransactions.UNSHARED; import org.omg.PortableInterceptor.PolicyFactory; /** diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/pi/InvocationPolicyImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/pi/InvocationPolicyImpl.java index 92f21c1a8cc..932e68ea429 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/pi/InvocationPolicyImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/pi/InvocationPolicyImpl.java @@ -16,12 +16,11 @@ package com.sun.jts.pi; -import org.omg.CORBA.Policy; import org.omg.CORBA.LocalObject; - +import org.omg.CORBA.Policy; import org.omg.CosTransactions.EITHER; -import org.omg.CosTransactions.InvocationPolicy; import org.omg.CosTransactions.INVOCATION_POLICY_TYPE; +import org.omg.CosTransactions.InvocationPolicy; /** * This is the InvocationPolicy object which holds an appropriate policy value. diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/pi/ORBInitializerImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/pi/ORBInitializerImpl.java index 57b4a2a2cf4..75311b2ee37 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/pi/ORBInitializerImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/pi/ORBInitializerImpl.java @@ -16,21 +16,26 @@ package com.sun.jts.pi; -import org.omg.IOP.*; -import org.omg.IOP.CodecFactoryPackage.UnknownEncoding; - -import org.omg.CORBA.*; +import com.sun.jts.CosTransactions.MinorCode; -import org.omg.CosTransactions.OTS_POLICY_TYPE; +import org.omg.CORBA.BAD_INV_ORDER; +import org.omg.CORBA.CompletionStatus; +import org.omg.CORBA.INTERNAL; +import org.omg.CORBA.LocalObject; +import org.omg.CORBA.TSIdentification; import org.omg.CosTransactions.INVOCATION_POLICY_TYPE; - +import org.omg.CosTransactions.OTS_POLICY_TYPE; +import org.omg.IOP.Codec; +import org.omg.IOP.CodecFactory; +import org.omg.IOP.ENCODING_CDR_ENCAPS; +import org.omg.IOP.Encoding; +import org.omg.IOP.CodecFactoryPackage.UnknownEncoding; import org.omg.PortableInterceptor.Current; -import org.omg.PortableInterceptor.*; +import org.omg.PortableInterceptor.ORBInitInfo; +import org.omg.PortableInterceptor.ORBInitializer; +import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName; //import org.omg.CORBA.ORBPackage.InvalidName; import org.omg.PortableInterceptor.ORBInitInfoPackage.InvalidName; -import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName; - -import com.sun.jts.CosTransactions.MinorCode; /** * This class implements the ORBInitializer for JTS. When an instance of this diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/pi/OTSPolicyFactory.java b/appserver/transaction/jts/src/main/java/com/sun/jts/pi/OTSPolicyFactory.java index f77d3b1fefe..9225aa69ba1 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/pi/OTSPolicyFactory.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/pi/OTSPolicyFactory.java @@ -17,14 +17,14 @@ package com.sun.jts.pi; import org.omg.CORBA.Any; +import org.omg.CORBA.LocalObject; import org.omg.CORBA.Policy; import org.omg.CORBA.PolicyError; -import org.omg.CORBA.LocalObject; -import org.omg.CosTransactions.REQUIRES; import org.omg.CosTransactions.ADAPTS; import org.omg.CosTransactions.FORBIDS; -import org.omg.CosTransactions.OTS_POLICY_TYPE; import org.omg.CosTransactions.OTSPolicyValueHelper; +import org.omg.CosTransactions.OTS_POLICY_TYPE; +import org.omg.CosTransactions.REQUIRES; import org.omg.PortableInterceptor.PolicyFactory; /** diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/pi/OTSPolicyImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/pi/OTSPolicyImpl.java index f2ca8e0d6bb..eddd37d6411 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/pi/OTSPolicyImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/pi/OTSPolicyImpl.java @@ -16,14 +16,13 @@ package com.sun.jts.pi; -import org.omg.CORBA.Policy; import org.omg.CORBA.LocalObject; - +import org.omg.CORBA.Policy; import org.omg.CosTransactions.ADAPTS; import org.omg.CosTransactions.FORBIDS; -import org.omg.CosTransactions.REQUIRES; import org.omg.CosTransactions.OTSPolicy; import org.omg.CosTransactions.OTS_POLICY_TYPE; +import org.omg.CosTransactions.REQUIRES; /** * This is the OTSPolicy object which holds an appropriate policy value. diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/trace/TraceRecordFormatter.java b/appserver/transaction/jts/src/main/java/com/sun/jts/trace/TraceRecordFormatter.java index e143c01b47e..dc94978229e 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/trace/TraceRecordFormatter.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/trace/TraceRecordFormatter.java @@ -16,9 +16,12 @@ package com.sun.jts.trace; -import org.omg.CosTransactions.*; -import javax.transaction.xa.*; -import java.util.*; +import java.util.Enumeration; +import java.util.Properties; + +import javax.transaction.xa.Xid; + +import org.omg.CosTransactions.otid_t; /** * This class is used to format the trace record. diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/utils/RecoveryHooks/FailureInducer.java b/appserver/transaction/jts/src/main/java/com/sun/jts/utils/RecoveryHooks/FailureInducer.java index c0fa8a670e9..e3fbf1f0d57 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/utils/RecoveryHooks/FailureInducer.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/utils/RecoveryHooks/FailureInducer.java @@ -16,19 +16,20 @@ package com.sun.jts.utils.RecoveryHooks; -import java.util.Hashtable; -import java.util.ResourceBundle; -import com.sun.jts.jtsxa.Utility; -import com.sun.jts.codegen.otsidl.JCoordinator; -import com.sun.jts.codegen.otsidl.JCoordinatorHelper; -import com.sun.jts.CosTransactions.GlobalTID; import com.sun.jts.CosTransactions.ControlImpl; import com.sun.jts.CosTransactions.CurrentTransaction; -import org.omg.CosTransactions.Coordinator; +import com.sun.jts.CosTransactions.GlobalTID; +import com.sun.jts.codegen.otsidl.JCoordinator; +import com.sun.jts.codegen.otsidl.JCoordinatorHelper; +import com.sun.jts.jtsxa.Utility; +import com.sun.logging.LogDomains; -import java.util.logging.Logger; +import java.util.Hashtable; +import java.util.ResourceBundle; import java.util.logging.Level; -import com.sun.logging.LogDomains; +import java.util.logging.Logger; + +import org.omg.CosTransactions.Coordinator; /** * This class defines API's for the test harness to induce * recovery by setting crash points (in the case of TM crashes) diff --git a/appserver/transaction/jts/src/test/java/com/sun/enterprise/transaction/jts/JavaEETransactionManagerTest.java b/appserver/transaction/jts/src/test/java/com/sun/enterprise/transaction/jts/JavaEETransactionManagerTest.java index eedf7a052cb..9499143bb31 100644 --- a/appserver/transaction/jts/src/test/java/com/sun/enterprise/transaction/jts/JavaEETransactionManagerTest.java +++ b/appserver/transaction/jts/src/test/java/com/sun/enterprise/transaction/jts/JavaEETransactionManagerTest.java @@ -29,16 +29,6 @@ import com.sun.enterprise.transaction.TransactionSynchronizationRegistryImpl; import com.sun.enterprise.transaction.UserTransactionImpl; import com.sun.enterprise.transaction.spi.JavaEETransactionManagerDelegate; -import java.beans.PropertyChangeEvent; -import javax.transaction.xa.XAException; -import javax.transaction.xa.XAResource; -import javax.transaction.xa.Xid; - -import org.glassfish.api.invocation.InvocationManager; -import org.glassfish.api.naming.SimpleJndiName; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; import jakarta.transaction.HeuristicMixedException; import jakarta.transaction.HeuristicRollbackException; @@ -53,6 +43,18 @@ import jakarta.transaction.TransactionSynchronizationRegistry; import jakarta.transaction.UserTransaction; +import java.beans.PropertyChangeEvent; + +import javax.transaction.xa.XAException; +import javax.transaction.xa.XAResource; +import javax.transaction.xa.Xid; + +import org.glassfish.api.invocation.InvocationManager; +import org.glassfish.api.naming.SimpleJndiName; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; From c44b903fc60d1fd9d4584a0032be9d502158261f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 00:39:55 +0200 Subject: [PATCH 14/40] Imports: resource modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../resources/mail/MailLogOutputStream.java | 1 + .../mail/MailSessionAuthenticator.java | 3 +- .../mail/admin/cli/ListMailResources.java | 22 +++-- .../resources/mail/config/MailResource.java | 4 +- .../admin/cli/CreateMailResourceTest.java | 4 +- .../admin/cli/DeleteMailResourceTest.java | 4 +- .../mail/admin/cli/ListMailResourcesTest.java | 4 +- .../mail/test/GlassFishTestDocument.java | 3 +- .../resources/mail/beans/MailResource.java | 3 +- .../resources/admin/cli/AddResources.java | 23 +++-- .../admin/cli/CreateJndiResource.java | 26 ++++-- .../admin/cli/DeleteJndiResource.java | 1 + .../admin/cli/ListCustomResources.java | 22 +++-- .../admin/cli/ListJndiResources.java | 22 +++-- .../resources/admin/cli/ResourceFactory.java | 7 +- .../resources/admin/cli/ResourceManager.java | 5 +- .../resources/admin/cli/ResourcesManager.java | 11 +-- .../admin/cli/ResourcesXMLParser.java | 87 ++++++++++++++++++- .../resources/admin/cli/SunResourcesXML.java | 4 +- .../connector/ResourcesCompositeSniffer.java | 9 +- .../resources/connector/ResourcesSniffer.java | 12 +-- .../custom/factory/JavaBeanFactory.java | 15 ++-- .../factory/PrimitivesAndStringFactory.java | 13 +-- .../custom/factory/PropertiesFactory.java | 17 +++- .../resources/util/ResourceUtil.java | 7 +- .../admin/cli/DeleteJndiResourceTest.java | 4 +- .../admin/cli/ListJndiResourcesTest.java | 4 +- .../resources/beans/CustomResource.java | 2 +- .../module/ResourcesApplication.java | 21 +++-- .../resources/module/ResourcesContainer.java | 11 +-- .../resources/ResourceTypeOrder.java | 6 +- .../resources/ResourceTypeOrderProcessor.java | 1 + .../resources/admin/cli/ResourceUtil.java | 1 + .../resources/api/ResourcesBinder.java | 13 +-- .../util/ResourceManagerFactory.java | 11 +-- 35 files changed, 284 insertions(+), 119 deletions(-) diff --git a/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/MailLogOutputStream.java b/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/MailLogOutputStream.java index 3225e7c4768..7c64f2c4136 100644 --- a/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/MailLogOutputStream.java +++ b/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/MailLogOutputStream.java @@ -17,6 +17,7 @@ package org.glassfish.resources.mail; import java.util.logging.Level; + import org.glassfish.logging.annotation.LoggerInfo; /** diff --git a/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/MailSessionAuthenticator.java b/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/MailSessionAuthenticator.java index 4a4b057babd..1c751189e44 100644 --- a/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/MailSessionAuthenticator.java +++ b/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/MailSessionAuthenticator.java @@ -16,10 +16,11 @@ package org.glassfish.resources.mail; -import java.util.Properties; import jakarta.mail.Authenticator; import jakarta.mail.PasswordAuthentication; +import java.util.Properties; + /** * * @author peterw99 diff --git a/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/admin/cli/ListMailResources.java b/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/admin/cli/ListMailResources.java index dc80a30fa55..c8361fc0257 100644 --- a/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/admin/cli/ListMailResources.java +++ b/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/admin/cli/ListMailResources.java @@ -20,22 +20,30 @@ import com.sun.enterprise.config.serverbeans.Resources; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; -import org.glassfish.resources.mail.config.MailResource; import org.glassfish.resourcebase.resources.util.BindableResourcesHelper; +import org.glassfish.resources.mail.config.MailResource; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - /** * List Mail Resources command * diff --git a/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/config/MailResource.java b/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/config/MailResource.java index 8059096ba2e..66828e88565 100644 --- a/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/config/MailResource.java +++ b/appserver/resources/mail/mail-connector/src/main/java/org/glassfish/resources/mail/config/MailResource.java @@ -28,9 +28,9 @@ import org.glassfish.admin.cli.resources.ResourceConfigCreator; import org.glassfish.admin.cli.resources.UniqueResourceNameConstraint; -import org.glassfish.api.admin.config.PropertiesDesc; -import org.glassfish.api.admin.RestRedirects; import org.glassfish.api.admin.RestRedirect; +import org.glassfish.api.admin.RestRedirects; +import org.glassfish.api.admin.config.PropertiesDesc; import org.glassfish.quality.ToDo; import org.glassfish.resourcebase.resources.ResourceDeploymentOrder; import org.glassfish.resourcebase.resources.ResourceTypeOrder; diff --git a/appserver/resources/mail/mail-connector/src/test/java/org/glassfish/resources/mail/admin/cli/CreateMailResourceTest.java b/appserver/resources/mail/mail-connector/src/test/java/org/glassfish/resources/mail/admin/cli/CreateMailResourceTest.java index 68082e0dbaf..65c7f4f33db 100644 --- a/appserver/resources/mail/mail-connector/src/test/java/org/glassfish/resources/mail/admin/cli/CreateMailResourceTest.java +++ b/appserver/resources/mail/mail-connector/src/test/java/org/glassfish/resources/mail/admin/cli/CreateMailResourceTest.java @@ -27,6 +27,8 @@ import com.sun.enterprise.v3.common.PropsFileActionReporter; import com.sun.logging.LogDomains; +import jakarta.inject.Inject; + import java.util.logging.Logger; import javax.security.auth.Subject; @@ -46,8 +48,6 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/appserver/resources/mail/mail-connector/src/test/java/org/glassfish/resources/mail/admin/cli/DeleteMailResourceTest.java b/appserver/resources/mail/mail-connector/src/test/java/org/glassfish/resources/mail/admin/cli/DeleteMailResourceTest.java index 3dbe062ce91..6e98fdb6b18 100644 --- a/appserver/resources/mail/mail-connector/src/test/java/org/glassfish/resources/mail/admin/cli/DeleteMailResourceTest.java +++ b/appserver/resources/mail/mail-connector/src/test/java/org/glassfish/resources/mail/admin/cli/DeleteMailResourceTest.java @@ -27,6 +27,8 @@ import com.sun.enterprise.v3.common.PropsFileActionReporter; import com.sun.logging.LogDomains; +import jakarta.inject.Inject; + import java.util.logging.Logger; import javax.security.auth.Subject; @@ -48,8 +50,6 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/appserver/resources/mail/mail-connector/src/test/java/org/glassfish/resources/mail/admin/cli/ListMailResourcesTest.java b/appserver/resources/mail/mail-connector/src/test/java/org/glassfish/resources/mail/admin/cli/ListMailResourcesTest.java index dd55f8c686b..82268ac0736 100644 --- a/appserver/resources/mail/mail-connector/src/test/java/org/glassfish/resources/mail/admin/cli/ListMailResourcesTest.java +++ b/appserver/resources/mail/mail-connector/src/test/java/org/glassfish/resources/mail/admin/cli/ListMailResourcesTest.java @@ -23,6 +23,8 @@ import com.sun.enterprise.v3.common.PropsFileActionReporter; import com.sun.logging.LogDomains; +import jakarta.inject.Inject; + import java.util.ArrayList; import java.util.List; @@ -42,8 +44,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import jakarta.inject.Inject; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInRelativeOrder; import static org.hamcrest.Matchers.hasSize; diff --git a/appserver/resources/mail/mail-connector/src/test/java/org/glassfish/resources/mail/test/GlassFishTestDocument.java b/appserver/resources/mail/mail-connector/src/test/java/org/glassfish/resources/mail/test/GlassFishTestDocument.java index e3f673369b5..89ae8ff722a 100644 --- a/appserver/resources/mail/mail-connector/src/test/java/org/glassfish/resources/mail/test/GlassFishTestDocument.java +++ b/appserver/resources/mail/mail-connector/src/test/java/org/glassfish/resources/mail/test/GlassFishTestDocument.java @@ -17,12 +17,13 @@ package org.glassfish.resources.mail.test; +import javax.xml.stream.XMLStreamReader; + import org.glassfish.config.support.GlassFishConfigBean; import org.glassfish.hk2.api.ServiceLocator; import org.jvnet.hk2.config.ConfigModel; import org.jvnet.hk2.config.Dom; import org.jvnet.hk2.config.DomDocument; -import javax.xml.stream.XMLStreamReader; /** * diff --git a/appserver/resources/mail/mail-runtime/src/main/java/org/glassfish/resources/mail/beans/MailResource.java b/appserver/resources/mail/mail-runtime/src/main/java/org/glassfish/resources/mail/beans/MailResource.java index 963996b0ac3..f8778425b63 100755 --- a/appserver/resources/mail/mail-runtime/src/main/java/org/glassfish/resources/mail/beans/MailResource.java +++ b/appserver/resources/mail/mail-runtime/src/main/java/org/glassfish/resources/mail/beans/MailResource.java @@ -18,9 +18,10 @@ package org.glassfish.resources.mail.beans; import com.sun.enterprise.deployment.interfaces.MailResourceIntf; + +import org.glassfish.resourcebase.resources.api.ResourceInfo; import org.glassfish.resources.api.JavaEEResource; import org.glassfish.resources.api.JavaEEResourceBase; -import org.glassfish.resourcebase.resources.api.ResourceInfo; /** * Resource info for MailResource. diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/AddResources.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/AddResources.java index 4ec14647b4f..17c8723a487 100644 --- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/AddResources.java +++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/AddResources.java @@ -20,23 +20,30 @@ import com.sun.enterprise.config.serverbeans.Resources; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + +import java.io.File; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; import org.glassfish.resourcebase.resources.api.ResourceStatus; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import java.io.File; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * Create add-resources Command * diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/CreateJndiResource.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/CreateJndiResource.java index 452830943fd..54cdf07abac 100644 --- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/CreateJndiResource.java +++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/CreateJndiResource.java @@ -21,23 +21,33 @@ import com.sun.enterprise.config.serverbeans.ServerTags; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + +import java.util.HashMap; +import java.util.Properties; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; import org.glassfish.resourcebase.resources.api.ResourceStatus; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import java.util.HashMap; -import java.util.Properties; -import java.util.logging.Level; -import java.util.logging.Logger; - -import static org.glassfish.resources.admin.cli.ResourceConstants.*; +import static org.glassfish.resources.admin.cli.ResourceConstants.ENABLED; +import static org.glassfish.resources.admin.cli.ResourceConstants.FACTORY_CLASS; +import static org.glassfish.resources.admin.cli.ResourceConstants.JNDI_LOOKUP; +import static org.glassfish.resources.admin.cli.ResourceConstants.JNDI_NAME; +import static org.glassfish.resources.admin.cli.ResourceConstants.RES_TYPE; /** * Create Jndi Resource diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/DeleteJndiResource.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/DeleteJndiResource.java index e706a211044..acb215678c1 100644 --- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/DeleteJndiResource.java +++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/DeleteJndiResource.java @@ -20,6 +20,7 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Resources; import com.sun.enterprise.util.LocalStringManagerImpl; + import jakarta.inject.Inject; import org.glassfish.api.ActionReport; diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ListCustomResources.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ListCustomResources.java index 4c768789754..ac2f9e867c1 100644 --- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ListCustomResources.java +++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ListCustomResources.java @@ -20,22 +20,30 @@ import com.sun.enterprise.config.serverbeans.Resources; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; -import org.glassfish.resources.config.CustomResource; import org.glassfish.resourcebase.resources.util.BindableResourcesHelper; +import org.glassfish.resources.config.CustomResource; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - /** * List Custom Resources command * diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ListJndiResources.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ListJndiResources.java index 123aec6b815..e48dda0be1c 100644 --- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ListJndiResources.java +++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ListJndiResources.java @@ -20,22 +20,30 @@ import com.sun.enterprise.config.serverbeans.Resources; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; -import org.glassfish.resources.config.ExternalJndiResource; import org.glassfish.resourcebase.resources.util.BindableResourcesHelper; +import org.glassfish.resources.config.ExternalJndiResource; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - /** * List Jndi Resources command */ diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourceFactory.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourceFactory.java index ba27ddac7bd..32660373332 100644 --- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourceFactory.java +++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourceFactory.java @@ -16,14 +16,13 @@ package org.glassfish.resources.admin.cli; +import jakarta.inject.Inject; + import org.glassfish.api.I18n; import org.glassfish.hk2.api.IterableProvider; +import org.glassfish.hk2.api.PerLookup; import org.glassfish.resources.api.Resource; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; - -import jakarta.inject.Inject; /** * diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourceManager.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourceManager.java index 8b2dfa69cb9..2bb97771bce 100644 --- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourceManager.java +++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourceManager.java @@ -18,12 +18,13 @@ import com.sun.enterprise.config.serverbeans.Resource; import com.sun.enterprise.config.serverbeans.Resources; -import org.glassfish.resourcebase.resources.api.ResourceStatus; -import org.jvnet.hk2.annotations.Contract; import java.util.HashMap; import java.util.Properties; +import org.glassfish.resourcebase.resources.api.ResourceStatus; +import org.jvnet.hk2.annotations.Contract; + /** * Contract for all ResourceManagers * diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourcesManager.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourcesManager.java index 2c77b6c7a98..f2f7d7c8f6d 100644 --- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourcesManager.java +++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourcesManager.java @@ -17,15 +17,16 @@ package org.glassfish.resources.admin.cli; import com.sun.enterprise.config.serverbeans.Resources; -import org.glassfish.resources.api.Resource; -import org.glassfish.resourcebase.resources.api.ResourceStatus; +import java.io.File; import java.util.ArrayList; -import java.util.List; -import java.util.Iterator; import java.util.HashMap; +import java.util.Iterator; +import java.util.List; import java.util.Properties; -import java.io.File; + +import org.glassfish.resourcebase.resources.api.ResourceStatus; +import org.glassfish.resources.api.Resource; /** * This class serves as the API to creating new resources when an xml file diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourcesXMLParser.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourcesXMLParser.java index 570196aad50..21e0939eb65 100644 --- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourcesXMLParser.java +++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourcesXMLParser.java @@ -64,8 +64,91 @@ import org.xml.sax.SAXParseException; import org.xml.sax.ext.LexicalHandler; -import static org.glassfish.api.naming.SimpleJndiName.*; -import static org.glassfish.resources.admin.cli.ResourceConstants.*; +import static org.glassfish.api.naming.SimpleJndiName.JNDI_CTX_JAVA_APP; +import static org.glassfish.api.naming.SimpleJndiName.JNDI_CTX_JAVA_COMPONENT; +import static org.glassfish.api.naming.SimpleJndiName.JNDI_CTX_JAVA_GLOBAL; +import static org.glassfish.api.naming.SimpleJndiName.JNDI_CTX_JAVA_MODULE; +import static org.glassfish.resources.admin.cli.ResourceConstants.ADMIN_OBJECT_CLASS_NAME; +import static org.glassfish.resources.admin.cli.ResourceConstants.ALLOW_NON_COMPONENT_CALLERS; +import static org.glassfish.resources.admin.cli.ResourceConstants.ASSOCIATE_WITH_THREAD; +import static org.glassfish.resources.admin.cli.ResourceConstants.CONNECTION_CREATION_RETRY_ATTEMPTS; +import static org.glassfish.resources.admin.cli.ResourceConstants.CONNECTION_CREATION_RETRY_INTERVAL_IN_SECONDS; +import static org.glassfish.resources.admin.cli.ResourceConstants.CONNECTION_LEAK_RECLAIM; +import static org.glassfish.resources.admin.cli.ResourceConstants.CONNECTION_LEAK_TIMEOUT_IN_SECONDS; +import static org.glassfish.resources.admin.cli.ResourceConstants.CONNECTION_POOL_NAME; +import static org.glassfish.resources.admin.cli.ResourceConstants.CONNECTION_VALIDATION_METHOD; +import static org.glassfish.resources.admin.cli.ResourceConstants.CONNECTOR_CONNECTION_POOL_NAME; +import static org.glassfish.resources.admin.cli.ResourceConstants.CONN_DEF_NAME; +import static org.glassfish.resources.admin.cli.ResourceConstants.CONN_FAIL_ALL_CONNECTIONS; +import static org.glassfish.resources.admin.cli.ResourceConstants.CONN_IDLE_TIME_OUT; +import static org.glassfish.resources.admin.cli.ResourceConstants.CONN_MAX_POOL_SIZE; +import static org.glassfish.resources.admin.cli.ResourceConstants.CONN_POOL_RESIZE_QUANTITY; +import static org.glassfish.resources.admin.cli.ResourceConstants.CONN_STEADY_POOL_SIZE; +import static org.glassfish.resources.admin.cli.ResourceConstants.CONN_TRANSACTION_SUPPORT; +import static org.glassfish.resources.admin.cli.ResourceConstants.CUSTOM_VALIDATION; +import static org.glassfish.resources.admin.cli.ResourceConstants.DATASOURCE_CLASS; +import static org.glassfish.resources.admin.cli.ResourceConstants.DRIVER_CLASSNAME; +import static org.glassfish.resources.admin.cli.ResourceConstants.ENABLED; +import static org.glassfish.resources.admin.cli.ResourceConstants.FACTORY_CLASS; +import static org.glassfish.resources.admin.cli.ResourceConstants.FAIL_ALL_CONNECTIONS; +import static org.glassfish.resources.admin.cli.ResourceConstants.IDLE_TIME_OUT_IN_SECONDS; +import static org.glassfish.resources.admin.cli.ResourceConstants.INIT_SQL; +import static org.glassfish.resources.admin.cli.ResourceConstants.IS_CONNECTION_VALIDATION_REQUIRED; +import static org.glassfish.resources.admin.cli.ResourceConstants.IS_ISOLATION_LEVEL_GUARANTEED; +import static org.glassfish.resources.admin.cli.ResourceConstants.JDBC_RESOURCE_JNDI_NAME; +import static org.glassfish.resources.admin.cli.ResourceConstants.JNDI_LOOKUP; +import static org.glassfish.resources.admin.cli.ResourceConstants.JNDI_NAME; +import static org.glassfish.resources.admin.cli.ResourceConstants.LAZY_CONNECTION_ASSOCIATION; +import static org.glassfish.resources.admin.cli.ResourceConstants.LAZY_CONNECTION_ENLISTMENT; +import static org.glassfish.resources.admin.cli.ResourceConstants.MAIL_DEBUG; +import static org.glassfish.resources.admin.cli.ResourceConstants.MAIL_FROM_ADDRESS; +import static org.glassfish.resources.admin.cli.ResourceConstants.MAIL_HOST; +import static org.glassfish.resources.admin.cli.ResourceConstants.MAIL_STORE_PROTO; +import static org.glassfish.resources.admin.cli.ResourceConstants.MAIL_STORE_PROTO_CLASS; +import static org.glassfish.resources.admin.cli.ResourceConstants.MAIL_TRANS_PROTO; +import static org.glassfish.resources.admin.cli.ResourceConstants.MAIL_TRANS_PROTO_CLASS; +import static org.glassfish.resources.admin.cli.ResourceConstants.MAIL_USER; +import static org.glassfish.resources.admin.cli.ResourceConstants.MATCH_CONNECTIONS; +import static org.glassfish.resources.admin.cli.ResourceConstants.MAX_CONNECTION_USAGE_COUNT; +import static org.glassfish.resources.admin.cli.ResourceConstants.MAX_POOL_SIZE; +import static org.glassfish.resources.admin.cli.ResourceConstants.MAX_WAIT_TIME_IN_MILLIS; +import static org.glassfish.resources.admin.cli.ResourceConstants.NON_TRANSACTIONAL_CONNECTIONS; +import static org.glassfish.resources.admin.cli.ResourceConstants.PASSWORD; +import static org.glassfish.resources.admin.cli.ResourceConstants.PING; +import static org.glassfish.resources.admin.cli.ResourceConstants.POOLING; +import static org.glassfish.resources.admin.cli.ResourceConstants.POOL_NAME; +import static org.glassfish.resources.admin.cli.ResourceConstants.POOL_SIZE_QUANTITY; +import static org.glassfish.resources.admin.cli.ResourceConstants.RESOURCE_ADAPTER_CONFIG_NAME; +import static org.glassfish.resources.admin.cli.ResourceConstants.RESOURCE_TYPE; +import static org.glassfish.resources.admin.cli.ResourceConstants.RES_ADAPTER; +import static org.glassfish.resources.admin.cli.ResourceConstants.RES_ADAPTER_CONFIG; +import static org.glassfish.resources.admin.cli.ResourceConstants.RES_ADAPTER_NAME; +import static org.glassfish.resources.admin.cli.ResourceConstants.RES_TYPE; +import static org.glassfish.resources.admin.cli.ResourceConstants.SECURITY_MAP; +import static org.glassfish.resources.admin.cli.ResourceConstants.SECURITY_MAP_BACKEND_PRINCIPAL; +import static org.glassfish.resources.admin.cli.ResourceConstants.SECURITY_MAP_NAME; +import static org.glassfish.resources.admin.cli.ResourceConstants.SECURITY_MAP_PRINCIPAL; +import static org.glassfish.resources.admin.cli.ResourceConstants.SECURITY_MAP_USER_GROUP; +import static org.glassfish.resources.admin.cli.ResourceConstants.SQL_TRACE_LISTENERS; +import static org.glassfish.resources.admin.cli.ResourceConstants.STATEMENT_CACHE_SIZE; +import static org.glassfish.resources.admin.cli.ResourceConstants.STATEMENT_LEAK_RECLAIM; +import static org.glassfish.resources.admin.cli.ResourceConstants.STATEMENT_LEAK_TIMEOUT_IN_SECONDS; +import static org.glassfish.resources.admin.cli.ResourceConstants.STATEMENT_TIMEOUT_IN_SECONDS; +import static org.glassfish.resources.admin.cli.ResourceConstants.STEADY_POOL_SIZE; +import static org.glassfish.resources.admin.cli.ResourceConstants.THREAD_POOL_IDS; +import static org.glassfish.resources.admin.cli.ResourceConstants.TRANS_ISOLATION_LEVEL; +import static org.glassfish.resources.admin.cli.ResourceConstants.USER_NAME; +import static org.glassfish.resources.admin.cli.ResourceConstants.VALIDATE_ATMOST_ONCE_PERIOD_IN_SECONDS; +import static org.glassfish.resources.admin.cli.ResourceConstants.VALIDATION_TABLE_NAME; +import static org.glassfish.resources.admin.cli.ResourceConstants.WORK_SECURITY_MAP_EIS_GROUP; +import static org.glassfish.resources.admin.cli.ResourceConstants.WORK_SECURITY_MAP_EIS_PRINCIPAL; +import static org.glassfish.resources.admin.cli.ResourceConstants.WORK_SECURITY_MAP_GROUP_MAP; +import static org.glassfish.resources.admin.cli.ResourceConstants.WORK_SECURITY_MAP_MAPPED_GROUP; +import static org.glassfish.resources.admin.cli.ResourceConstants.WORK_SECURITY_MAP_MAPPED_PRINCIPAL; +import static org.glassfish.resources.admin.cli.ResourceConstants.WORK_SECURITY_MAP_NAME; +import static org.glassfish.resources.admin.cli.ResourceConstants.WORK_SECURITY_MAP_PRINCIPAL_MAP; +import static org.glassfish.resources.admin.cli.ResourceConstants.WORK_SECURITY_MAP_RA_NAME; +import static org.glassfish.resources.admin.cli.ResourceConstants.WRAP_JDBC_OBJECTS; //i18n import diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/SunResourcesXML.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/SunResourcesXML.java index 37ceb386f03..61d4f208dae 100644 --- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/SunResourcesXML.java +++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/SunResourcesXML.java @@ -16,10 +16,10 @@ package org.glassfish.resources.admin.cli; -import org.glassfish.resources.api.Resource; - import java.util.List; +import org.glassfish.resources.api.Resource; + /** * This class encapsulates the information of a sun-resources.xml * packaged inside an application. diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/ResourcesCompositeSniffer.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/ResourcesCompositeSniffer.java index 865052e8a1d..7689101d8cd 100644 --- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/ResourcesCompositeSniffer.java +++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/ResourcesCompositeSniffer.java @@ -16,6 +16,11 @@ package org.glassfish.resources.connector; +import jakarta.inject.Inject; + +import java.util.ArrayList; +import java.util.List; + import org.glassfish.api.deployment.archive.ArchiveType; import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.hk2.api.ServiceLocator; @@ -24,10 +29,6 @@ import org.glassfish.resources.util.ResourceUtil; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import java.util.ArrayList; -import java.util.List; - /** * Sniffer to detect glassfish-resources.xml(s) in composite archives diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/ResourcesSniffer.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/ResourcesSniffer.java index 48fe12ffde5..c291ae1927c 100644 --- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/ResourcesSniffer.java +++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/connector/ResourcesSniffer.java @@ -16,19 +16,19 @@ package org.glassfish.resources.connector; -import org.glassfish.api.deployment.archive.ReadableArchive; +import jakarta.inject.Inject; + +import java.util.ArrayList; +import java.util.List; + import org.glassfish.api.deployment.archive.ArchiveType; +import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.deployment.GenericSniffer; import org.glassfish.resourcebase.resources.api.ResourceConstants; import org.glassfish.resources.util.ResourceUtil; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; - -import java.util.ArrayList; -import java.util.List; - /** * Sniffer to detect glassfish-resources.xml in standalone archives * @author Jagadish Ramu diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/custom/factory/JavaBeanFactory.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/custom/factory/JavaBeanFactory.java index 16ed971ef58..17c97c312a1 100644 --- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/custom/factory/JavaBeanFactory.java +++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/custom/factory/JavaBeanFactory.java @@ -17,17 +17,22 @@ package org.glassfish.resources.custom.factory; -import javax.naming.spi.ObjectFactory; -import javax.naming.*; -import java.io.Serializable; -import java.util.Hashtable; -import java.util.Enumeration; import java.beans.BeanInfo; import java.beans.Introspector; import java.beans.PropertyDescriptor; +import java.io.Serializable; import java.lang.reflect.Method; +import java.util.Enumeration; +import java.util.Hashtable; import java.util.Locale; +import javax.naming.Context; +import javax.naming.Name; +import javax.naming.NamingException; +import javax.naming.RefAddr; +import javax.naming.Reference; +import javax.naming.spi.ObjectFactory; + public class JavaBeanFactory implements Serializable, ObjectFactory { diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/custom/factory/PrimitivesAndStringFactory.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/custom/factory/PrimitivesAndStringFactory.java index fa48f24d598..848fe442181 100644 --- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/custom/factory/PrimitivesAndStringFactory.java +++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/custom/factory/PrimitivesAndStringFactory.java @@ -17,16 +17,17 @@ package org.glassfish.resources.custom.factory; -import javax.naming.spi.ObjectFactory; -import javax.naming.Name; -import javax.naming.Context; -import javax.naming.Reference; -import javax.naming.RefAddr; import java.io.Serializable; -import java.util.Hashtable; import java.util.Enumeration; +import java.util.Hashtable; import java.util.Locale; +import javax.naming.Context; +import javax.naming.Name; +import javax.naming.RefAddr; +import javax.naming.Reference; +import javax.naming.spi.ObjectFactory; + public class PrimitivesAndStringFactory implements Serializable, ObjectFactory { public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable environment) throws Exception { diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/custom/factory/PropertiesFactory.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/custom/factory/PropertiesFactory.java index 758e8947fa9..249ebd91fd4 100644 --- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/custom/factory/PropertiesFactory.java +++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/custom/factory/PropertiesFactory.java @@ -16,10 +16,21 @@ package org.glassfish.resources.custom.factory; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.Serializable; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.Properties; + +import javax.naming.Context; +import javax.naming.Name; +import javax.naming.RefAddr; +import javax.naming.Reference; import javax.naming.spi.ObjectFactory; -import javax.naming.*; -import java.io.*; -import java.util.*; public class PropertiesFactory implements Serializable, ObjectFactory { diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/util/ResourceUtil.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/util/ResourceUtil.java index 825c0095adc..80cbdead74b 100644 --- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/util/ResourceUtil.java +++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/util/ResourceUtil.java @@ -18,13 +18,14 @@ package org.glassfish.resources.util; import com.sun.enterprise.deployment.util.DOLUtils; -import org.glassfish.api.deployment.archive.ReadableArchive; -import org.glassfish.deployment.common.DeploymentUtils; -import org.glassfish.hk2.api.ServiceLocator; import java.io.IOException; import java.util.Enumeration; +import org.glassfish.api.deployment.archive.ReadableArchive; +import org.glassfish.deployment.common.DeploymentUtils; +import org.glassfish.hk2.api.ServiceLocator; + /** * @author Jagadish Ramu */ diff --git a/appserver/resources/resources-connector/src/test/java/org/glassfish/resources/admin/cli/DeleteJndiResourceTest.java b/appserver/resources/resources-connector/src/test/java/org/glassfish/resources/admin/cli/DeleteJndiResourceTest.java index 72c79775dd6..60a97c5fdda 100644 --- a/appserver/resources/resources-connector/src/test/java/org/glassfish/resources/admin/cli/DeleteJndiResourceTest.java +++ b/appserver/resources/resources-connector/src/test/java/org/glassfish/resources/admin/cli/DeleteJndiResourceTest.java @@ -28,6 +28,8 @@ import com.sun.enterprise.v3.common.PropsFileActionReporter; import com.sun.logging.LogDomains; +import jakarta.inject.Inject; + import java.util.logging.Logger; import javax.security.auth.Subject; @@ -47,8 +49,6 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; - import static org.glassfish.api.ActionReport.ExitCode.FAILURE; import static org.glassfish.api.ActionReport.ExitCode.SUCCESS; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/appserver/resources/resources-connector/src/test/java/org/glassfish/resources/admin/cli/ListJndiResourcesTest.java b/appserver/resources/resources-connector/src/test/java/org/glassfish/resources/admin/cli/ListJndiResourcesTest.java index a995f54796a..e9d4b96bcec 100644 --- a/appserver/resources/resources-connector/src/test/java/org/glassfish/resources/admin/cli/ListJndiResourcesTest.java +++ b/appserver/resources/resources-connector/src/test/java/org/glassfish/resources/admin/cli/ListJndiResourcesTest.java @@ -23,6 +23,8 @@ import com.sun.enterprise.v3.common.PropsFileActionReporter; import com.sun.logging.LogDomains; +import jakarta.inject.Inject; + import java.util.ArrayList; import java.util.List; @@ -41,8 +43,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import jakarta.inject.Inject; - import static org.glassfish.api.ActionReport.ExitCode.SUCCESS; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/beans/CustomResource.java b/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/beans/CustomResource.java index 4db75a4db1a..1f6c2779aa4 100755 --- a/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/beans/CustomResource.java +++ b/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/beans/CustomResource.java @@ -16,9 +16,9 @@ package org.glassfish.resources.beans; +import org.glassfish.resourcebase.resources.api.ResourceInfo; import org.glassfish.resources.api.JavaEEResource; import org.glassfish.resources.api.JavaEEResourceBase; -import org.glassfish.resourcebase.resources.api.ResourceInfo; /** * Resource info for CustomResourcel. diff --git a/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/module/ResourcesApplication.java b/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/module/ResourcesApplication.java index 69f8afb5647..2e62a1e8fc3 100644 --- a/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/module/ResourcesApplication.java +++ b/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/module/ResourcesApplication.java @@ -16,19 +16,24 @@ package org.glassfish.resources.module; -import com.sun.enterprise.config.serverbeans.*; +import com.sun.enterprise.config.serverbeans.Applications; +import com.sun.enterprise.config.serverbeans.Resources; import com.sun.logging.LogDomains; -import java.util.logging.Level; -import org.glassfish.api.deployment.*; -import org.glassfish.internal.data.ApplicationRegistry; -import org.glassfish.resources.listener.ApplicationScopedResourcesManager; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; +import jakarta.inject.Inject; +import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.inject.Inject; +import org.glassfish.api.deployment.ApplicationContainer; +import org.glassfish.api.deployment.ApplicationContext; +import org.glassfish.api.deployment.DeployCommandParameters; +import org.glassfish.api.deployment.DeploymentContext; +import org.glassfish.api.deployment.OpsParams; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.internal.data.ApplicationRegistry; +import org.glassfish.resources.listener.ApplicationScopedResourcesManager; +import org.jvnet.hk2.annotations.Service; @Service @PerLookup diff --git a/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/module/ResourcesContainer.java b/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/module/ResourcesContainer.java index 39f3ca7e762..ad8347c2584 100644 --- a/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/module/ResourcesContainer.java +++ b/appserver/resources/resources-runtime/src/main/java/org/glassfish/resources/module/ResourcesContainer.java @@ -17,15 +17,16 @@ package org.glassfish.resources.module; import com.sun.logging.LogDomains; + +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.container.Container; import org.glassfish.api.deployment.Deployer; -import org.glassfish.resourcebase.resources.api.ResourceConstants; -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PostConstruct; import org.glassfish.hk2.api.PreDestroy; - -import java.util.logging.Level; -import java.util.logging.Logger; +import org.glassfish.resourcebase.resources.api.ResourceConstants; +import org.jvnet.hk2.annotations.Service; @Service(name = "org.glassfish.resources.module.ResourcesContainer") diff --git a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/ResourceTypeOrder.java b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/ResourceTypeOrder.java index 1dbe335fd14..79c813e37a9 100644 --- a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/ResourceTypeOrder.java +++ b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/ResourceTypeOrder.java @@ -16,7 +16,11 @@ package org.glassfish.resourcebase.resources; -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Created with IntelliJ IDEA. diff --git a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/ResourceTypeOrderProcessor.java b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/ResourceTypeOrderProcessor.java index c1c51010f10..4ef3721f914 100644 --- a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/ResourceTypeOrderProcessor.java +++ b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/ResourceTypeOrderProcessor.java @@ -23,6 +23,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Comparator; + import org.jvnet.hk2.annotations.Service; /** diff --git a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/admin/cli/ResourceUtil.java b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/admin/cli/ResourceUtil.java index 050e1056402..9ad7ebf4c5a 100644 --- a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/admin/cli/ResourceUtil.java +++ b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/admin/cli/ResourceUtil.java @@ -22,6 +22,7 @@ import com.sun.enterprise.config.serverbeans.ConfigBeansUtilities; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Server; + import jakarta.inject.Inject; import jakarta.inject.Provider; diff --git a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/api/ResourcesBinder.java b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/api/ResourcesBinder.java index d3e446455bf..803eba0909c 100644 --- a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/api/ResourcesBinder.java +++ b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/api/ResourcesBinder.java @@ -17,17 +17,20 @@ package org.glassfish.resourcebase.resources.api; import com.sun.enterprise.config.serverbeans.Resource; -import org.glassfish.api.naming.GlassfishNamingManager; -import org.jvnet.hk2.annotations.Service; import jakarta.inject.Inject; import jakarta.inject.Provider; -import javax.naming.NamingException; + import java.util.logging.Level; import java.util.logging.Logger; -import org.glassfish.resourcebase.resources.ResourceLoggingConstansts; -import org.glassfish.logging.annotation.LoggerInfo; + +import javax.naming.NamingException; + +import org.glassfish.api.naming.GlassfishNamingManager; import org.glassfish.logging.annotation.LogMessagesResourceBundle; +import org.glassfish.logging.annotation.LoggerInfo; +import org.glassfish.resourcebase.resources.ResourceLoggingConstansts; +import org.jvnet.hk2.annotations.Service; /** diff --git a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/util/ResourceManagerFactory.java b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/util/ResourceManagerFactory.java index a4a8d0e5a44..8a4be11cc18 100644 --- a/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/util/ResourceManagerFactory.java +++ b/nucleus/resources/src/main/java/org/glassfish/resourcebase/resources/util/ResourceManagerFactory.java @@ -17,6 +17,12 @@ package org.glassfish.resourcebase.resources.util; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + +import java.lang.reflect.Proxy; +import java.util.List; + import org.glassfish.hk2.api.ActiveDescriptor; import org.glassfish.hk2.api.ServiceHandle; import org.glassfish.hk2.api.ServiceLocator; @@ -24,11 +30,6 @@ import org.glassfish.resourcebase.resources.api.ResourceDeployerInfo; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import jakarta.inject.Singleton; -import java.lang.reflect.Proxy; -import java.util.List; - /** * @author Jagadish Ramu */ From 2130b39825c73f6e0eb8109729983d356d9ede9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 00:44:19 +0200 Subject: [PATCH 15/40] Imports: connector modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../admin/cli/ConnectorSecurityMap.java | 7 +- ...nnectorWorkSecurityMapResourceManager.java | 16 +++-- .../cli/CreateConnectorConnectionPool.java | 52 ++++++++++++--- .../admin/cli/CreateConnectorSecurityMap.java | 26 +++++--- .../cli/CreateConnectorWorkSecurityMap.java | 33 ++++++---- .../admin/cli/DeleteAdminObject.java | 1 + .../admin/cli/DeleteConnectorResource.java | 1 + .../admin/cli/DeleteConnectorSecurityMap.java | 20 +++--- .../cli/DeleteConnectorWorkSecurityMap.java | 18 ++--- .../admin/cli/ListAdminObjects.java | 18 +++-- .../cli/ListConnectorConnectionPools.java | 24 ++++--- .../admin/cli/ListConnectorResources.java | 16 +++-- .../admin/cli/ListConnectorSecurityMaps.java | 28 ++++---- .../cli/ListConnectorWorkSecurityMaps.java | 24 ++++--- .../admin/cli/ListResourceAdapterConfigs.java | 28 ++++---- .../connectors/admin/cli/ListResources.java | 30 ++++++--- .../admin/cli/PMFResourceManager.java | 12 ++-- .../admin/cli/UpdateConnectorSecurityMap.java | 22 +++---- .../cli/UpdateConnectorWorkSecurityMap.java | 22 ++++--- .../admin/cli/WorkSecurityMapHelper.java | 3 +- .../cli/internal/GetActivationSpecClass.java | 7 +- .../internal/GetAdminObjectClassNames.java | 16 ++--- .../internal/GetAdminObjectConfigProps.java | 18 ++--- .../GetAdminObjectInterfaceNames.java | 16 ++--- .../internal/GetBuiltInCustomResources.java | 16 ++--- .../GetConnectionDefinitionNames.java | 16 ++--- ...ectionDefinitionPropertiesAndDefaults.java | 16 ++--- .../internal/GetConnectorConfigJavaBeans.java | 16 ++--- .../cli/internal/GetMCFConfigProperties.java | 18 ++--- .../GetMessageListenerConfigProperties.java | 18 ++--- ...GetMessageListenerConfigPropertyTypes.java | 16 ++--- .../cli/internal/GetMessageListenerTypes.java | 16 ++--- .../GetResourceAdapterConfigProperties.java | 18 ++--- .../GetSystemRarsAllowingPoolCreation.java | 16 ++--- .../admin/cli/CreateCustomResourceTest.java | 4 +- .../admin/cli/DeleteCustomResourceTest.java | 4 +- .../admin/cli/ListCustomResourcesTest.java | 4 +- .../admin/cli/test/GlassFishTestDocument.java | 9 +-- .../inbound/ActiveInboundResourceAdapter.java | 2 +- .../ActiveInboundResourceAdapterImpl.java | 16 ++--- .../ConnectorMessageBeanClientFactory.java | 9 +-- .../inbound/InboundRecoveryHandler.java | 29 ++++---- .../MessageEndpointInvocationHandler.java | 4 +- .../api/ConnectorClassLoaderServiceImpl.java | 18 ++--- .../internal/api/ConnectorRuntime.java | 24 +++---- .../internal/api/TransactedPoolManager.java | 4 +- .../internal/api/WorkManagerFactory.java | 4 +- .../validation/DerbyConnectionValidation.java | 3 +- .../JDBC40ConnectionValidation.java | 3 +- .../OracleConnectionValidation.java | 3 +- .../PostgresConnectionValidation.java | 3 +- .../config/AdminObjectResource.java | 4 +- .../connectors/config/BackendPrincipal.java | 9 +-- .../config/ConnectorConnectionPool.java | 2 +- .../connectors/config/ConnectorResource.java | 2 +- .../connectors/config/ConnectorService.java | 14 ++-- .../glassfish/connectors/config/GroupMap.java | 2 +- .../validators/ConnectionPoolConstraint.java | 12 ++-- .../validators/ConnectionPoolConstraints.java | 1 + .../validators/ConnectionPoolValidator.java | 3 +- .../config/AllModelsImplementingTest.java | 4 +- .../connectors/config/PasswordAliasTest.java | 4 +- .../connectors/ActiveRAFactory.java | 16 ++--- .../connectors/ActiveResourceAdapter.java | 4 +- .../connectors/ConnectionManagerFactory.java | 10 +-- .../ConnectionPoolMonitoringExtension.java | 6 +- .../connectors/ConnectorDescriptorInfo.java | 6 +- .../connectors/ConnectorRegistry.java | 18 ++--- .../connectors/DeferredResourceConfig.java | 6 +- ...LazyAssociatableConnectionManagerImpl.java | 6 +- .../LazyEnlistableConnectionManagerImpl.java | 6 +- .../enterprise/connectors/PoolMetaData.java | 8 +-- .../connectors/XATerminatorProxy.java | 4 +- .../authentication/AuthenticationService.java | 4 +- .../BasicPasswordAuthenticationService.java | 26 ++++---- .../authentication/RuntimeSecurityMap.java | 4 +- .../handlers/ActivationHandler.java | 14 ++-- .../handlers/ConnectionDefinitionHandler.java | 14 ++-- .../ConnectionDefinitionsHandler.java | 12 +++- .../handlers/SecurityPermissionHandler.java | 10 ++- .../module/ConnectorApplication.java | 16 ++--- .../connectors/module/ConnectorContainer.java | 6 +- .../connectors/module/ConnectorDeployer.java | 56 ++++++++-------- .../ConnectorResourceNamingEventNotifier.java | 4 +- .../ConnectorAdminObjectAdminServiceImpl.java | 8 +-- ...nnectorConfigurationParserServiceImpl.java | 16 ++--- .../ConnectorResourceAdminServiceImpl.java | 18 ++--- .../ConnectorSecurityAdminServiceImpl.java | 8 +-- .../util/AdminObjectConfigParser.java | 4 +- .../util/AdminObjectConfigParserImpl.java | 14 ++-- .../util/ConnectionDefinitionUtils.java | 8 +-- .../util/ConnectionPoolObjectsUtils.java | 30 ++++----- .../util/ConnectionPoolReconfigHelper.java | 8 +-- .../connectors/util/ConnectorClassLoader.java | 6 +- .../util/ConnectorConfigParser.java | 6 +- .../util/ConnectorConfigParserUtils.java | 16 ++--- .../util/ConnectorDDTransformUtils.java | 28 ++++---- .../util/ConnectorJavaBeanValidator.java | 14 ++-- .../connectors/util/ConnectorTimerProxy.java | 6 +- .../connectors/util/DriverLoader.java | 10 +-- .../connectors/util/JarResourceExtractor.java | 4 +- .../connectors/util/MCFConfigParserImpl.java | 14 ++-- .../util/MessageListenerConfigParser.java | 4 +- .../util/MessageListenerConfigParserImpl.java | 12 ++-- .../connectors/util/PrintWriterAdapter.java | 4 +- .../util/ResourceAdapterConfigParserImpl.java | 8 +-- .../connectors/util/SecurityMapUtils.java | 10 +-- .../resource/ConnectorXAResource.java | 22 +++---- .../resource/XAResourceWrapper.java | 4 +- .../resource/allocator/ResourceAllocator.java | 4 +- .../beans/AdministeredObjectResource.java | 26 ++++---- .../deployer/AdminObjectResourceDeployer.java | 16 ++--- .../ConnectionFactoryDefinitionDeployer.java | 1 + .../ConnectorWorkSecurityMapDeployer.java | 4 +- .../JMSDestinationDefinitionDeployer.java | 16 ++--- .../LocalTxConnectionEventListener.java | 6 +- .../UnpooledConnectionEventListener.java | 4 +- .../naming/DynamicResourceReconfigurator.java | 6 +- .../resource/pool/AbstractPoolManager.java | 4 +- .../pool/AssocWithThreadResourcePool.java | 8 +-- .../resource/pool/ConnectionLeakDetector.java | 8 +-- .../pool/PoolLifeCycleListenerRegistry.java | 6 +- .../resource/pool/PoolLifeCycleRegistry.java | 10 +-- .../resource/pool/PoolManagerImpl.java | 42 ++++++------ .../resource/pool/PoolTxHelper.java | 18 ++--- .../resource/pool/ResourceGateway.java | 6 +- .../resource/pool/ResourceHandler.java | 4 +- .../resource/pool/ResourcePool.java | 4 +- .../pool/ResourcePoolFactoryImpl.java | 10 +-- .../datastructure/DataStructureFactory.java | 10 +-- .../ConnectionPoolProbeProviderUtil.java | 10 +-- .../monitor/PoolMonitoringLevelListener.java | 20 +++--- .../resizer/AssocWithThreadPoolResizer.java | 12 ++-- .../resource/pool/resizer/Resizer.java | 22 +++---- .../pool/waitqueue/DefaultPoolWaitQueue.java | 4 +- .../pool/waitqueue/PoolWaitQueueFactory.java | 10 +-- .../ThirdPartyRecoveryResourceHandler.java | 12 ++-- .../rm/LazyEnlistableResourceManagerImpl.java | 18 ++--- .../resource/rm/NoTxResourceManagerImpl.java | 4 +- .../resource/rm/ResourceManagerImpl.java | 22 +++---- .../rm/SystemResourceManagerImpl.java | 12 ++-- .../LocalTxConnectionEventListenerTest.java | 22 +++---- .../resource/pool/ConnectionPoolTest.java | 66 +++++++++---------- .../RWLockDataStructureTest.java | 2 +- .../connectors/work/CommonWorkManager.java | 22 ++++--- .../enterprise/connectors/work/LogFacade.java | 3 +- .../enterprise/connectors/work/OneWork.java | 4 +- .../connectors/work/WorkCoordinator.java | 16 +++-- .../work/WorkManagerFactoryImpl.java | 12 ++-- .../connectors/work/WorkManagerProxy.java | 12 +++- .../context/ConnectorCallbackHandler.java | 22 +++---- .../work/context/WorkContextHandlerImpl.java | 6 +- .../monitor/WorkManagementProbeProvider.java | 2 +- .../monitor/WorkManagementStatsProvider.java | 16 ++--- 154 files changed, 1050 insertions(+), 876 deletions(-) diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ConnectorSecurityMap.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ConnectorSecurityMap.java index 904115dd6fd..b51892a2f8c 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ConnectorSecurityMap.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ConnectorSecurityMap.java @@ -16,15 +16,14 @@ package org.glassfish.connectors.admin.cli; +import java.util.Collection; +import java.util.List; + import org.glassfish.api.I18n; import org.glassfish.connectors.config.ConnectorConnectionPool; import org.glassfish.connectors.config.SecurityMap; - import org.glassfish.hk2.api.PerLookup; -import java.util.Collection; -import java.util.List; - /** * Create Connector SecurityMap command */ diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ConnectorWorkSecurityMapResourceManager.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ConnectorWorkSecurityMapResourceManager.java index f46122f5e03..30ce8322e7c 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ConnectorWorkSecurityMapResourceManager.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ConnectorWorkSecurityMapResourceManager.java @@ -20,24 +20,26 @@ import com.sun.enterprise.config.serverbeans.Resource; import com.sun.enterprise.config.serverbeans.Resources; import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.resource.ResourceException; + +import java.beans.PropertyVetoException; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + import org.glassfish.api.I18n; import org.glassfish.connectors.config.GroupMap; import org.glassfish.connectors.config.PrincipalMap; import org.glassfish.connectors.config.WorkSecurityMap; +import org.glassfish.resourcebase.resources.api.ResourceStatus; import org.glassfish.resources.admin.cli.ResourceConstants; import org.glassfish.resources.admin.cli.ResourceManager; -import org.glassfish.resourcebase.resources.api.ResourceStatus; import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.resource.ResourceException; -import java.beans.PropertyVetoException; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - @Service(name = ResourceConstants.WORK_SECURITY_MAP) @I18n("add.resources") diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorConnectionPool.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorConnectionPool.java index f3a79e96bc4..3c40f1d969c 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorConnectionPool.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorConnectionPool.java @@ -20,24 +20,56 @@ import com.sun.enterprise.config.serverbeans.ServerTags; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.api.ActionReport; -import org.glassfish.api.I18n; -import org.glassfish.api.Param; -import org.glassfish.api.admin.*; -import org.glassfish.hk2.api.PerLookup; -import org.glassfish.resourcebase.resources.api.ResourceStatus; -import org.glassfish.resources.admin.cli.ResourceConstants; -import org.jvnet.hk2.annotations.Service; import jakarta.inject.Inject; import jakarta.inject.Provider; + import java.util.HashMap; import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; -import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.*; -import static org.glassfish.connectors.admin.cli.CLIConstants.*; +import org.glassfish.api.ActionReport; +import org.glassfish.api.I18n; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandRunner; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.resourcebase.resources.api.ResourceStatus; +import org.glassfish.resources.admin.cli.ResourceConstants; +import org.jvnet.hk2.annotations.Service; + +import static org.glassfish.connectors.admin.cli.CLIConstants.DESCRIPTION; +import static org.glassfish.connectors.admin.cli.CLIConstants.PROPERTY; +import static org.glassfish.connectors.admin.cli.CLIConstants.TARGET; +import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_ASSOC_WITH_THREAD; +import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_CON_CREATION_RETRY_ATTEMPTS; +import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_CON_CREATION_RETRY_INTERVAL; +import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_CON_DEFN_NAME; +import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_CREATE_COMMAND_NAME; +import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_FAIL_ALL_CONNS; +import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_IDLE_TIMEOUT; +import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_IS_VALIDATION_REQUIRED; +import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_LAZY_CON_ASSOC; +import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_LAZY_CON_ENLISTMENT; +import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_LEAK_RECLAIM; +import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_LEAK_TIMEOUT; +import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_MATCH_CONNECTIONS; +import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_MAX_CON_USAGE_COUNT; +import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_MAX_POOL_SIZE; +import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_MAX_WAIT_TIME; +import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_PING; +import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_POOLING; +import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_POOL_NAME; +import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_POOL_RESIZE_QTY; +import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_RA_NAME; +import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_STEADY_POOL_SIZE; +import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_TXN_SUPPORT; +import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_VALIDATE_ATMOST_PERIOD; /** * Create Connector Connection Pool Command diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorSecurityMap.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorSecurityMap.java index d12d96ecf3a..f1f8927eed8 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorSecurityMap.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorSecurityMap.java @@ -19,29 +19,35 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + +import java.beans.PropertyVetoException; +import java.util.Collection; +import java.util.List; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.RuntimeType; -import org.glassfish.connectors.config.ConnectorConnectionPool; import org.glassfish.connectors.config.BackendPrincipal; +import org.glassfish.connectors.config.ConnectorConnectionPool; import org.glassfish.connectors.config.SecurityMap; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import java.beans.PropertyVetoException; -import java.util.Collection; -import java.util.List; - -import jakarta.inject.Inject; - -import static org.glassfish.connectors.admin.cli.CLIConstants.SM.*; +import static org.glassfish.connectors.admin.cli.CLIConstants.SM.SM_CREATE_COMMAND_NAME; +import static org.glassfish.connectors.admin.cli.CLIConstants.SM.SM_MAPPED_NAME; +import static org.glassfish.connectors.admin.cli.CLIConstants.SM.SM_MAPPED_PASSWORD; +import static org.glassfish.connectors.admin.cli.CLIConstants.SM.SM_MAP_NAME; +import static org.glassfish.connectors.admin.cli.CLIConstants.SM.SM_POOL_NAME; +import static org.glassfish.connectors.admin.cli.CLIConstants.SM.SM_PRINCIPALS; +import static org.glassfish.connectors.admin.cli.CLIConstants.SM.SM_USER_GROUPS; /** * Create Connector SecurityMap command diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorWorkSecurityMap.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorWorkSecurityMap.java index d3ad6bf423d..739e62db89b 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorWorkSecurityMap.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorWorkSecurityMap.java @@ -17,8 +17,22 @@ package org.glassfish.connectors.admin.cli; import com.sun.appserv.connectors.internal.api.ConnectorsUtil; -import com.sun.enterprise.config.serverbeans.*; +import com.sun.enterprise.config.serverbeans.Application; +import com.sun.enterprise.config.serverbeans.Applications; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Module; +import com.sun.enterprise.config.serverbeans.Resource; +import com.sun.enterprise.config.serverbeans.Resources; import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + +import java.beans.PropertyVetoException; +import java.util.Map; +import java.util.Properties; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -29,24 +43,17 @@ import org.glassfish.connectors.config.GroupMap; import org.glassfish.connectors.config.PrincipalMap; import org.glassfish.connectors.config.WorkSecurityMap; -import com.sun.enterprise.config.serverbeans.Module; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import java.beans.PropertyVetoException; -import java.util.Map; -import java.util.Properties; -import java.util.logging.Level; -import java.util.logging.Logger; - -import jakarta.inject.Inject; - import static org.glassfish.connectors.admin.cli.CLIConstants.DESCRIPTION; -import static org.glassfish.connectors.admin.cli.CLIConstants.WSM.*; +import static org.glassfish.connectors.admin.cli.CLIConstants.WSM.WSM_GROUPS_MAP; +import static org.glassfish.connectors.admin.cli.CLIConstants.WSM.WSM_MAP_NAME; +import static org.glassfish.connectors.admin.cli.CLIConstants.WSM.WSM_PRINCIPALS_MAP; +import static org.glassfish.connectors.admin.cli.CLIConstants.WSM.WSM_RA_NAME; /** * Create Connector Work Security Map diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteAdminObject.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteAdminObject.java index c72ce8d589b..74f339fbf99 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteAdminObject.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteAdminObject.java @@ -21,6 +21,7 @@ import com.sun.enterprise.config.serverbeans.Resource; import com.sun.enterprise.config.serverbeans.Resources; import com.sun.enterprise.util.LocalStringManagerImpl; + import jakarta.inject.Inject; import java.lang.System.Logger; diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorResource.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorResource.java index c6861d2ee4b..7dbee9eb348 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorResource.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorResource.java @@ -21,6 +21,7 @@ import com.sun.enterprise.config.serverbeans.Resource; import com.sun.enterprise.config.serverbeans.Resources; import com.sun.enterprise.util.LocalStringManagerImpl; + import jakarta.inject.Inject; import java.lang.System.Logger; diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorSecurityMap.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorSecurityMap.java index ee61534f8bd..f2927e0f6f0 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorSecurityMap.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorSecurityMap.java @@ -19,6 +19,15 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + +import java.beans.PropertyVetoException; +import java.util.Collection; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -28,21 +37,12 @@ import org.glassfish.api.admin.RuntimeType; import org.glassfish.connectors.config.ConnectorConnectionPool; import org.glassfish.connectors.config.SecurityMap; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import java.beans.PropertyVetoException; -import java.util.Collection; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import jakarta.inject.Inject; - /** * Delete Connector Work Security Map * diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorWorkSecurityMap.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorWorkSecurityMap.java index c398be37bbe..eb63689c377 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorWorkSecurityMap.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/DeleteConnectorWorkSecurityMap.java @@ -20,6 +20,14 @@ import com.sun.enterprise.config.serverbeans.Resource; import com.sun.enterprise.config.serverbeans.Resources; import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + +import java.beans.PropertyVetoException; +import java.util.Collection; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -28,20 +36,12 @@ import org.glassfish.api.admin.ExecuteOn; import org.glassfish.api.admin.RuntimeType; import org.glassfish.connectors.config.WorkSecurityMap; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import java.beans.PropertyVetoException; -import java.util.Collection; -import java.util.logging.Level; -import java.util.logging.Logger; - -import jakarta.inject.Inject; - /** * Delete Connector Work Security Map * diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListAdminObjects.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListAdminObjects.java index 8b08a483a56..038d6b76924 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListAdminObjects.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListAdminObjects.java @@ -20,10 +20,22 @@ import com.sun.enterprise.config.serverbeans.Resources; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + +import java.util.ArrayList; +import java.util.Collection; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; import org.glassfish.connectors.config.AdminObjectResource; @@ -31,10 +43,6 @@ import org.glassfish.resourcebase.resources.util.BindableResourcesHelper; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import java.util.ArrayList; -import java.util.Collection; - /** * List Admin Objects command * diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorConnectionPools.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorConnectionPools.java index deb79bf4abf..f544841821a 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorConnectionPools.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorConnectionPools.java @@ -19,22 +19,28 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Resources; import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + +import java.util.Collection; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; import org.glassfish.connectors.config.ConnectorConnectionPool; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; - -import java.util.Collection; -import java.util.logging.Level; -import java.util.logging.Logger; - -import jakarta.inject.Inject; +import org.jvnet.hk2.annotations.Service; /** * List Connector Connection Pools command diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorResources.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorResources.java index 0567bc45f4a..291715a6a39 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorResources.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorResources.java @@ -20,19 +20,27 @@ import com.sun.enterprise.config.serverbeans.Resources; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + +import java.util.Collection; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; import org.glassfish.connectors.config.ConnectorResource; import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import java.util.Collection; - /** * List Connector Resources command * diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorSecurityMaps.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorSecurityMaps.java index 7dcfc367ab4..02a7d6b91d2 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorSecurityMaps.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorSecurityMaps.java @@ -20,26 +20,32 @@ import com.sun.enterprise.config.serverbeans.SecurityService; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + +import java.util.Collection; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; import org.glassfish.connectors.config.BackendPrincipal; -import org.glassfish.connectors.config.SecurityMap; import org.glassfish.connectors.config.ConnectorConnectionPool; - -import org.jvnet.hk2.annotations.Service; +import org.glassfish.connectors.config.SecurityMap; import org.glassfish.hk2.api.PerLookup; - -import java.util.Collection; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import jakarta.inject.Inject; import org.glassfish.internal.api.RelativePathResolver; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigBean; /** diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorWorkSecurityMaps.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorWorkSecurityMaps.java index cd9bec65e6c..6e26049615b 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorWorkSecurityMaps.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListConnectorWorkSecurityMaps.java @@ -20,23 +20,27 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.SecurityService; import com.sun.enterprise.util.LocalStringManagerImpl; -import org.glassfish.api.ActionReport; -import org.glassfish.api.I18n; -import org.glassfish.api.Param; -import org.glassfish.connectors.config.WorkSecurityMap; -import org.glassfish.connectors.config.PrincipalMap; -import org.glassfish.connectors.config.GroupMap; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; +import jakarta.inject.Inject; import java.util.Collection; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import org.glassfish.api.admin.*; -import jakarta.inject.Inject; +import org.glassfish.api.ActionReport; +import org.glassfish.api.I18n; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.connectors.config.GroupMap; +import org.glassfish.connectors.config.PrincipalMap; +import org.glassfish.connectors.config.WorkSecurityMap; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * List Connector Work Security Maps diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListResourceAdapterConfigs.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListResourceAdapterConfigs.java index fbb22f9ec9f..8cdcada85f1 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListResourceAdapterConfigs.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListResourceAdapterConfigs.java @@ -20,17 +20,8 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Resources; import com.sun.enterprise.util.LocalStringManagerImpl; -import org.glassfish.api.ActionReport; -import org.glassfish.api.I18n; -import org.glassfish.api.Param; -import org.glassfish.api.admin.*; -import org.glassfish.config.support.CommandTarget; -import org.glassfish.config.support.TargetType; -import org.glassfish.connectors.config.ResourceAdapterConfig; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; -import org.jvnet.hk2.config.types.Property; +import jakarta.inject.Inject; import java.util.Collection; import java.util.HashMap; @@ -39,7 +30,22 @@ import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.inject.Inject; +import org.glassfish.api.ActionReport; +import org.glassfish.api.I18n; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.config.support.CommandTarget; +import org.glassfish.config.support.TargetType; +import org.glassfish.connectors.config.ResourceAdapterConfig; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.types.Property; /** * List Resource Adapter Configs command diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListResources.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListResources.java index 2cab584703a..714db471e20 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListResources.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ListResources.java @@ -16,23 +16,35 @@ package org.glassfish.connectors.admin.cli; -import com.sun.enterprise.config.serverbeans.*; +import com.sun.enterprise.config.serverbeans.Application; +import com.sun.enterprise.config.serverbeans.Applications; +import com.sun.enterprise.config.serverbeans.BindableResource; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Module; +import com.sun.enterprise.config.serverbeans.Resource; +import com.sun.enterprise.config.serverbeans.ResourcePool; +import com.sun.enterprise.config.serverbeans.Resources; + +import jakarta.inject.Inject; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.glassfish.api.ActionReport; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; import org.glassfish.connectors.config.ConnectorConnectionPool; import org.glassfish.connectors.config.ResourceAdapterConfig; import org.glassfish.connectors.config.WorkSecurityMap; import org.glassfish.hk2.api.PerLookup; import org.glassfish.jdbc.config.JdbcConnectionPool; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.Module; - -import jakarta.inject.Inject; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; @Service(name="_list-resources") @PerLookup diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/PMFResourceManager.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/PMFResourceManager.java index 1cfac059b50..577f3d44b48 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/PMFResourceManager.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/PMFResourceManager.java @@ -20,17 +20,19 @@ import com.sun.enterprise.config.serverbeans.Resources; import com.sun.enterprise.config.serverbeans.ServerTags; import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.resource.ResourceException; + +import java.util.HashMap; +import java.util.Properties; + import org.glassfish.api.I18n; import org.glassfish.hk2.api.PerLookup; +import org.glassfish.resourcebase.resources.api.ResourceStatus; import org.glassfish.resources.admin.cli.ResourceConstants; import org.glassfish.resources.admin.cli.ResourceManager; -import org.glassfish.resourcebase.resources.api.ResourceStatus; import org.jvnet.hk2.annotations.Service; -import jakarta.resource.ResourceException; -import java.util.HashMap; -import java.util.Properties; - /** * PMF Resource is removed from v3.
      * Keeping a ResourceManager so as to provide warning message when diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/UpdateConnectorSecurityMap.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/UpdateConnectorSecurityMap.java index ec2bf05f907..e6baf7de4cb 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/UpdateConnectorSecurityMap.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/UpdateConnectorSecurityMap.java @@ -21,31 +21,31 @@ import com.sun.enterprise.config.serverbeans.Resources; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + +import java.beans.PropertyVetoException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; import org.glassfish.connectors.config.BackendPrincipal; import org.glassfish.connectors.config.ConnectorConnectionPool; import org.glassfish.connectors.config.SecurityMap; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.ConfigCode; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.TransactionFailure; -import java.beans.PropertyVetoException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import org.glassfish.api.admin.RestEndpoint; -import org.glassfish.api.admin.RestEndpoints; - -import jakarta.inject.Inject; - /** * Update Connector SecurityMap command */ diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/UpdateConnectorWorkSecurityMap.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/UpdateConnectorWorkSecurityMap.java index 9b7d064cb3f..fa05772a1d4 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/UpdateConnectorWorkSecurityMap.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/UpdateConnectorWorkSecurityMap.java @@ -18,27 +18,33 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + +import java.beans.PropertyVetoException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; import org.glassfish.connectors.config.GroupMap; import org.glassfish.connectors.config.PrincipalMap; import org.glassfish.connectors.config.WorkSecurityMap; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import java.beans.PropertyVetoException; -import java.util.*; -import org.glassfish.api.admin.*; - -import jakarta.inject.Inject; - /** * Update Connector Work Security Map command */ diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/WorkSecurityMapHelper.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/WorkSecurityMapHelper.java index 783efa2be21..d6325760e77 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/WorkSecurityMapHelper.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/WorkSecurityMapHelper.java @@ -19,10 +19,11 @@ import com.sun.appserv.connectors.internal.api.ConnectorsUtil; import com.sun.enterprise.config.serverbeans.Resource; import com.sun.enterprise.config.serverbeans.Resources; -import org.glassfish.connectors.config.WorkSecurityMap; import java.util.List; +import org.glassfish.connectors.config.WorkSecurityMap; + public class WorkSecurityMapHelper { static boolean doesResourceAdapterNameExist(String raName, Resources resources) { //check if the resource adapter exists.If it does not then throw an exception. diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetActivationSpecClass.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetActivationSpecClass.java index 6d9ada8b833..4a9aff4f061 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetActivationSpecClass.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetActivationSpecClass.java @@ -18,6 +18,9 @@ import com.sun.appserv.connectors.internal.api.ConnectorRuntime; import com.sun.enterprise.config.serverbeans.Resources; + +import jakarta.inject.Inject; + import org.glassfish.api.ActionReport; import org.glassfish.api.Param; import org.glassfish.api.admin.AdminCommand; @@ -25,10 +28,8 @@ import org.glassfish.api.admin.CommandLock; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; - -import jakarta.inject.Inject; +import org.jvnet.hk2.annotations.Service; /** * @author Jagadish Ramu diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetAdminObjectClassNames.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetAdminObjectClassNames.java index 708b7f146bd..7f86e46935a 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetAdminObjectClassNames.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetAdminObjectClassNames.java @@ -18,22 +18,22 @@ import com.sun.appserv.connectors.internal.api.ConnectorRuntime; import com.sun.enterprise.config.serverbeans.Resources; + +import jakarta.inject.Inject; + +import java.util.Arrays; +import java.util.Properties; + import org.glassfish.api.ActionReport; import org.glassfish.api.Param; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandLock; - -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; - -import java.util.Arrays; -import java.util.Properties; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.RestParam; - -import jakarta.inject.Inject; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * @author Jagadish Ramu diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetAdminObjectConfigProps.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetAdminObjectConfigProps.java index 13fc3105101..56afbeb35d8 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetAdminObjectConfigProps.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetAdminObjectConfigProps.java @@ -20,22 +20,22 @@ import com.sun.appserv.connectors.internal.api.ConnectorConstants; import com.sun.appserv.connectors.internal.api.ConnectorRuntime; import com.sun.enterprise.config.serverbeans.Resources; -import org.glassfish.api.ActionReport; -import org.glassfish.api.Param; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.admin.CommandLock; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; import java.util.Properties; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; - -import jakarta.inject.Inject; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * @author Jagadish Ramu diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetAdminObjectInterfaceNames.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetAdminObjectInterfaceNames.java index 19d11f3e601..aca1e7e370d 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetAdminObjectInterfaceNames.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetAdminObjectInterfaceNames.java @@ -18,21 +18,21 @@ import com.sun.appserv.connectors.internal.api.ConnectorRuntime; import com.sun.enterprise.config.serverbeans.Resources; + +import jakarta.inject.Inject; + +import java.util.Arrays; +import java.util.Properties; + import org.glassfish.api.ActionReport; import org.glassfish.api.Param; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandLock; - -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; - -import java.util.Arrays; -import java.util.Properties; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; - -import jakarta.inject.Inject; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * @author Jagadish Ramu diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetBuiltInCustomResources.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetBuiltInCustomResources.java index c0003c3a86f..16eff0f7738 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetBuiltInCustomResources.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetBuiltInCustomResources.java @@ -18,20 +18,20 @@ import com.sun.appserv.connectors.internal.api.ConnectorRuntime; import com.sun.enterprise.config.serverbeans.Resources; -import org.glassfish.api.ActionReport; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.admin.CommandLock; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; +import jakarta.inject.Inject; import java.util.Map; import java.util.Properties; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; - -import jakarta.inject.Inject; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * @author Jagadish Ramu diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetConnectionDefinitionNames.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetConnectionDefinitionNames.java index dbb721389de..06cf38528c2 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetConnectionDefinitionNames.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetConnectionDefinitionNames.java @@ -18,21 +18,21 @@ import com.sun.appserv.connectors.internal.api.ConnectorRuntime; import com.sun.enterprise.config.serverbeans.Resources; + +import jakarta.inject.Inject; + +import java.util.Arrays; +import java.util.Properties; + import org.glassfish.api.ActionReport; import org.glassfish.api.Param; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandLock; - -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; - -import java.util.Arrays; -import java.util.Properties; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; - -import jakarta.inject.Inject; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * @author Jagadish Ramu diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetConnectionDefinitionPropertiesAndDefaults.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetConnectionDefinitionPropertiesAndDefaults.java index 6ccc95c65b2..36792101c0d 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetConnectionDefinitionPropertiesAndDefaults.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetConnectionDefinitionPropertiesAndDefaults.java @@ -18,21 +18,21 @@ import com.sun.appserv.connectors.internal.api.ConnectorRuntime; import com.sun.enterprise.config.serverbeans.Resources; + +import jakarta.inject.Inject; + +import java.util.Map; +import java.util.Properties; + import org.glassfish.api.ActionReport; import org.glassfish.api.Param; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandLock; - -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; - -import java.util.Map; -import java.util.Properties; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; - -import jakarta.inject.Inject; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * @author Jagadish Ramu diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetConnectorConfigJavaBeans.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetConnectorConfigJavaBeans.java index 5047531a3b3..fe3ed9930d8 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetConnectorConfigJavaBeans.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetConnectorConfigJavaBeans.java @@ -18,21 +18,21 @@ import com.sun.appserv.connectors.internal.api.ConnectorRuntime; import com.sun.enterprise.config.serverbeans.Resources; + +import jakarta.inject.Inject; + +import java.util.Map; +import java.util.Properties; + import org.glassfish.api.ActionReport; import org.glassfish.api.Param; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandLock; - -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; - -import java.util.Map; -import java.util.Properties; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; - -import jakarta.inject.Inject; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * @author Jagadish Ramu diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMCFConfigProperties.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMCFConfigProperties.java index a5f2fe4c7da..a54ecb9acd3 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMCFConfigProperties.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMCFConfigProperties.java @@ -19,22 +19,22 @@ import com.sun.appserv.connectors.internal.api.ConnectorConstants; import com.sun.appserv.connectors.internal.api.ConnectorRuntime; import com.sun.enterprise.config.serverbeans.Resources; -import org.glassfish.api.ActionReport; -import org.glassfish.api.Param; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.admin.CommandLock; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; import java.util.Properties; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; - -import jakarta.inject.Inject; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * @author Jagadish Ramu diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMessageListenerConfigProperties.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMessageListenerConfigProperties.java index 7b87809da2d..3f9485ec711 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMessageListenerConfigProperties.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMessageListenerConfigProperties.java @@ -19,22 +19,22 @@ import com.sun.appserv.connectors.internal.api.ConnectorConstants; import com.sun.appserv.connectors.internal.api.ConnectorRuntime; import com.sun.enterprise.config.serverbeans.Resources; -import org.glassfish.api.ActionReport; -import org.glassfish.api.Param; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.admin.CommandLock; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; import java.util.Properties; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; - -import jakarta.inject.Inject; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * @author Jagadish Ramu diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMessageListenerConfigPropertyTypes.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMessageListenerConfigPropertyTypes.java index 585aded5301..eb94d79ab21 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMessageListenerConfigPropertyTypes.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMessageListenerConfigPropertyTypes.java @@ -18,21 +18,21 @@ import com.sun.appserv.connectors.internal.api.ConnectorRuntime; import com.sun.enterprise.config.serverbeans.Resources; + +import jakarta.inject.Inject; + +import java.util.Map; +import java.util.Properties; + import org.glassfish.api.ActionReport; import org.glassfish.api.Param; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandLock; - -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; - -import java.util.Map; -import java.util.Properties; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; - -import jakarta.inject.Inject; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * @author Jagadish Ramu diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMessageListenerTypes.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMessageListenerTypes.java index 0fe4b2d5e30..86736fdfb46 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMessageListenerTypes.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetMessageListenerTypes.java @@ -18,21 +18,21 @@ import com.sun.appserv.connectors.internal.api.ConnectorRuntime; import com.sun.enterprise.config.serverbeans.Resources; + +import jakarta.inject.Inject; + +import java.util.Arrays; +import java.util.Properties; + import org.glassfish.api.ActionReport; import org.glassfish.api.Param; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandLock; - -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; - -import java.util.Arrays; -import java.util.Properties; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; - -import jakarta.inject.Inject; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * @author Jagadish Ramu diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetResourceAdapterConfigProperties.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetResourceAdapterConfigProperties.java index 7cc38bdea93..a13203ee0a3 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetResourceAdapterConfigProperties.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetResourceAdapterConfigProperties.java @@ -19,22 +19,22 @@ import com.sun.appserv.connectors.internal.api.ConnectorConstants; import com.sun.appserv.connectors.internal.api.ConnectorRuntime; import com.sun.enterprise.config.serverbeans.Resources; -import org.glassfish.api.ActionReport; -import org.glassfish.api.Param; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.admin.CommandLock; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; import java.util.Properties; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; - -import jakarta.inject.Inject; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * @author Jagadish Ramu diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetSystemRarsAllowingPoolCreation.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetSystemRarsAllowingPoolCreation.java index b0a4b67b60c..19e9bc26ec1 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetSystemRarsAllowingPoolCreation.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/internal/GetSystemRarsAllowingPoolCreation.java @@ -18,20 +18,20 @@ import com.sun.appserv.connectors.internal.api.ConnectorRuntime; import com.sun.enterprise.config.serverbeans.Resources; -import org.glassfish.api.ActionReport; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.admin.CommandLock; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; +import jakarta.inject.Inject; import java.util.Arrays; import java.util.Properties; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; - -import jakarta.inject.Inject; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * @author Jagadish Ramu diff --git a/appserver/connectors/admin/src/test/java/org/glassfish/connectors/admin/cli/CreateCustomResourceTest.java b/appserver/connectors/admin/src/test/java/org/glassfish/connectors/admin/cli/CreateCustomResourceTest.java index 5ccccd6e7d7..1881e45ca52 100644 --- a/appserver/connectors/admin/src/test/java/org/glassfish/connectors/admin/cli/CreateCustomResourceTest.java +++ b/appserver/connectors/admin/src/test/java/org/glassfish/connectors/admin/cli/CreateCustomResourceTest.java @@ -26,6 +26,8 @@ import com.sun.enterprise.v3.common.PropsFileActionReporter; import com.sun.logging.LogDomains; +import jakarta.inject.Inject; + import java.util.logging.Logger; import javax.security.auth.Subject; @@ -47,8 +49,6 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/appserver/connectors/admin/src/test/java/org/glassfish/connectors/admin/cli/DeleteCustomResourceTest.java b/appserver/connectors/admin/src/test/java/org/glassfish/connectors/admin/cli/DeleteCustomResourceTest.java index c2433240362..bda30fa401b 100644 --- a/appserver/connectors/admin/src/test/java/org/glassfish/connectors/admin/cli/DeleteCustomResourceTest.java +++ b/appserver/connectors/admin/src/test/java/org/glassfish/connectors/admin/cli/DeleteCustomResourceTest.java @@ -27,6 +27,8 @@ import com.sun.enterprise.v3.common.PropsFileActionReporter; import com.sun.logging.LogDomains; +import jakarta.inject.Inject; + import java.util.logging.Logger; import javax.security.auth.Subject; @@ -50,8 +52,6 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/appserver/connectors/admin/src/test/java/org/glassfish/connectors/admin/cli/ListCustomResourcesTest.java b/appserver/connectors/admin/src/test/java/org/glassfish/connectors/admin/cli/ListCustomResourcesTest.java index f59c382667a..0d741867fd2 100644 --- a/appserver/connectors/admin/src/test/java/org/glassfish/connectors/admin/cli/ListCustomResourcesTest.java +++ b/appserver/connectors/admin/src/test/java/org/glassfish/connectors/admin/cli/ListCustomResourcesTest.java @@ -23,6 +23,8 @@ import com.sun.enterprise.v3.common.PropsFileActionReporter; import com.sun.logging.LogDomains; +import jakarta.inject.Inject; + import java.util.List; import javax.security.auth.Subject; @@ -42,8 +44,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/appserver/connectors/admin/src/test/java/org/glassfish/connectors/admin/cli/test/GlassFishTestDocument.java b/appserver/connectors/admin/src/test/java/org/glassfish/connectors/admin/cli/test/GlassFishTestDocument.java index 5418c77043f..ea69ef27548 100644 --- a/appserver/connectors/admin/src/test/java/org/glassfish/connectors/admin/cli/test/GlassFishTestDocument.java +++ b/appserver/connectors/admin/src/test/java/org/glassfish/connectors/admin/cli/test/GlassFishTestDocument.java @@ -17,12 +17,13 @@ package org.glassfish.connectors.admin.cli.test; -import org.jvnet.hk2.config.DomDocument; -import org.jvnet.hk2.config.Dom; -import org.jvnet.hk2.config.ConfigModel; +import javax.xml.stream.XMLStreamReader; + import org.glassfish.config.support.GlassFishConfigBean; import org.glassfish.hk2.api.ServiceLocator; -import javax.xml.stream.XMLStreamReader; +import org.jvnet.hk2.config.ConfigModel; +import org.jvnet.hk2.config.Dom; +import org.jvnet.hk2.config.DomDocument; /** * diff --git a/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/ActiveInboundResourceAdapter.java b/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/ActiveInboundResourceAdapter.java index 98caf3cf1c7..45c2000f878 100644 --- a/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/ActiveInboundResourceAdapter.java +++ b/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/ActiveInboundResourceAdapter.java @@ -16,10 +16,10 @@ package com.sun.enterprise.connectors.inbound; +import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; import com.sun.enterprise.connectors.ActiveResourceAdapter; import com.sun.enterprise.deployment.EjbMessageBeanDescriptor; import com.sun.enterprise.deployment.runtime.BeanPoolDescriptor; -import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; import jakarta.resource.spi.ActivationSpec; diff --git a/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/ActiveInboundResourceAdapterImpl.java b/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/ActiveInboundResourceAdapterImpl.java index fba284905df..6f7faa2c40f 100644 --- a/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/ActiveInboundResourceAdapterImpl.java +++ b/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/ActiveInboundResourceAdapterImpl.java @@ -16,25 +16,25 @@ package com.sun.enterprise.connectors.inbound; -import com.sun.enterprise.connectors.*; +import com.sun.appserv.connectors.internal.api.ConnectorConstants; +import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; +import com.sun.appserv.connectors.internal.api.ConnectorsUtil; +import com.sun.enterprise.connectors.ActiveOutboundResourceAdapter; import com.sun.enterprise.deployment.ConnectorDescriptor; import com.sun.enterprise.deployment.EjbMessageBeanDescriptor; import com.sun.enterprise.deployment.runtime.BeanPoolDescriptor; -import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; -import com.sun.appserv.connectors.internal.api.ConnectorsUtil; -import com.sun.appserv.connectors.internal.api.ConnectorConstants; -import jakarta.resource.spi.ResourceAdapter; import jakarta.resource.spi.ActivationSpec; -import java.util.Hashtable; +import jakarta.resource.spi.ResourceAdapter; + import java.util.Collection; +import java.util.Hashtable; import java.util.Iterator; import java.util.Set; import java.util.logging.Level; -import org.jvnet.hk2.annotations.Service; - import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * Represents the active (runtime) inbound resource-adapter diff --git a/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/ConnectorMessageBeanClientFactory.java b/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/ConnectorMessageBeanClientFactory.java index f7fc3069ee5..041b910e641 100755 --- a/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/ConnectorMessageBeanClientFactory.java +++ b/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/ConnectorMessageBeanClientFactory.java @@ -16,14 +16,15 @@ package com.sun.enterprise.connectors.inbound; -import com.sun.enterprise.deployment.EjbMessageBeanDescriptor; import com.sun.appserv.connectors.internal.api.ConnectorRuntime; -import org.glassfish.ejb.spi.MessageBeanClientFactory; -import org.glassfish.ejb.spi.MessageBeanClient; -import org.jvnet.hk2.annotations.Service; +import com.sun.enterprise.deployment.EjbMessageBeanDescriptor; import jakarta.inject.Inject; +import org.glassfish.ejb.spi.MessageBeanClient; +import org.glassfish.ejb.spi.MessageBeanClientFactory; +import org.jvnet.hk2.annotations.Service; + /** * MessageBeanClientFactory for connector message bean clients. * diff --git a/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/InboundRecoveryHandler.java b/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/InboundRecoveryHandler.java index e27cc8ad7c4..9d4993f0904 100644 --- a/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/InboundRecoveryHandler.java +++ b/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/InboundRecoveryHandler.java @@ -16,19 +16,6 @@ package com.sun.enterprise.connectors.inbound; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.Vector; -import java.util.logging.Level; -import java.util.logging.Logger; -import jakarta.inject.Inject; -import jakarta.inject.Provider; -import jakarta.resource.spi.ActivationSpec; -import javax.transaction.xa.XAResource; - import com.sun.appserv.connectors.internal.api.ConnectorConstants; import com.sun.appserv.connectors.internal.api.ConnectorRuntime; import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; @@ -48,6 +35,22 @@ import com.sun.enterprise.deployment.EnvironmentProperty; import com.sun.enterprise.transaction.spi.RecoveryResourceHandler; import com.sun.logging.LogDomains; + +import jakarta.inject.Inject; +import jakarta.inject.Provider; +import jakarta.resource.spi.ActivationSpec; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.Vector; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.transaction.xa.XAResource; + import org.glassfish.internal.data.ApplicationInfo; import org.glassfish.internal.data.ApplicationRegistry; import org.jvnet.hk2.annotations.Service; diff --git a/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/MessageEndpointInvocationHandler.java b/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/MessageEndpointInvocationHandler.java index 10a10c69183..3426d00aaaf 100755 --- a/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/MessageEndpointInvocationHandler.java +++ b/appserver/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/MessageEndpointInvocationHandler.java @@ -16,7 +16,9 @@ package com.sun.enterprise.connectors.inbound; +import com.sun.appserv.connectors.internal.api.ConnectorConstants; import com.sun.enterprise.connectors.ConnectorRuntime; +import com.sun.enterprise.transaction.api.JavaEETransactionManager; import com.sun.logging.LogDomains; import java.lang.reflect.InvocationHandler; @@ -25,8 +27,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.transaction.api.JavaEETransactionManager; -import com.sun.appserv.connectors.internal.api.ConnectorConstants; import org.glassfish.ejb.api.MessageBeanListener; import org.glassfish.ejb.api.MessageBeanProtocolManager; diff --git a/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/ConnectorClassLoaderServiceImpl.java b/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/ConnectorClassLoaderServiceImpl.java index a229f841b17..1182b82d376 100644 --- a/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/ConnectorClassLoaderServiceImpl.java +++ b/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/ConnectorClassLoaderServiceImpl.java @@ -16,19 +16,21 @@ package com.sun.appserv.connectors.internal.api; -import org.glassfish.internal.api.*; -import org.jvnet.hk2.annotations.Service; +import com.sun.logging.LogDomains; + +import jakarta.inject.Inject; +import jakarta.inject.Provider; import java.security.AccessController; import java.security.PrivilegedAction; -import java.util.*; -import java.util.logging.Logger; +import java.util.List; import java.util.logging.Level; +import java.util.logging.Logger; -import com.sun.logging.LogDomains; - -import jakarta.inject.Inject; -import jakarta.inject.Provider; +import org.glassfish.internal.api.ClassLoaderHierarchy; +import org.glassfish.internal.api.ConnectorClassLoaderService; +import org.glassfish.internal.api.DelegatingClassLoader; +import org.jvnet.hk2.annotations.Service; /** * We support two policies: diff --git a/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/ConnectorRuntime.java b/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/ConnectorRuntime.java index ae468d5d5af..2c7148453fc 100644 --- a/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/ConnectorRuntime.java +++ b/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/ConnectorRuntime.java @@ -17,6 +17,17 @@ package com.sun.appserv.connectors.internal.api; +import com.sun.appserv.connectors.internal.spi.ConnectorNamingEventListener; +import com.sun.enterprise.config.serverbeans.ResourcePool; +import com.sun.enterprise.deployment.Application; +import com.sun.enterprise.deployment.ConnectorDescriptor; +import com.sun.enterprise.deployment.ResourceReferenceDescriptor; +import com.sun.enterprise.transaction.api.JavaEETransactionManager; + +import jakarta.resource.ResourceException; +import jakarta.resource.spi.ManagedConnectionFactory; +import jakarta.resource.spi.ResourceAdapterAssociation; + import java.util.Hashtable; import java.util.List; import java.util.Map; @@ -27,23 +38,12 @@ import org.glassfish.api.admin.ProcessEnvironment; import org.glassfish.api.invocation.InvocationManager; +import org.glassfish.api.naming.SimpleJndiName; import org.glassfish.connectors.config.WorkSecurityMap; import org.glassfish.resourcebase.resources.api.PoolInfo; import org.glassfish.resourcebase.resources.api.ResourceInfo; import org.jvnet.hk2.annotations.Contract; -import com.sun.appserv.connectors.internal.spi.ConnectorNamingEventListener; -import com.sun.enterprise.config.serverbeans.ResourcePool; -import com.sun.enterprise.deployment.Application; -import com.sun.enterprise.deployment.ConnectorDescriptor; -import com.sun.enterprise.transaction.api.JavaEETransactionManager; - -import jakarta.resource.ResourceException; -import jakarta.resource.spi.ManagedConnectionFactory; -import jakarta.resource.spi.ResourceAdapterAssociation; -import com.sun.enterprise.deployment.ResourceReferenceDescriptor; -import org.glassfish.api.naming.SimpleJndiName; - /** * This class is the entry point to connector backend module. It exposes different API's called by external entities diff --git a/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/TransactedPoolManager.java b/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/TransactedPoolManager.java index 6e8440bfe78..8e553557ce2 100644 --- a/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/TransactedPoolManager.java +++ b/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/TransactedPoolManager.java @@ -16,10 +16,10 @@ package com.sun.appserv.connectors.internal.api; -import org.jvnet.hk2.annotations.Contract; - import jakarta.transaction.Transaction; +import org.jvnet.hk2.annotations.Contract; + /** * TransactedPoolManager manages jdbc and connector connection pool diff --git a/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/WorkManagerFactory.java b/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/WorkManagerFactory.java index 3862b777c6f..6cb12979263 100644 --- a/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/WorkManagerFactory.java +++ b/appserver/connectors/connectors-internal-api/src/main/java/com/sun/appserv/connectors/internal/api/WorkManagerFactory.java @@ -16,10 +16,10 @@ package com.sun.appserv.connectors.internal.api; -import org.jvnet.hk2.annotations.Contract; - import jakarta.resource.spi.work.WorkManager; +import org.jvnet.hk2.annotations.Contract; + @Contract public interface WorkManagerFactory { /**; diff --git a/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/api/jdbc/validation/DerbyConnectionValidation.java b/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/api/jdbc/validation/DerbyConnectionValidation.java index 7fc072ea1e7..2bbe9955349 100644 --- a/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/api/jdbc/validation/DerbyConnectionValidation.java +++ b/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/api/jdbc/validation/DerbyConnectionValidation.java @@ -16,11 +16,12 @@ package org.glassfish.api.jdbc.validation; -import org.glassfish.api.jdbc.ConnectionValidation; import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; +import org.glassfish.api.jdbc.ConnectionValidation; + /** * Provide custom implementation of connection validation for Derby dbvendor * diff --git a/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/api/jdbc/validation/JDBC40ConnectionValidation.java b/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/api/jdbc/validation/JDBC40ConnectionValidation.java index ac6589058a7..7fbcaeeb46b 100644 --- a/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/api/jdbc/validation/JDBC40ConnectionValidation.java +++ b/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/api/jdbc/validation/JDBC40ConnectionValidation.java @@ -16,10 +16,11 @@ package org.glassfish.api.jdbc.validation; -import org.glassfish.api.jdbc.ConnectionValidation; import java.sql.Connection; import java.sql.SQLException; +import org.glassfish.api.jdbc.ConnectionValidation; + /** * Provide custom implementation of connection validation for jdbc40 drivers. * diff --git a/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/api/jdbc/validation/OracleConnectionValidation.java b/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/api/jdbc/validation/OracleConnectionValidation.java index 411a64fd8a6..8ea7a22875a 100644 --- a/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/api/jdbc/validation/OracleConnectionValidation.java +++ b/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/api/jdbc/validation/OracleConnectionValidation.java @@ -16,11 +16,12 @@ package org.glassfish.api.jdbc.validation; -import org.glassfish.api.jdbc.ConnectionValidation; import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; +import org.glassfish.api.jdbc.ConnectionValidation; + /** * Provide custom implementation of connection validation for oracle dbvendor. * diff --git a/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/api/jdbc/validation/PostgresConnectionValidation.java b/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/api/jdbc/validation/PostgresConnectionValidation.java index 32318925401..f84d27cd5d1 100644 --- a/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/api/jdbc/validation/PostgresConnectionValidation.java +++ b/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/api/jdbc/validation/PostgresConnectionValidation.java @@ -16,11 +16,12 @@ package org.glassfish.api.jdbc.validation; -import org.glassfish.api.jdbc.ConnectionValidation; import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; +import org.glassfish.api.jdbc.ConnectionValidation; + /** * Provide custom implementation of connection validation for postgres dbvendor. * diff --git a/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/AdminObjectResource.java b/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/AdminObjectResource.java index c19614388c3..29f333c5ef9 100644 --- a/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/AdminObjectResource.java +++ b/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/AdminObjectResource.java @@ -26,13 +26,13 @@ import java.util.List; import org.glassfish.admin.cli.resources.ResourceConfigCreator; +import org.glassfish.admin.cli.resources.UniqueResourceNameConstraint; import org.glassfish.api.admin.RestRedirect; import org.glassfish.api.admin.RestRedirects; import org.glassfish.api.admin.config.PropertiesDesc; import org.glassfish.quality.ToDo; -import org.glassfish.admin.cli.resources.UniqueResourceNameConstraint; -import org.glassfish.resourcebase.resources.ResourceTypeOrder; import org.glassfish.resourcebase.resources.ResourceDeploymentOrder; +import org.glassfish.resourcebase.resources.ResourceTypeOrder; import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.Configured; diff --git a/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/BackendPrincipal.java b/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/BackendPrincipal.java index f8b6179b3ea..e14ad0da843 100644 --- a/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/BackendPrincipal.java +++ b/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/BackendPrincipal.java @@ -16,12 +16,13 @@ package org.glassfish.connectors.config; -import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.Configured; -import org.jvnet.hk2.config.ConfigBeanProxy; +import jakarta.validation.constraints.NotNull; import java.beans.PropertyVetoException; -import jakarta.validation.constraints.NotNull; + +import org.jvnet.hk2.config.Attribute; +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Configured; /** * diff --git a/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/ConnectorConnectionPool.java b/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/ConnectorConnectionPool.java index 650420068cc..8fcb03da1d6 100644 --- a/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/ConnectorConnectionPool.java +++ b/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/ConnectorConnectionPool.java @@ -43,8 +43,8 @@ import org.glassfish.connectors.config.validators.ConnectionPoolConstraints; import org.glassfish.connectors.config.validators.ConnectionPoolErrorMessages; import org.glassfish.quality.ToDo; -import org.glassfish.resourcebase.resources.ResourceTypeOrder; import org.glassfish.resourcebase.resources.ResourceDeploymentOrder; +import org.glassfish.resourcebase.resources.ResourceTypeOrder; import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.Configured; diff --git a/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/ConnectorResource.java b/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/ConnectorResource.java index a121c919469..ea7a75e74e2 100644 --- a/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/ConnectorResource.java +++ b/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/ConnectorResource.java @@ -34,8 +34,8 @@ import org.glassfish.api.admin.RestRedirects; import org.glassfish.api.admin.config.PropertiesDesc; import org.glassfish.quality.ToDo; -import org.glassfish.resourcebase.resources.ResourceTypeOrder; import org.glassfish.resourcebase.resources.ResourceDeploymentOrder; +import org.glassfish.resourcebase.resources.ResourceTypeOrder; import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.Configured; diff --git a/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/ConnectorService.java b/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/ConnectorService.java index e3baa9ccaee..2871b3aa1d4 100644 --- a/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/ConnectorService.java +++ b/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/ConnectorService.java @@ -16,20 +16,20 @@ package org.glassfish.connectors.config; +import jakarta.validation.constraints.Min; + +import java.beans.PropertyVetoException; +import java.util.List; + import org.glassfish.api.admin.config.ConfigExtension; +import org.glassfish.api.admin.config.PropertiesDesc; import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.Element; import org.jvnet.hk2.config.types.Property; -import org.glassfish.api.admin.config.PropertiesDesc; import org.jvnet.hk2.config.types.PropertyBag; -import java.beans.PropertyVetoException; -import java.util.List; - -import jakarta.validation.constraints.Min; - /** * diff --git a/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/GroupMap.java b/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/GroupMap.java index a796b875d62..a08e51dba60 100644 --- a/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/GroupMap.java +++ b/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/GroupMap.java @@ -22,8 +22,8 @@ import java.beans.PropertyVetoException; import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Configured; @Configured public interface GroupMap extends ConfigBeanProxy { diff --git a/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/validators/ConnectionPoolConstraint.java b/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/validators/ConnectionPoolConstraint.java index ac0e15fd513..38f8fd93532 100644 --- a/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/validators/ConnectionPoolConstraint.java +++ b/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/validators/ConnectionPoolConstraint.java @@ -16,15 +16,17 @@ package org.glassfish.connectors.config.validators; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + +import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.ElementType.METHOD; + import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import jakarta.validation.Constraint; -import jakarta.validation.Payload; /** * User defined constraint for Jdbc/Connector Connection Pools. diff --git a/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/validators/ConnectionPoolConstraints.java b/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/validators/ConnectionPoolConstraints.java index 07200424882..12b3f5ded68 100644 --- a/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/validators/ConnectionPoolConstraints.java +++ b/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/validators/ConnectionPoolConstraints.java @@ -17,6 +17,7 @@ package org.glassfish.connectors.config.validators; import java.lang.annotation.Retention; + import static java.lang.annotation.RetentionPolicy.RUNTIME; /** diff --git a/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/validators/ConnectionPoolValidator.java b/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/validators/ConnectionPoolValidator.java index 05410d051b7..6b3c542dfbe 100644 --- a/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/validators/ConnectionPoolValidator.java +++ b/appserver/connectors/connectors-internal-api/src/main/java/org/glassfish/connectors/config/validators/ConnectionPoolValidator.java @@ -16,12 +16,13 @@ package org.glassfish.connectors.config.validators; -import org.glassfish.connectors.config.ConnectorConnectionPool; import com.sun.enterprise.config.serverbeans.ResourcePool; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; + import org.glassfish.config.support.Constants; +import org.glassfish.connectors.config.ConnectorConnectionPool; /** * Implementation for Connection Pool validation. diff --git a/appserver/connectors/connectors-internal-api/src/test/java/org/glassfish/connectors/config/AllModelsImplementingTest.java b/appserver/connectors/connectors-internal-api/src/test/java/org/glassfish/connectors/config/AllModelsImplementingTest.java index 665b0bbcce6..e39236d0f44 100644 --- a/appserver/connectors/connectors-internal-api/src/test/java/org/glassfish/connectors/config/AllModelsImplementingTest.java +++ b/appserver/connectors/connectors-internal-api/src/test/java/org/glassfish/connectors/config/AllModelsImplementingTest.java @@ -21,6 +21,8 @@ import com.sun.enterprise.config.serverbeans.Resource; import com.sun.enterprise.config.serverbeans.Resources; +import jakarta.inject.Inject; + import java.util.List; import java.util.logging.Logger; @@ -32,8 +34,6 @@ import org.jvnet.hk2.config.ConfigModel; import org.jvnet.hk2.config.Dom; -import jakarta.inject.Inject; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; diff --git a/appserver/connectors/connectors-internal-api/src/test/java/org/glassfish/connectors/config/PasswordAliasTest.java b/appserver/connectors/connectors-internal-api/src/test/java/org/glassfish/connectors/config/PasswordAliasTest.java index c39d74ca8fa..2a927dd747f 100644 --- a/appserver/connectors/connectors-internal-api/src/test/java/org/glassfish/connectors/config/PasswordAliasTest.java +++ b/appserver/connectors/connectors-internal-api/src/test/java/org/glassfish/connectors/config/PasswordAliasTest.java @@ -17,6 +17,8 @@ package org.glassfish.connectors.config; +import jakarta.inject.Inject; + import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.security.common.MasterPassword; import org.glassfish.tests.utils.junit.DomainXml; @@ -24,8 +26,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import jakarta.inject.Inject; - import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ActiveRAFactory.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ActiveRAFactory.java index 532050f5087..cfa9359faa3 100755 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ActiveRAFactory.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ActiveRAFactory.java @@ -17,14 +17,6 @@ package com.sun.enterprise.connectors; -import java.util.Collection; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.glassfish.api.admin.ProcessEnvironment; -import org.glassfish.hk2.api.ServiceLocator; -import org.jvnet.hk2.annotations.Service; - import com.sun.appserv.connectors.internal.api.ConnectorConstants; import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; import com.sun.enterprise.deployment.ConnectorDescriptor; @@ -35,6 +27,14 @@ import jakarta.inject.Singleton; import jakarta.resource.spi.ResourceAdapter; +import java.util.Collection; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.glassfish.api.admin.ProcessEnvironment; +import org.glassfish.hk2.api.ServiceLocator; +import org.jvnet.hk2.annotations.Service; + /** * Factory creating Active Resource adapters. * diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ActiveResourceAdapter.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ActiveResourceAdapter.java index b1573e53324..f6f2371c4da 100755 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ActiveResourceAdapter.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ActiveResourceAdapter.java @@ -17,14 +17,14 @@ package com.sun.enterprise.connectors; -import org.jvnet.hk2.annotations.Contract; - import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; import com.sun.enterprise.deployment.ConnectorDescriptor; import jakarta.resource.spi.ManagedConnectionFactory; import jakarta.resource.spi.ResourceAdapter; +import org.jvnet.hk2.annotations.Contract; + /** * Interface class for different types (1.0 and 1.5 complient) resource diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ConnectionManagerFactory.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ConnectionManagerFactory.java index 91fdf80d466..2286a79cd9c 100755 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ConnectionManagerFactory.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ConnectionManagerFactory.java @@ -17,17 +17,17 @@ package com.sun.enterprise.connectors; +import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; +import com.sun.logging.LogDomains; + +import jakarta.resource.spi.ConnectionManager; + import java.util.logging.Level; import java.util.logging.Logger; import org.glassfish.resourcebase.resources.api.PoolInfo; import org.glassfish.resourcebase.resources.api.ResourceInfo; -import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; -import com.sun.logging.LogDomains; - -import jakarta.resource.spi.ConnectionManager; - /* Authors : Binod P G, Aditya Gore * */ diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ConnectionPoolMonitoringExtension.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ConnectionPoolMonitoringExtension.java index ca1874534e4..931310b60fc 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ConnectionPoolMonitoringExtension.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ConnectionPoolMonitoringExtension.java @@ -17,12 +17,12 @@ package com.sun.enterprise.connectors; -import org.glassfish.resourcebase.resources.api.PoolInfo; -import org.jvnet.hk2.annotations.Contract; - import com.sun.enterprise.resource.pool.monitor.ConnectionPoolAppProbeProvider; import com.sun.enterprise.resource.pool.monitor.ConnectionPoolProbeProvider; +import org.glassfish.resourcebase.resources.api.PoolInfo; +import org.jvnet.hk2.annotations.Contract; + /** * @author Shalini M */ diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ConnectorDescriptorInfo.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ConnectorDescriptorInfo.java index d6386616b9d..b550a09b28f 100755 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ConnectorDescriptorInfo.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ConnectorDescriptorInfo.java @@ -17,14 +17,14 @@ package com.sun.enterprise.connectors; +import com.sun.enterprise.connectors.util.ConnectionPoolReconfigHelper.ReconfigAction; +import com.sun.enterprise.deployment.ConnectorConfigProperty; + import java.io.Serializable; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Set; -import com.sun.enterprise.connectors.util.ConnectionPoolReconfigHelper.ReconfigAction; -import com.sun.enterprise.deployment.ConnectorConfigProperty; - /** * This class abstract the ra.xml values pertaining to the connection * management. It contains various config properties of MCF, Resource adapter, diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ConnectorRegistry.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ConnectorRegistry.java index a07326e6020..64652fd80c1 100755 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ConnectorRegistry.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ConnectorRegistry.java @@ -17,6 +17,15 @@ package com.sun.enterprise.connectors; +import com.sun.enterprise.connectors.authentication.RuntimeSecurityMap; +import com.sun.enterprise.connectors.module.ConnectorApplication; +import com.sun.enterprise.connectors.util.SecurityMapUtils; +import com.sun.enterprise.deployment.ConnectorDescriptor; +import com.sun.logging.LogDomains; + +import jakarta.resource.spi.ManagedConnectionFactory; +import jakarta.validation.Validator; + import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -34,15 +43,6 @@ import org.glassfish.resourcebase.resources.api.PoolInfo; import org.glassfish.resourcebase.resources.api.ResourceInfo; -import com.sun.enterprise.connectors.authentication.RuntimeSecurityMap; -import com.sun.enterprise.connectors.module.ConnectorApplication; -import com.sun.enterprise.connectors.util.SecurityMapUtils; -import com.sun.enterprise.deployment.ConnectorDescriptor; -import com.sun.logging.LogDomains; - -import jakarta.resource.spi.ManagedConnectionFactory; -import jakarta.validation.Validator; - /** * This is an registry class which holds various objects in hashMaps, diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/DeferredResourceConfig.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/DeferredResourceConfig.java index 8caabfe3eba..226db50f9ad 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/DeferredResourceConfig.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/DeferredResourceConfig.java @@ -17,13 +17,13 @@ package com.sun.enterprise.connectors; -import org.glassfish.connectors.config.AdminObjectResource; -import org.glassfish.connectors.config.ResourceAdapterConfig; - import com.sun.enterprise.config.serverbeans.BindableResource; import com.sun.enterprise.config.serverbeans.Resource; import com.sun.enterprise.config.serverbeans.ResourcePool; +import org.glassfish.connectors.config.AdminObjectResource; +import org.glassfish.connectors.config.ResourceAdapterConfig; + public class DeferredResourceConfig { private String rarName; diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/LazyAssociatableConnectionManagerImpl.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/LazyAssociatableConnectionManagerImpl.java index 3c9c198cb58..6b27f0be136 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/LazyAssociatableConnectionManagerImpl.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/LazyAssociatableConnectionManagerImpl.java @@ -18,13 +18,13 @@ package com.sun.enterprise.connectors; -import org.glassfish.resourcebase.resources.api.PoolInfo; -import org.glassfish.resourcebase.resources.api.ResourceInfo; - import jakarta.resource.ResourceException; import jakarta.resource.spi.LazyAssociatableConnectionManager; import jakarta.resource.spi.ManagedConnectionFactory; +import org.glassfish.resourcebase.resources.api.PoolInfo; +import org.glassfish.resourcebase.resources.api.ResourceInfo; + /** * @author Aditya Gore */ diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/LazyEnlistableConnectionManagerImpl.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/LazyEnlistableConnectionManagerImpl.java index 857363f868e..bb9a4a86bf1 100755 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/LazyEnlistableConnectionManagerImpl.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/LazyEnlistableConnectionManagerImpl.java @@ -18,12 +18,12 @@ package com.sun.enterprise.connectors; -import org.glassfish.resourcebase.resources.api.PoolInfo; -import org.glassfish.resourcebase.resources.api.ResourceInfo; - import jakarta.resource.ResourceException; import jakarta.resource.spi.LazyEnlistableConnectionManager; +import org.glassfish.resourcebase.resources.api.PoolInfo; +import org.glassfish.resourcebase.resources.api.ResourceInfo; + /** * @author Aditya Gore */ diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/PoolMetaData.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/PoolMetaData.java index acd429e0a64..5e6eb8491a4 100755 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/PoolMetaData.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/PoolMetaData.java @@ -17,15 +17,15 @@ package com.sun.enterprise.connectors; -import javax.security.auth.Subject; - -import org.glassfish.resourcebase.resources.api.PoolInfo; - import com.sun.enterprise.connectors.authentication.RuntimeSecurityMap; import com.sun.enterprise.deployment.ResourcePrincipalDescriptor; import jakarta.resource.spi.ManagedConnectionFactory; +import javax.security.auth.Subject; + +import org.glassfish.resourcebase.resources.api.PoolInfo; + /** * Information about the ConnectorConnectionPool. Stored inofrmation is: 1. Default Subject 2. MCF Instance 3. Password, * UserName 4. The transaction-support attribute level in case of connector connection pools 5. The diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/XATerminatorProxy.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/XATerminatorProxy.java index 174497472ec..4b00e72c0a2 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/XATerminatorProxy.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/XATerminatorProxy.java @@ -17,6 +17,8 @@ package com.sun.enterprise.connectors; +import jakarta.resource.spi.XATerminator; + import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; @@ -25,8 +27,6 @@ import javax.transaction.xa.XAException; import javax.transaction.xa.Xid; -import jakarta.resource.spi.XATerminator; - /** * Proxy for XATerminator. * diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/authentication/AuthenticationService.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/authentication/AuthenticationService.java index 09ca0b16758..8ccb156bd39 100755 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/authentication/AuthenticationService.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/authentication/AuthenticationService.java @@ -17,11 +17,11 @@ package com.sun.enterprise.connectors.authentication; +import com.sun.enterprise.deployment.ResourcePrincipalDescriptor; + import java.security.Principal; import java.util.Set; -import com.sun.enterprise.deployment.ResourcePrincipalDescriptor; - /** * Interface class consisting of methods for securityMap functionality. For a given principal/userGrooup, a mapping is * done to a backendPrincipal which is actually used to authenticate/get connection to the backend. diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/authentication/BasicPasswordAuthenticationService.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/authentication/BasicPasswordAuthenticationService.java index 86c2c711f0a..8152e463c16 100755 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/authentication/BasicPasswordAuthenticationService.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/authentication/BasicPasswordAuthenticationService.java @@ -17,11 +17,14 @@ package com.sun.enterprise.connectors.authentication; -import static com.sun.appserv.connectors.internal.api.ConnectorConstants.SECURITYMAPMETACHAR; -import static com.sun.logging.LogDomains.RSR_LOGGER; -import static java.util.logging.Level.FINE; -import static org.glassfish.api.invocation.ComponentInvocation.ComponentInvocationType.EJB_INVOCATION; -import static org.glassfish.api.invocation.ComponentInvocation.ComponentInvocationType.SERVLET_INVOCATION; +import com.sun.enterprise.connectors.ConnectorRegistry; +import com.sun.enterprise.connectors.ConnectorRuntime; +import com.sun.enterprise.container.common.spi.util.ComponentEnvManager; +import com.sun.enterprise.deployment.ResourcePrincipalDescriptor; +import com.sun.enterprise.deployment.WebBundleDescriptor; +import com.sun.logging.LogDomains; + +import jakarta.ejb.EJBContext; import java.security.Principal; import java.util.ArrayList; @@ -39,14 +42,11 @@ import org.glassfish.ejb.api.EJBInvocation; import org.glassfish.resourcebase.resources.api.PoolInfo; -import com.sun.enterprise.connectors.ConnectorRegistry; -import com.sun.enterprise.connectors.ConnectorRuntime; -import com.sun.enterprise.container.common.spi.util.ComponentEnvManager; -import com.sun.enterprise.deployment.ResourcePrincipalDescriptor; -import com.sun.enterprise.deployment.WebBundleDescriptor; -import com.sun.logging.LogDomains; - -import jakarta.ejb.EJBContext; +import static com.sun.appserv.connectors.internal.api.ConnectorConstants.SECURITYMAPMETACHAR; +import static com.sun.logging.LogDomains.RSR_LOGGER; +import static java.util.logging.Level.FINE; +import static org.glassfish.api.invocation.ComponentInvocation.ComponentInvocationType.EJB_INVOCATION; +import static org.glassfish.api.invocation.ComponentInvocation.ComponentInvocationType.SERVLET_INVOCATION; /** * This class does the functionality of security mapping of the principal and userGroup to the backendPrincipal. diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/authentication/RuntimeSecurityMap.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/authentication/RuntimeSecurityMap.java index cc8181fc33d..56771a41c66 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/authentication/RuntimeSecurityMap.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/authentication/RuntimeSecurityMap.java @@ -17,11 +17,11 @@ package com.sun.enterprise.connectors.authentication; +import com.sun.enterprise.deployment.ResourcePrincipalDescriptor; + import java.util.HashMap; import java.util.Objects; -import com.sun.enterprise.deployment.ResourcePrincipalDescriptor; - /** * @author Kanwar Oberoi */ diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/ActivationHandler.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/ActivationHandler.java index dfe8c5118d9..b83510f94fc 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/ActivationHandler.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/ActivationHandler.java @@ -16,20 +16,26 @@ package com.sun.enterprise.connectors.deployment.annotation.handlers; -import com.sun.enterprise.deployment.annotation.context.RarBundleContext; -import com.sun.enterprise.deployment.annotation.handlers.*; import com.sun.enterprise.deployment.ConnectorDescriptor; import com.sun.enterprise.deployment.InboundResourceAdapter; import com.sun.enterprise.deployment.MessageListener; +import com.sun.enterprise.deployment.annotation.context.RarBundleContext; +import com.sun.enterprise.deployment.annotation.handlers.AbstractHandler; import com.sun.enterprise.util.LocalStringManagerImpl; import jakarta.resource.spi.Activation; + import java.lang.annotation.Annotation; import java.util.logging.Level; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.apf.*; +import org.glassfish.apf.AnnotatedElementHandler; +import org.glassfish.apf.AnnotationHandlerFor; +import org.glassfish.apf.AnnotationInfo; +import org.glassfish.apf.AnnotationProcessorException; +import org.glassfish.apf.HandlerProcessingResult; +import org.glassfish.apf.ResultType; import org.glassfish.apf.impl.HandlerProcessingResultImpl; +import org.jvnet.hk2.annotations.Service; /** diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/ConnectionDefinitionHandler.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/ConnectionDefinitionHandler.java index 89690f65c05..d130a73aaa8 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/ConnectionDefinitionHandler.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/ConnectionDefinitionHandler.java @@ -17,19 +17,25 @@ package com.sun.enterprise.connectors.deployment.annotation.handlers; -import com.sun.enterprise.deployment.annotation.context.RarBundleContext; -import com.sun.enterprise.deployment.annotation.handlers.*; +import com.sun.enterprise.deployment.ConnectionDefDescriptor; import com.sun.enterprise.deployment.ConnectorDescriptor; import com.sun.enterprise.deployment.OutboundResourceAdapter; -import com.sun.enterprise.deployment.ConnectionDefDescriptor; +import com.sun.enterprise.deployment.annotation.context.RarBundleContext; +import com.sun.enterprise.deployment.annotation.handlers.AbstractHandler; import com.sun.enterprise.util.LocalStringManagerImpl; import jakarta.resource.spi.ConnectionDefinition; import jakarta.resource.spi.ManagedConnectionFactory; + import java.lang.annotation.Annotation; import java.util.logging.Level; -import org.glassfish.apf.*; +import org.glassfish.apf.AnnotatedElementHandler; +import org.glassfish.apf.AnnotationHandlerFor; +import org.glassfish.apf.AnnotationInfo; +import org.glassfish.apf.AnnotationProcessorException; +import org.glassfish.apf.HandlerProcessingResult; +import org.glassfish.apf.ResultType; import org.glassfish.apf.impl.HandlerProcessingResultImpl; import org.jvnet.hk2.annotations.Service; diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/ConnectionDefinitionsHandler.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/ConnectionDefinitionsHandler.java index 6a146a16f2a..18191b7b72a 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/ConnectionDefinitionsHandler.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/ConnectionDefinitionsHandler.java @@ -17,15 +17,21 @@ package com.sun.enterprise.connectors.deployment.annotation.handlers; import com.sun.enterprise.deployment.annotation.context.RarBundleContext; -import com.sun.enterprise.deployment.annotation.handlers.*; +import com.sun.enterprise.deployment.annotation.handlers.AbstractHandler; import com.sun.enterprise.util.LocalStringManagerImpl; -import jakarta.resource.spi.ConnectionDefinitions; import jakarta.resource.spi.ConnectionDefinition; +import jakarta.resource.spi.ConnectionDefinitions; + import java.lang.annotation.Annotation; import java.util.logging.Level; -import org.glassfish.apf.*; +import org.glassfish.apf.AnnotatedElementHandler; +import org.glassfish.apf.AnnotationHandlerFor; +import org.glassfish.apf.AnnotationInfo; +import org.glassfish.apf.AnnotationProcessorException; +import org.glassfish.apf.HandlerProcessingResult; +import org.glassfish.apf.ResultType; import org.glassfish.apf.impl.HandlerProcessingResultImpl; import org.jvnet.hk2.annotations.Service; diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/SecurityPermissionHandler.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/SecurityPermissionHandler.java index 3a06748e38c..d29f17def04 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/SecurityPermissionHandler.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/deployment/annotation/handlers/SecurityPermissionHandler.java @@ -16,17 +16,23 @@ package com.sun.enterprise.connectors.deployment.annotation.handlers; -import com.sun.enterprise.deployment.annotation.context.RarBundleContext; import com.sun.enterprise.deployment.ConnectorDescriptor; +import com.sun.enterprise.deployment.annotation.context.RarBundleContext; import com.sun.enterprise.deployment.annotation.handlers.AbstractHandler; import com.sun.enterprise.util.LocalStringManagerImpl; import jakarta.resource.spi.Connector; import jakarta.resource.spi.SecurityPermission; + import java.lang.annotation.Annotation; import java.util.logging.Level; -import org.glassfish.apf.*; +import org.glassfish.apf.AnnotatedElementHandler; +import org.glassfish.apf.AnnotationHandlerFor; +import org.glassfish.apf.AnnotationInfo; +import org.glassfish.apf.AnnotationProcessorException; +import org.glassfish.apf.HandlerProcessingResult; +import org.glassfish.apf.ResultType; import org.glassfish.apf.impl.HandlerProcessingResultImpl; import org.jvnet.hk2.annotations.Service; diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/module/ConnectorApplication.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/module/ConnectorApplication.java index 50cc54f30a5..15651c8de78 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/module/ConnectorApplication.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/module/ConnectorApplication.java @@ -17,6 +17,14 @@ package com.sun.enterprise.connectors.module; +import com.sun.enterprise.config.serverbeans.Resource; +import com.sun.enterprise.config.serverbeans.Resources; +import com.sun.enterprise.connectors.ConnectorRuntime; +import com.sun.enterprise.connectors.util.ResourcesUtil; +import com.sun.enterprise.deployment.ConnectorDescriptor; +import com.sun.enterprise.util.i18n.StringManager; +import com.sun.logging.LogDomains; + import java.util.Collection; import java.util.logging.Level; import java.util.logging.Logger; @@ -34,14 +42,6 @@ import org.glassfish.resourcebase.resources.listener.ResourceManager; import org.glassfish.resources.listener.ApplicationScopedResourcesManager; -import com.sun.enterprise.config.serverbeans.Resource; -import com.sun.enterprise.config.serverbeans.Resources; -import com.sun.enterprise.connectors.ConnectorRuntime; -import com.sun.enterprise.connectors.util.ResourcesUtil; -import com.sun.enterprise.deployment.ConnectorDescriptor; -import com.sun.enterprise.util.i18n.StringManager; -import com.sun.logging.LogDomains; - /** * Represents a connector application, one per resource-adapter. * GlassFish kernel will call start/stop of connector application during start/stop of server and diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/module/ConnectorContainer.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/module/ConnectorContainer.java index 356b2693fc6..12c8a078439 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/module/ConnectorContainer.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/module/ConnectorContainer.java @@ -17,6 +17,9 @@ package com.sun.enterprise.connectors.module; +import com.sun.appserv.connectors.internal.api.ConnectorConstants; +import com.sun.logging.LogDomains; + import java.util.logging.Level; import java.util.logging.Logger; @@ -26,9 +29,6 @@ import org.glassfish.hk2.api.PreDestroy; import org.jvnet.hk2.annotations.Service; -import com.sun.appserv.connectors.internal.api.ConnectorConstants; -import com.sun.logging.LogDomains; - /** * Represents the container for connector runtime module diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/module/ConnectorDeployer.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/module/ConnectorDeployer.java index 4a3627e08be..9f37e515ae9 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/module/ConnectorDeployer.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/module/ConnectorDeployer.java @@ -17,6 +17,34 @@ package com.sun.enterprise.connectors.module; +import com.sun.appserv.connectors.internal.api.ConnectorClassFinder; +import com.sun.appserv.connectors.internal.api.ConnectorConstants; +import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; +import com.sun.appserv.connectors.internal.api.ConnectorsUtil; +import com.sun.enterprise.config.serverbeans.ApplicationRef; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.ConfigBeansUtilities; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Module; +import com.sun.enterprise.config.serverbeans.Resource; +import com.sun.enterprise.config.serverbeans.Resources; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.connectors.ConnectorRegistry; +import com.sun.enterprise.connectors.ConnectorRuntime; +import com.sun.enterprise.connectors.util.ResourcesUtil; +import com.sun.enterprise.deployment.Application; +import com.sun.enterprise.deployment.ConnectorDescriptor; +import com.sun.enterprise.util.i18n.StringManager; +import com.sun.logging.LogDomains; + +import jakarta.inject.Inject; +import jakarta.validation.Configuration; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorContext; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.bootstrap.GenericBootstrap; + import java.beans.PropertyVetoException; import java.io.BufferedReader; import java.io.File; @@ -60,34 +88,6 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import com.sun.appserv.connectors.internal.api.ConnectorClassFinder; -import com.sun.appserv.connectors.internal.api.ConnectorConstants; -import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; -import com.sun.appserv.connectors.internal.api.ConnectorsUtil; -import com.sun.enterprise.config.serverbeans.ApplicationRef; -import com.sun.enterprise.config.serverbeans.Cluster; -import com.sun.enterprise.config.serverbeans.ConfigBeansUtilities; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.Module; -import com.sun.enterprise.config.serverbeans.Resource; -import com.sun.enterprise.config.serverbeans.Resources; -import com.sun.enterprise.config.serverbeans.Server; -import com.sun.enterprise.connectors.ConnectorRegistry; -import com.sun.enterprise.connectors.ConnectorRuntime; -import com.sun.enterprise.connectors.util.ResourcesUtil; -import com.sun.enterprise.deployment.Application; -import com.sun.enterprise.deployment.ConnectorDescriptor; -import com.sun.enterprise.util.i18n.StringManager; -import com.sun.logging.LogDomains; - -import jakarta.inject.Inject; -import jakarta.validation.Configuration; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorContext; -import jakarta.validation.ValidatorFactory; -import jakarta.validation.bootstrap.GenericBootstrap; - /** * Deployer for a resource-adapter. * diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/naming/ConnectorResourceNamingEventNotifier.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/naming/ConnectorResourceNamingEventNotifier.java index 36be7e3aeac..d83ee5340d9 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/naming/ConnectorResourceNamingEventNotifier.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/naming/ConnectorResourceNamingEventNotifier.java @@ -17,11 +17,11 @@ package com.sun.enterprise.connectors.naming; -import java.util.ArrayList; - import com.sun.appserv.connectors.internal.spi.ConnectorNamingEvent; import com.sun.appserv.connectors.internal.spi.ConnectorNamingEventListener; +import java.util.ArrayList; + /** * Notifier for connector resource naming events * @author Jagadish Ramu diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/service/ConnectorAdminObjectAdminServiceImpl.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/service/ConnectorAdminObjectAdminServiceImpl.java index e38b845f0a0..37a374d8ac0 100755 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/service/ConnectorAdminObjectAdminServiceImpl.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/service/ConnectorAdminObjectAdminServiceImpl.java @@ -17,6 +17,10 @@ package com.sun.enterprise.connectors.service; +import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; +import com.sun.enterprise.connectors.ActiveOutboundResourceAdapter; +import com.sun.enterprise.connectors.ActiveResourceAdapter; + import java.util.Properties; import java.util.logging.Level; @@ -26,10 +30,6 @@ import org.glassfish.resourcebase.resources.api.ResourceInfo; import org.glassfish.resourcebase.resources.naming.ResourceNamingService; -import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; -import com.sun.enterprise.connectors.ActiveOutboundResourceAdapter; -import com.sun.enterprise.connectors.ActiveResourceAdapter; - /** * AdminObject administration service. It performs the functionality of * creating and deleting the Admin Objects diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/service/ConnectorConfigurationParserServiceImpl.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/service/ConnectorConfigurationParserServiceImpl.java index 284170177e6..661165264bd 100755 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/service/ConnectorConfigurationParserServiceImpl.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/service/ConnectorConfigurationParserServiceImpl.java @@ -17,14 +17,6 @@ package com.sun.enterprise.connectors.service; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.util.Iterator; -import java.util.Properties; -import java.util.Set; -import java.util.logging.Level; - import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; import com.sun.enterprise.connectors.util.AdminObjectConfigParser; import com.sun.enterprise.connectors.util.ConnectorConfigParser; @@ -34,6 +26,14 @@ import com.sun.enterprise.deployment.ConnectorDescriptor; import com.sun.enterprise.deployment.SecurityPermission; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.util.Iterator; +import java.util.Properties; +import java.util.Set; +import java.util.logging.Level; + /** * This is configuration parser service. Retrieves various configuration diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/service/ConnectorResourceAdminServiceImpl.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/service/ConnectorResourceAdminServiceImpl.java index e47635c98cb..2ca6671fa7a 100755 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/service/ConnectorResourceAdminServiceImpl.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/service/ConnectorResourceAdminServiceImpl.java @@ -17,6 +17,15 @@ package com.sun.enterprise.connectors.service; +import com.sun.appserv.connectors.internal.api.ConnectorConstants; +import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; +import com.sun.appserv.connectors.internal.api.ConnectorsUtil; +import com.sun.appserv.connectors.internal.spi.ConnectorNamingEvent; +import com.sun.enterprise.connectors.ConnectorConnectionPool; +import com.sun.enterprise.connectors.ConnectorDescriptorInfo; +import com.sun.enterprise.connectors.naming.ConnectorNamingEventNotifier; +import com.sun.enterprise.connectors.naming.ConnectorResourceNamingEventNotifier; + import java.util.Hashtable; import java.util.logging.Level; @@ -32,15 +41,6 @@ import org.glassfish.resourcebase.resources.naming.ResourceNamingService; import org.glassfish.resources.naming.SerializableObjectRefAddr; -import com.sun.appserv.connectors.internal.api.ConnectorConstants; -import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; -import com.sun.appserv.connectors.internal.api.ConnectorsUtil; -import com.sun.appserv.connectors.internal.spi.ConnectorNamingEvent; -import com.sun.enterprise.connectors.ConnectorConnectionPool; -import com.sun.enterprise.connectors.ConnectorDescriptorInfo; -import com.sun.enterprise.connectors.naming.ConnectorNamingEventNotifier; -import com.sun.enterprise.connectors.naming.ConnectorResourceNamingEventNotifier; - /** * This is connector resource admin service. It creates and deletes the * connector resources. diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/service/ConnectorSecurityAdminServiceImpl.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/service/ConnectorSecurityAdminServiceImpl.java index 55584e177b1..a6a2f65e873 100755 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/service/ConnectorSecurityAdminServiceImpl.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/service/ConnectorSecurityAdminServiceImpl.java @@ -17,16 +17,16 @@ package com.sun.enterprise.connectors.service; -import java.util.Set; - -import org.glassfish.resourcebase.resources.api.PoolInfo; - import com.sun.enterprise.connectors.authentication.AuthenticationService; import com.sun.enterprise.connectors.authentication.BasicPasswordAuthenticationService; import com.sun.enterprise.deployment.AuthMechanism; import com.sun.enterprise.deployment.ConnectorDescriptor; import com.sun.enterprise.deployment.OutboundResourceAdapter; +import java.util.Set; + +import org.glassfish.resourcebase.resources.api.PoolInfo; + /** * This is Security administration service. Performs funtionality of * security map creation, deletion. diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/AdminObjectConfigParser.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/AdminObjectConfigParser.java index 6942f446dfa..4014387bae3 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/AdminObjectConfigParser.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/AdminObjectConfigParser.java @@ -17,11 +17,11 @@ package com.sun.enterprise.connectors.util; -import java.util.Properties; - import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; import com.sun.enterprise.deployment.ConnectorDescriptor; +import java.util.Properties; + /** Interface class of admin object interface parser methods. * @author Srikanth P */ diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/AdminObjectConfigParserImpl.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/AdminObjectConfigParserImpl.java index 05714bd9c1f..3b0370721de 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/AdminObjectConfigParserImpl.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/AdminObjectConfigParserImpl.java @@ -17,6 +17,13 @@ package com.sun.enterprise.connectors.util; +import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; +import com.sun.enterprise.deployment.AdminObject; +import com.sun.enterprise.deployment.ConnectorConfigProperty; +import com.sun.enterprise.deployment.ConnectorDescriptor; +import com.sun.enterprise.util.i18n.StringManager; +import com.sun.logging.LogDomains; + import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; @@ -26,13 +33,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; -import com.sun.enterprise.deployment.AdminObject; -import com.sun.enterprise.deployment.ConnectorConfigProperty; -import com.sun.enterprise.deployment.ConnectorDescriptor; -import com.sun.enterprise.util.i18n.StringManager; -import com.sun.logging.LogDomains; - /** * This is AdminObject configuration parser. It parses the ra.xml file * for the admin object specific configurations like AdminObject javabeans diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectionDefinitionUtils.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectionDefinitionUtils.java index c6b1390d158..2e6e128747b 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectionDefinitionUtils.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectionDefinitionUtils.java @@ -17,6 +17,10 @@ package com.sun.enterprise.connectors.util; +import com.sun.appserv.connectors.internal.api.ConnectorConstants; +import com.sun.enterprise.connectors.ConnectorRuntime; +import com.sun.logging.LogDomains; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.HashSet; @@ -28,10 +32,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.appserv.connectors.internal.api.ConnectorConstants; -import com.sun.enterprise.connectors.ConnectorRuntime; -import com.sun.logging.LogDomains; - /** * A simple class to get the properties of a ConnectionDefinition class , that * could be overridden by the administrator during deployment. diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectionPoolObjectsUtils.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectionPoolObjectsUtils.java index 7b7308f2f0c..318eb03d231 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectionPoolObjectsUtils.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectionPoolObjectsUtils.java @@ -17,21 +17,6 @@ package com.sun.enterprise.connectors.util; -import java.lang.reflect.Method; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.util.List; -import java.util.Locale; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.security.auth.Subject; - -import org.glassfish.resourcebase.resources.api.PoolInfo; -import org.jvnet.hk2.config.types.Property; - import com.sun.appserv.connectors.internal.api.ConnectorConstants; import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; import com.sun.appserv.connectors.spi.TransactionSupport; @@ -48,6 +33,21 @@ import jakarta.resource.spi.TransactionSupport.TransactionSupportLevel; import jakarta.resource.spi.security.PasswordCredential; +import java.lang.reflect.Method; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.List; +import java.util.Locale; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.security.auth.Subject; + +import org.glassfish.resourcebase.resources.api.PoolInfo; +import org.jvnet.hk2.config.types.Property; + /** * This is an util class for creating poolObjects of the type diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectionPoolReconfigHelper.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectionPoolReconfigHelper.java index 2e6a154a213..fa4d513d6c5 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectionPoolReconfigHelper.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectionPoolReconfigHelper.java @@ -17,10 +17,6 @@ package com.sun.enterprise.connectors.util; -import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; - import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; import com.sun.enterprise.connectors.ConnectorConnectionPool; import com.sun.enterprise.connectors.ConnectorDescriptorInfo; @@ -28,6 +24,10 @@ import com.sun.enterprise.connectors.authentication.RuntimeSecurityMap; import com.sun.logging.LogDomains; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + public final class ConnectionPoolReconfigHelper { private static final Logger _logger = LogDomains.getLogger(ConnectionPoolReconfigHelper.class, diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorClassLoader.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorClassLoader.java index fc8000a34af..dd510a96f73 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorClassLoader.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorClassLoader.java @@ -17,6 +17,9 @@ package com.sun.enterprise.connectors.util; +import com.sun.enterprise.loader.ASURLClassLoader; +import com.sun.logging.LogDomains; + import java.io.File; import java.net.MalformedURLException; import java.security.AccessController; @@ -29,9 +32,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.loader.ASURLClassLoader; -import com.sun.logging.LogDomains; - /** * This class loader is responsible for loading standalone diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorConfigParser.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorConfigParser.java index 20ca13c7078..6e651202f40 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorConfigParser.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorConfigParser.java @@ -17,13 +17,13 @@ package com.sun.enterprise.connectors.util; -import java.util.List; -import java.util.Properties; - import com.sun.appserv.connectors.internal.api.ConnectorConstants; import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; import com.sun.enterprise.deployment.ConnectorDescriptor; +import java.util.List; +import java.util.Properties; + /** * Interface class of connector configuration parser methods. * Implemented by specific configuration parser classes. diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorConfigParserUtils.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorConfigParserUtils.java index 9a2995427ce..1bce86c76b2 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorConfigParserUtils.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorConfigParserUtils.java @@ -17,14 +17,6 @@ package com.sun.enterprise.connectors.util; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.Locale; -import java.util.Properties; -import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; - import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; import com.sun.appserv.connectors.internal.api.ConnectorsUtil; import com.sun.enterprise.connectors.ActiveOutboundResourceAdapter; @@ -38,6 +30,14 @@ import jakarta.resource.spi.ResourceAdapter; import jakarta.resource.spi.ResourceAdapterAssociation; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.Locale; +import java.util.Properties; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + /** * This is an util class containing methods for parsing connector diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorDDTransformUtils.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorDDTransformUtils.java index 0c02f92cb28..a62fb3e61db 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorDDTransformUtils.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorDDTransformUtils.java @@ -17,20 +17,6 @@ package com.sun.enterprise.connectors.util; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Properties; -import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.jvnet.hk2.config.types.Property; -import org.xml.sax.SAXException; - import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; import com.sun.appserv.connectors.internal.api.ConnectorsUtil; import com.sun.enterprise.connectors.ConnectorDescriptorInfo; @@ -46,6 +32,20 @@ import com.sun.enterprise.deployment.deploy.shared.MemoryMappedArchive; import com.sun.logging.LogDomains; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Properties; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.jvnet.hk2.config.types.Property; +import org.xml.sax.SAXException; + /** * This is an util class pertaining to the connector deployment descriptor diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorJavaBeanValidator.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorJavaBeanValidator.java index 624361e9400..0cd75039e86 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorJavaBeanValidator.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorJavaBeanValidator.java @@ -17,13 +17,6 @@ package com.sun.enterprise.connectors.util; -import java.util.Iterator; -import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.jvnet.hk2.annotations.Service; - import com.sun.enterprise.connectors.ConnectorRegistry; import com.sun.enterprise.connectors.ConnectorRuntime; import com.sun.logging.LogDomains; @@ -35,6 +28,13 @@ import jakarta.validation.ValidatorFactory; import jakarta.validation.metadata.BeanDescriptor; +import java.util.Iterator; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.jvnet.hk2.annotations.Service; + @Service public class ConnectorJavaBeanValidator { diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorTimerProxy.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorTimerProxy.java index b57ca1760bb..7c2f2519444 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorTimerProxy.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorTimerProxy.java @@ -17,15 +17,15 @@ package com.sun.enterprise.connectors.util; +import com.sun.enterprise.connectors.ConnectorRuntime; +import com.sun.logging.LogDomains; + import java.util.Date; import java.util.Timer; import java.util.TimerTask; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.connectors.ConnectorRuntime; -import com.sun.logging.LogDomains; - public class ConnectorTimerProxy extends Timer { private volatile static ConnectorTimerProxy connectorTimer; diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/DriverLoader.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/DriverLoader.java index 48dc64f09ed..4de401edcf7 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/DriverLoader.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/DriverLoader.java @@ -17,6 +17,11 @@ package com.sun.enterprise.connectors.util; +import com.sun.appserv.connectors.internal.api.ConnectorConstants; +import com.sun.enterprise.connectors.ConnectorRuntime; +import com.sun.enterprise.util.SystemPropertyConstants; +import com.sun.logging.LogDomains; + import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -43,11 +48,6 @@ import org.jvnet.hk2.annotations.Service; -import com.sun.appserv.connectors.internal.api.ConnectorConstants; -import com.sun.enterprise.connectors.ConnectorRuntime; -import com.sun.enterprise.util.SystemPropertyConstants; -import com.sun.logging.LogDomains; - /** * Driver Loader to load the jdbc drivers and get driver/datasource classnames * by introspection. diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/JarResourceExtractor.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/JarResourceExtractor.java index 39edd463005..c0860ec5dc8 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/JarResourceExtractor.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/JarResourceExtractor.java @@ -17,6 +17,8 @@ package com.sun.enterprise.connectors.util; +import com.sun.logging.LogDomains; + import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.FileInputStream; @@ -29,8 +31,6 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import com.sun.logging.LogDomains; - /** * JarResourceExtractor: JarResourceExtractor maps all resources included in a Zip or Jar file. diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/MCFConfigParserImpl.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/MCFConfigParserImpl.java index a677198258c..14490754793 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/MCFConfigParserImpl.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/MCFConfigParserImpl.java @@ -17,6 +17,13 @@ package com.sun.enterprise.connectors.util; +import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; +import com.sun.enterprise.deployment.ConnectionDefDescriptor; +import com.sun.enterprise.deployment.ConnectorConfigProperty; +import com.sun.enterprise.deployment.ConnectorDescriptor; +import com.sun.enterprise.deployment.OutboundResourceAdapter; +import com.sun.logging.LogDomains; + import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -25,13 +32,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; -import com.sun.enterprise.deployment.ConnectionDefDescriptor; -import com.sun.enterprise.deployment.ConnectorConfigProperty; -import com.sun.enterprise.deployment.ConnectorDescriptor; -import com.sun.enterprise.deployment.OutboundResourceAdapter; -import com.sun.logging.LogDomains; - /** * This is managed connection factory configuration parser. It parses the * ra.xml file for the managed connection factory specific configurations diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/MessageListenerConfigParser.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/MessageListenerConfigParser.java index 0fb485abb72..43a6523b1c4 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/MessageListenerConfigParser.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/MessageListenerConfigParser.java @@ -17,11 +17,11 @@ package com.sun.enterprise.connectors.util; -import java.util.Properties; - import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; import com.sun.enterprise.deployment.ConnectorDescriptor; +import java.util.Properties; + /** Interface class of managed connection factory parser methods. * @author Srikanth P */ diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/MessageListenerConfigParserImpl.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/MessageListenerConfigParserImpl.java index 6d946505048..708cad7a66b 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/MessageListenerConfigParserImpl.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/MessageListenerConfigParserImpl.java @@ -17,6 +17,12 @@ package com.sun.enterprise.connectors.util; +import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; +import com.sun.enterprise.deployment.ConnectorConfigProperty; +import com.sun.enterprise.deployment.ConnectorDescriptor; +import com.sun.enterprise.deployment.MessageListener; +import com.sun.logging.LogDomains; + import java.util.ArrayList; import java.util.List; import java.util.Properties; @@ -24,12 +30,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; -import com.sun.enterprise.deployment.ConnectorConfigProperty; -import com.sun.enterprise.deployment.ConnectorDescriptor; -import com.sun.enterprise.deployment.MessageListener; -import com.sun.logging.LogDomains; - /** * This is message listener configuration parser. It parses the * ra.xml file for the message listener specific configurations diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/PrintWriterAdapter.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/PrintWriterAdapter.java index 36064fdef09..b12cdb09197 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/PrintWriterAdapter.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/PrintWriterAdapter.java @@ -17,6 +17,8 @@ package com.sun.enterprise.connectors.util; +import com.sun.enterprise.connectors.ConnectorRuntime; + import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; @@ -24,8 +26,6 @@ import java.io.PrintWriter; import java.util.Locale; -import com.sun.enterprise.connectors.ConnectorRuntime; - /** * PrintWriter adapter that will be used by resource adapters */ diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ResourceAdapterConfigParserImpl.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ResourceAdapterConfigParserImpl.java index 988971a1f4d..8c9e92a9c35 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ResourceAdapterConfigParserImpl.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ResourceAdapterConfigParserImpl.java @@ -17,16 +17,16 @@ package com.sun.enterprise.connectors.util; +import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; +import com.sun.enterprise.deployment.ConnectorConfigProperty; +import com.sun.enterprise.deployment.ConnectorDescriptor; + import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Properties; import java.util.Set; -import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; -import com.sun.enterprise.deployment.ConnectorConfigProperty; -import com.sun.enterprise.deployment.ConnectorDescriptor; - /** * This is Resource Adapter configuration parser. It parses the * ra.xml file for the Resources adapter javabean properties diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/SecurityMapUtils.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/SecurityMapUtils.java index db88f13b025..dfc29d80551 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/SecurityMapUtils.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/SecurityMapUtils.java @@ -17,6 +17,11 @@ package com.sun.enterprise.connectors.util; +import com.sun.enterprise.connectors.authentication.ConnectorSecurityMap; +import com.sun.enterprise.connectors.authentication.EisBackendPrincipal; +import com.sun.enterprise.connectors.authentication.RuntimeSecurityMap; +import com.sun.enterprise.deployment.ResourcePrincipalDescriptor; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -24,11 +29,6 @@ import org.glassfish.connectors.config.BackendPrincipal; import org.glassfish.connectors.config.SecurityMap; -import com.sun.enterprise.connectors.authentication.ConnectorSecurityMap; -import com.sun.enterprise.connectors.authentication.EisBackendPrincipal; -import com.sun.enterprise.connectors.authentication.RuntimeSecurityMap; -import com.sun.enterprise.deployment.ResourcePrincipalDescriptor; - /** * This is class performs the task of adding/deleting and updating the * security maps to the connector registry. diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/ConnectorXAResource.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/ConnectorXAResource.java index b172bec0c6d..8efe7edf242 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/ConnectorXAResource.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/ConnectorXAResource.java @@ -17,17 +17,6 @@ package com.sun.enterprise.resource; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.SEVERE; - -import java.util.Map; -import java.util.Map.Entry; -import java.util.logging.Logger; - -import javax.transaction.xa.XAException; -import javax.transaction.xa.XAResource; -import javax.transaction.xa.Xid; - import com.sun.appserv.connectors.internal.api.PoolingException; import com.sun.enterprise.connectors.ConnectorRuntime; import com.sun.enterprise.resource.allocator.ResourceAllocator; @@ -40,6 +29,17 @@ import jakarta.resource.spi.ResourceAllocationException; import jakarta.transaction.SystemException; +import java.util.Map; +import java.util.Map.Entry; +import java.util.logging.Logger; + +import javax.transaction.xa.XAException; +import javax.transaction.xa.XAResource; +import javax.transaction.xa.Xid; + +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.SEVERE; + /** * @author Tony Ng, Jagadish Ramu * diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/XAResourceWrapper.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/XAResourceWrapper.java index 8cebaaf37d9..146cc4436ef 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/XAResourceWrapper.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/XAResourceWrapper.java @@ -17,6 +17,8 @@ package com.sun.enterprise.resource; +import com.sun.logging.LogDomains; + import java.util.logging.Level; import java.util.logging.Logger; @@ -24,8 +26,6 @@ import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import com.sun.logging.LogDomains; - /** * This is class is used for debugging. It prints out * trace information on TM calls to XAResource before diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/allocator/ResourceAllocator.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/allocator/ResourceAllocator.java index cb312fdb5fe..015c09dab2a 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/allocator/ResourceAllocator.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/allocator/ResourceAllocator.java @@ -17,14 +17,14 @@ package com.sun.enterprise.resource.allocator; -import java.util.Set; - import com.sun.appserv.connectors.internal.api.PoolingException; import com.sun.enterprise.resource.ResourceHandle; import jakarta.resource.ResourceException; import jakarta.resource.spi.ManagedConnection; +import java.util.Set; + /** * @author Tony Ng */ diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/beans/AdministeredObjectResource.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/beans/AdministeredObjectResource.java index 83b07f14375..a2ae54520d0 100755 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/beans/AdministeredObjectResource.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/beans/AdministeredObjectResource.java @@ -17,6 +17,19 @@ package com.sun.enterprise.resource.beans; +import com.sun.appserv.connectors.internal.api.ConnectorConstants; +import com.sun.appserv.connectors.internal.api.PoolingException; +import com.sun.enterprise.connectors.ConnectorRegistry; +import com.sun.enterprise.connectors.ConnectorRuntime; +import com.sun.enterprise.connectors.util.SetMethodAction; +import com.sun.enterprise.deployment.AdminObject; +import com.sun.enterprise.deployment.ConnectorConfigProperty; +import com.sun.logging.LogDomains; + +import jakarta.resource.ResourceException; +import jakarta.resource.spi.ResourceAdapter; +import jakarta.resource.spi.ResourceAdapterAssociation; + import java.security.AccessController; import java.security.PrivilegedAction; import java.security.PrivilegedActionException; @@ -32,19 +45,6 @@ import org.glassfish.resources.api.JavaEEResourceBase; import org.glassfish.resources.naming.SerializableObjectRefAddr; -import com.sun.appserv.connectors.internal.api.ConnectorConstants; -import com.sun.appserv.connectors.internal.api.PoolingException; -import com.sun.enterprise.connectors.ConnectorRegistry; -import com.sun.enterprise.connectors.ConnectorRuntime; -import com.sun.enterprise.connectors.util.SetMethodAction; -import com.sun.enterprise.deployment.AdminObject; -import com.sun.enterprise.deployment.ConnectorConfigProperty; -import com.sun.logging.LogDomains; - -import jakarta.resource.ResourceException; -import jakarta.resource.spi.ResourceAdapter; -import jakarta.resource.spi.ResourceAdapterAssociation; - /** * Resource infor for Connector administered objects * diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/AdminObjectResourceDeployer.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/AdminObjectResourceDeployer.java index ba038bb8cff..7756188865e 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/AdminObjectResourceDeployer.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/AdminObjectResourceDeployer.java @@ -17,6 +17,14 @@ package com.sun.enterprise.resource.deployer; +import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; +import com.sun.appserv.connectors.internal.api.ConnectorsUtil; +import com.sun.enterprise.connectors.ConnectorRuntime; +import com.sun.logging.LogDomains; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import java.util.List; import java.util.Properties; import java.util.logging.Level; @@ -29,14 +37,6 @@ import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.types.Property; -import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; -import com.sun.appserv.connectors.internal.api.ConnectorsUtil; -import com.sun.enterprise.connectors.ConnectorRuntime; -import com.sun.logging.LogDomains; - -import jakarta.inject.Inject; -import jakarta.inject.Singleton; - /** * @author Srikanth P */ diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectionFactoryDefinitionDeployer.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectionFactoryDefinitionDeployer.java index 211b4b1ab34..09236fc0b28 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectionFactoryDefinitionDeployer.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectionFactoryDefinitionDeployer.java @@ -20,6 +20,7 @@ import com.sun.enterprise.config.serverbeans.Resource; import com.sun.enterprise.config.serverbeans.Resources; import com.sun.enterprise.deployment.ConnectionFactoryDefinitionDescriptor; + import jakarta.inject.Inject; import jakarta.inject.Provider; diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectorWorkSecurityMapDeployer.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectorWorkSecurityMapDeployer.java index 4ba95871530..35e42a31286 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectorWorkSecurityMapDeployer.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/ConnectorWorkSecurityMapDeployer.java @@ -17,12 +17,12 @@ package com.sun.enterprise.resource.deployer; +import jakarta.inject.Singleton; + import org.glassfish.connectors.config.WorkSecurityMap; import org.glassfish.resourcebase.resources.api.ResourceDeployerInfo; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Singleton; - @Service @Singleton @ResourceDeployerInfo(WorkSecurityMap.class) diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/JMSDestinationDefinitionDeployer.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/JMSDestinationDefinitionDeployer.java index 0b6dd398db0..cc664547774 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/JMSDestinationDefinitionDeployer.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/JMSDestinationDefinitionDeployer.java @@ -17,7 +17,13 @@ package com.sun.enterprise.resource.deployer; -import static com.sun.appserv.connectors.internal.api.ConnectorsUtil.deriveResourceName; +import com.sun.appserv.connectors.internal.api.ConnectorConstants; +import com.sun.enterprise.config.serverbeans.Resource; +import com.sun.enterprise.config.serverbeans.Resources; +import com.sun.enterprise.deployment.JMSDestinationDefinitionDescriptor; + +import jakarta.inject.Inject; +import jakarta.inject.Provider; import java.beans.PropertyVetoException; import java.util.ArrayList; @@ -35,13 +41,7 @@ import org.jvnet.hk2.config.TransactionFailure; import org.jvnet.hk2.config.types.Property; -import com.sun.appserv.connectors.internal.api.ConnectorConstants; -import com.sun.enterprise.config.serverbeans.Resource; -import com.sun.enterprise.config.serverbeans.Resources; -import com.sun.enterprise.deployment.JMSDestinationDefinitionDescriptor; - -import jakarta.inject.Inject; -import jakarta.inject.Provider; +import static com.sun.appserv.connectors.internal.api.ConnectorsUtil.deriveResourceName; @Service @ResourceDeployerInfo(JMSDestinationDefinitionDescriptor.class) diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/listener/LocalTxConnectionEventListener.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/listener/LocalTxConnectionEventListener.java index e75398fd062..36c03a57491 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/listener/LocalTxConnectionEventListener.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/listener/LocalTxConnectionEventListener.java @@ -17,9 +17,6 @@ package com.sun.enterprise.resource.listener; -import java.util.IdentityHashMap; -import java.util.Map; - import com.sun.enterprise.connectors.ConnectorRuntime; import com.sun.enterprise.resource.ResourceHandle; import com.sun.enterprise.resource.pool.PoolManager; @@ -27,6 +24,9 @@ import jakarta.resource.spi.ConnectionEvent; import jakarta.resource.spi.ManagedConnection; +import java.util.IdentityHashMap; +import java.util.Map; + /** * @author Binod P.G */ diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/listener/UnpooledConnectionEventListener.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/listener/UnpooledConnectionEventListener.java index 728e752cc09..4776346f183 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/listener/UnpooledConnectionEventListener.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/listener/UnpooledConnectionEventListener.java @@ -17,13 +17,13 @@ package com.sun.enterprise.resource.listener; -import java.util.logging.Logger; - import com.sun.logging.LogDomains; import jakarta.resource.spi.ConnectionEvent; import jakarta.resource.spi.ManagedConnection; +import java.util.logging.Logger; + /** * This class is a ConnectionEventListener for handling the "close" of a ManagedConnection that is not acquired through * the appserver's pool. diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/naming/DynamicResourceReconfigurator.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/naming/DynamicResourceReconfigurator.java index 54780d4859d..cd4dcae9309 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/naming/DynamicResourceReconfigurator.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/naming/DynamicResourceReconfigurator.java @@ -22,11 +22,10 @@ import com.sun.enterprise.connectors.ConnectorRuntime; import com.sun.enterprise.resource.DynamicallyReconfigurableResource; import com.sun.logging.LogDomains; -import org.glassfish.resourcebase.resources.api.ResourceInfo; -import org.glassfish.resourcebase.resources.naming.ResourceNamingService; import jakarta.resource.ResourceException; import jakarta.resource.spi.RetryableUnavailableException; + import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -34,6 +33,9 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.glassfish.resourcebase.resources.api.ResourceInfo; +import org.glassfish.resourcebase.resources.naming.ResourceNamingService; + /** * Invocation Handler used by proxy to connection-factory objects
      diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/AbstractPoolManager.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/AbstractPoolManager.java index 061870ddd04..151df17f5bf 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/AbstractPoolManager.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/AbstractPoolManager.java @@ -17,12 +17,12 @@ package com.sun.enterprise.resource.pool; +import com.sun.enterprise.resource.ResourceSpec; + import java.util.concurrent.ConcurrentHashMap; import org.glassfish.resourcebase.resources.api.PoolInfo; -import com.sun.enterprise.resource.ResourceSpec; - /** * Abstract Pool manager for unimplemented features. Throws UnsupportedOperationException when invoked. */ diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/AssocWithThreadResourcePool.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/AssocWithThreadResourcePool.java index 3fbfd34e4e7..3fd9d5265bf 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/AssocWithThreadResourcePool.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/AssocWithThreadResourcePool.java @@ -17,10 +17,6 @@ package com.sun.enterprise.resource.pool; -import java.util.Hashtable; - -import org.glassfish.resourcebase.resources.api.PoolInfo; - import com.sun.appserv.connectors.internal.api.PoolingException; import com.sun.enterprise.resource.AssocWithThreadResourceHandle; import com.sun.enterprise.resource.ResourceHandle; @@ -32,6 +28,10 @@ import jakarta.transaction.Transaction; +import java.util.Hashtable; + +import org.glassfish.resourcebase.resources.api.PoolInfo; + /** * Associates a resource with the thread. When the same thread is used again, it checks whether the resource associated * with the thread can serve the request. diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ConnectionLeakDetector.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ConnectionLeakDetector.java index 6cec3cb203b..ae2709536c0 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ConnectionLeakDetector.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ConnectionLeakDetector.java @@ -17,6 +17,10 @@ package com.sun.enterprise.resource.pool; +import com.sun.enterprise.connectors.ConnectorRuntime; +import com.sun.enterprise.resource.ResourceHandle; +import com.sun.logging.LogDomains; + import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; @@ -27,10 +31,6 @@ import org.glassfish.resourcebase.resources.api.PoolInfo; -import com.sun.enterprise.connectors.ConnectorRuntime; -import com.sun.enterprise.resource.ResourceHandle; -import com.sun.logging.LogDomains; - /** * Connection leak detector, book keeps the caller stack-trace during getConnection()
      * Once the leak-timeout expires, assumes a connection leak and prints the caller stack-trace
      diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolLifeCycleListenerRegistry.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolLifeCycleListenerRegistry.java index ab4497d0b05..07e2560e9c8 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolLifeCycleListenerRegistry.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolLifeCycleListenerRegistry.java @@ -17,14 +17,14 @@ package com.sun.enterprise.resource.pool; +import com.sun.enterprise.connectors.ConnectorRuntime; +import com.sun.enterprise.resource.listener.PoolLifeCycleListener; + import java.util.ArrayList; import java.util.List; import org.glassfish.resourcebase.resources.api.PoolInfo; -import com.sun.enterprise.connectors.ConnectorRuntime; -import com.sun.enterprise.resource.listener.PoolLifeCycleListener; - /** * Implementation of PoolLifeCycleListener to listen to events related to a connection pool. The registry allows * multiple listeners (ex: pool monitoring) to listen to the pool's lifecyle. Maintains a list of listeners for this diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolLifeCycleRegistry.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolLifeCycleRegistry.java index cd9e6c831eb..9a8acf605bc 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolLifeCycleRegistry.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolLifeCycleRegistry.java @@ -17,16 +17,16 @@ package com.sun.enterprise.resource.pool; -import java.util.ArrayList; -import java.util.List; - -import org.glassfish.resourcebase.resources.api.PoolInfo; - import com.sun.enterprise.connectors.ConnectorRuntime; import com.sun.enterprise.resource.listener.PoolLifeCycle; import jakarta.inject.Singleton; +import java.util.ArrayList; +import java.util.List; + +import org.glassfish.resourcebase.resources.api.PoolInfo; + /** * Implementation of PoolLifeCycle to listen to events related to a connection pool creation or destroy. The registry * allows multiple listeners (ex: pool monitoring or self management) to listen to the pool's lifecyle. Maintains a list diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolManagerImpl.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolManagerImpl.java index 7a926156e2c..c34a612fb00 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolManagerImpl.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolManagerImpl.java @@ -17,27 +17,6 @@ package com.sun.enterprise.resource.pool; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.INFO; -import static java.util.logging.Level.SEVERE; -import static java.util.logging.Level.WARNING; -import static javax.transaction.xa.XAResource.TMSUCCESS; - -import java.util.ArrayList; -import java.util.Hashtable; -import java.util.List; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.glassfish.api.invocation.ComponentInvocation; -import org.glassfish.api.invocation.ComponentInvocationHandler; -import org.glassfish.api.invocation.InvocationException; -import org.glassfish.api.naming.SimpleJndiName; -import org.glassfish.resourcebase.resources.api.PoolInfo; -import org.jvnet.hk2.annotations.Service; - import com.sun.appserv.connectors.internal.api.ConnectorConstants.PoolType; import com.sun.appserv.connectors.internal.api.ConnectorRuntime; import com.sun.appserv.connectors.internal.api.PoolingException; @@ -69,6 +48,27 @@ import jakarta.transaction.Synchronization; import jakarta.transaction.Transaction; +import java.util.ArrayList; +import java.util.Hashtable; +import java.util.List; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.glassfish.api.invocation.ComponentInvocation; +import org.glassfish.api.invocation.ComponentInvocationHandler; +import org.glassfish.api.invocation.InvocationException; +import org.glassfish.api.naming.SimpleJndiName; +import org.glassfish.resourcebase.resources.api.PoolInfo; +import org.jvnet.hk2.annotations.Service; + +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.INFO; +import static java.util.logging.Level.SEVERE; +import static java.util.logging.Level.WARNING; +import static javax.transaction.xa.XAResource.TMSUCCESS; + /** * @author Tony Ng, Aditya Gore */ diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolTxHelper.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolTxHelper.java index ebba5380882..4b66f2ca461 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolTxHelper.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolTxHelper.java @@ -17,6 +17,15 @@ package com.sun.enterprise.resource.pool; +import com.sun.enterprise.connectors.ConnectorRuntime; +import com.sun.enterprise.resource.ResourceHandle; +import com.sun.enterprise.resource.ResourceState; +import com.sun.enterprise.transaction.api.JavaEETransaction; +import com.sun.logging.LogDomains; + +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; + import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; @@ -27,15 +36,6 @@ import org.glassfish.resourcebase.resources.api.PoolInfo; -import com.sun.enterprise.connectors.ConnectorRuntime; -import com.sun.enterprise.resource.ResourceHandle; -import com.sun.enterprise.resource.ResourceState; -import com.sun.enterprise.transaction.api.JavaEETransaction; -import com.sun.logging.LogDomains; - -import jakarta.transaction.SystemException; -import jakarta.transaction.Transaction; - /** * Transaction helper for the pool to check various states of a resource that is taking part in the transaction. * diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ResourceGateway.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ResourceGateway.java index b9a504b1a32..c66a6273fb7 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ResourceGateway.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ResourceGateway.java @@ -17,14 +17,14 @@ package com.sun.enterprise.resource.pool; +import com.sun.appserv.connectors.internal.api.PoolingException; +import com.sun.logging.LogDomains; + import java.security.AccessController; import java.security.PrivilegedAction; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.appserv.connectors.internal.api.PoolingException; -import com.sun.logging.LogDomains; - /** * Resource gateway used to restrict the resource access. eg: based on priority. * diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ResourceHandler.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ResourceHandler.java index 1300615078d..7727c70fc5c 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ResourceHandler.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ResourceHandler.java @@ -17,8 +17,6 @@ package com.sun.enterprise.resource.pool; -import java.util.Set; - import com.sun.appserv.connectors.internal.api.PoolingException; import com.sun.enterprise.resource.ResourceHandle; import com.sun.enterprise.resource.allocator.ResourceAllocator; @@ -26,6 +24,8 @@ import jakarta.resource.ResourceException; import jakarta.resource.spi.ManagedConnection; +import java.util.Set; + /** * ResourceHandler to create/delete resource * diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ResourcePool.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ResourcePool.java index 455c9817ec2..36bb4a50dcf 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ResourcePool.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ResourcePool.java @@ -17,8 +17,6 @@ package com.sun.enterprise.resource.pool; -import org.glassfish.resourcebase.resources.api.PoolInfo; - import com.sun.appserv.connectors.internal.api.PoolingException; import com.sun.enterprise.connectors.ConnectorConnectionPool; import com.sun.enterprise.resource.ResourceHandle; @@ -30,6 +28,8 @@ import jakarta.resource.spi.RetryableUnavailableException; import jakarta.transaction.Transaction; +import org.glassfish.resourcebase.resources.api.PoolInfo; + /** * @author Tony Ng */ diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ResourcePoolFactoryImpl.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ResourcePoolFactoryImpl.java index 9b742bddc21..861510b2a2e 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ResourcePoolFactoryImpl.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ResourcePoolFactoryImpl.java @@ -17,17 +17,17 @@ package com.sun.enterprise.resource.pool; -import static java.util.logging.Level.FINE; +import com.sun.appserv.connectors.internal.api.ConnectorConstants.PoolType; +import com.sun.appserv.connectors.internal.api.PoolingException; +import com.sun.enterprise.connectors.ConnectorRuntime; +import com.sun.logging.LogDomains; import java.util.Hashtable; import java.util.logging.Logger; import org.glassfish.resourcebase.resources.api.PoolInfo; -import com.sun.appserv.connectors.internal.api.ConnectorConstants.PoolType; -import com.sun.appserv.connectors.internal.api.PoolingException; -import com.sun.enterprise.connectors.ConnectorRuntime; -import com.sun.logging.LogDomains; +import static java.util.logging.Level.FINE; /** * Factory to create appropriate connection pool. diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/datastructure/DataStructureFactory.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/datastructure/DataStructureFactory.java index 860da482041..870fd74b445 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/datastructure/DataStructureFactory.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/datastructure/DataStructureFactory.java @@ -17,8 +17,9 @@ package com.sun.enterprise.resource.pool.datastructure; -import static java.util.logging.Level.FINEST; -import static java.util.logging.Level.WARNING; +import com.sun.appserv.connectors.internal.api.PoolingException; +import com.sun.enterprise.resource.pool.ResourceHandler; +import com.sun.logging.LogDomains; import java.lang.reflect.Constructor; import java.security.AccessController; @@ -26,9 +27,8 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.appserv.connectors.internal.api.PoolingException; -import com.sun.enterprise.resource.pool.ResourceHandler; -import com.sun.logging.LogDomains; +import static java.util.logging.Level.FINEST; +import static java.util.logging.Level.WARNING; /** * Factory to create appropriate datastructure type for the pool
      diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/ConnectionPoolProbeProviderUtil.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/ConnectionPoolProbeProviderUtil.java index ed4433d3ee5..787a17506b7 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/ConnectionPoolProbeProviderUtil.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/ConnectionPoolProbeProviderUtil.java @@ -17,17 +17,17 @@ package com.sun.enterprise.resource.pool.monitor; -import java.util.Collection; - -import org.glassfish.hk2.api.ServiceLocator; -import org.jvnet.hk2.annotations.Service; - import com.sun.enterprise.connectors.ConnectionPoolMonitoringExtension; import com.sun.enterprise.connectors.ConnectorRuntime; import jakarta.inject.Inject; import jakarta.inject.Provider; +import java.util.Collection; + +import org.glassfish.hk2.api.ServiceLocator; +import org.jvnet.hk2.annotations.Service; + /** * Utility class to create providers for monitoring purposes. * diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/PoolMonitoringLevelListener.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/PoolMonitoringLevelListener.java index f7af42559af..8a4120d8c20 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/PoolMonitoringLevelListener.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/PoolMonitoringLevelListener.java @@ -17,6 +17,16 @@ package com.sun.enterprise.resource.pool.monitor; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.ModuleMonitoringLevels; +import com.sun.enterprise.config.serverbeans.MonitoringService; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.logging.LogDomains; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import java.beans.PropertyChangeEvent; import java.util.logging.Level; import java.util.logging.Logger; @@ -33,16 +43,6 @@ import org.jvnet.hk2.config.ObservableBean; import org.jvnet.hk2.config.UnprocessedChangeEvents; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.ModuleMonitoringLevels; -import com.sun.enterprise.config.serverbeans.MonitoringService; -import com.sun.enterprise.config.serverbeans.Server; -import com.sun.logging.LogDomains; - -import jakarta.inject.Inject; -import jakarta.inject.Singleton; - @Service @Singleton public class PoolMonitoringLevelListener implements PostConstruct, PreDestroy, ConfigListener { diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/resizer/AssocWithThreadPoolResizer.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/resizer/AssocWithThreadPoolResizer.java index 722a1b825b9..1d8b5755a02 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/resizer/AssocWithThreadPoolResizer.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/resizer/AssocWithThreadPoolResizer.java @@ -17,12 +17,6 @@ package com.sun.enterprise.resource.pool.resizer; -import java.util.HashSet; -import java.util.Set; -import java.util.logging.Level; - -import org.glassfish.resourcebase.resources.api.PoolInfo; - import com.sun.enterprise.resource.AssocWithThreadResourceHandle; import com.sun.enterprise.resource.ResourceHandle; import com.sun.enterprise.resource.ResourceState; @@ -33,6 +27,12 @@ import jakarta.resource.ResourceException; import jakarta.resource.spi.ManagedConnection; +import java.util.HashSet; +import java.util.Set; +import java.util.logging.Level; + +import org.glassfish.resourcebase.resources.api.PoolInfo; + /** * Resizer for Associate With Thread type pools to remove unusable connections * and maintain steady pool size. diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/resizer/Resizer.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/resizer/Resizer.java index 64fe247456f..1a9a9308952 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/resizer/Resizer.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/resizer/Resizer.java @@ -17,17 +17,6 @@ package com.sun.enterprise.resource.pool.resizer; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.FINEST; - -import java.util.HashSet; -import java.util.Set; -import java.util.TimerTask; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.glassfish.resourcebase.resources.api.PoolInfo; - import com.sun.appserv.connectors.internal.api.PoolingException; import com.sun.enterprise.resource.ResourceHandle; import com.sun.enterprise.resource.ResourceState; @@ -40,6 +29,17 @@ import jakarta.resource.ResourceException; import jakarta.resource.spi.ManagedConnection; +import java.util.HashSet; +import java.util.Set; +import java.util.TimerTask; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.glassfish.resourcebase.resources.api.PoolInfo; + +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.FINEST; + /** * Resizer to remove unusable connections, maintain steady-pool
      * diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/waitqueue/DefaultPoolWaitQueue.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/waitqueue/DefaultPoolWaitQueue.java index 9e9b76ee254..438efc35a33 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/waitqueue/DefaultPoolWaitQueue.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/waitqueue/DefaultPoolWaitQueue.java @@ -17,13 +17,13 @@ package com.sun.enterprise.resource.pool.waitqueue; +import com.sun.logging.LogDomains; + import java.util.Collection; import java.util.LinkedList; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.logging.LogDomains; - /** * Default wait queue for the connection pool * diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/waitqueue/PoolWaitQueueFactory.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/waitqueue/PoolWaitQueueFactory.java index 6b9c2f365dd..46fc92ca5ce 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/waitqueue/PoolWaitQueueFactory.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/waitqueue/PoolWaitQueueFactory.java @@ -17,16 +17,16 @@ package com.sun.enterprise.resource.pool.waitqueue; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.FINEST; -import static java.util.logging.Level.WARNING; +import com.sun.appserv.connectors.internal.api.PoolingException; +import com.sun.logging.LogDomains; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.logging.Logger; -import com.sun.appserv.connectors.internal.api.PoolingException; -import com.sun.logging.LogDomains; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.FINEST; +import static java.util.logging.Level.WARNING; /** * Factory to create appropriate Pool Wait Queue diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/recovery/ThirdPartyRecoveryResourceHandler.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/recovery/ThirdPartyRecoveryResourceHandler.java index ff28fbb4894..3af27e7ccbb 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/recovery/ThirdPartyRecoveryResourceHandler.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/recovery/ThirdPartyRecoveryResourceHandler.java @@ -17,6 +17,12 @@ package com.sun.enterprise.resource.recovery; +import com.sun.enterprise.transaction.api.RecoveryResourceRegistry; +import com.sun.enterprise.transaction.spi.RecoveryResourceHandler; +import com.sun.enterprise.transaction.spi.RecoveryResourceListener; + +import jakarta.inject.Inject; + import java.util.List; import java.util.Set; @@ -24,12 +30,6 @@ import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.transaction.api.RecoveryResourceRegistry; -import com.sun.enterprise.transaction.spi.RecoveryResourceHandler; -import com.sun.enterprise.transaction.spi.RecoveryResourceListener; - -import jakarta.inject.Inject; - /** * RecoveryResourceHandler for third party resources * diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/rm/LazyEnlistableResourceManagerImpl.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/rm/LazyEnlistableResourceManagerImpl.java index b50b8e96e8a..58954983780 100755 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/rm/LazyEnlistableResourceManagerImpl.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/rm/LazyEnlistableResourceManagerImpl.java @@ -17,15 +17,6 @@ package com.sun.enterprise.resource.rm; -import static com.sun.logging.LogDomains.RSR_LOGGER; -import static java.util.logging.Level.WARNING; - -import java.util.List; -import java.util.ListIterator; -import java.util.logging.Logger; - -import org.glassfish.api.invocation.ComponentInvocation; - import com.sun.appserv.connectors.internal.api.PoolingException; import com.sun.enterprise.connectors.ConnectorRuntime; import com.sun.enterprise.resource.ResourceHandle; @@ -37,6 +28,15 @@ import jakarta.transaction.SystemException; import jakarta.transaction.Transaction; +import java.util.List; +import java.util.ListIterator; +import java.util.logging.Logger; + +import org.glassfish.api.invocation.ComponentInvocation; + +import static com.sun.logging.LogDomains.RSR_LOGGER; +import static java.util.logging.Level.WARNING; + /** * This class is used for lazy enlistment of a resource * diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/rm/NoTxResourceManagerImpl.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/rm/NoTxResourceManagerImpl.java index 5431abea732..e10eae73a96 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/rm/NoTxResourceManagerImpl.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/rm/NoTxResourceManagerImpl.java @@ -17,14 +17,14 @@ package com.sun.enterprise.resource.rm; -import java.util.logging.Logger; - import com.sun.appserv.connectors.internal.api.PoolingException; import com.sun.enterprise.resource.ResourceHandle; import com.sun.logging.LogDomains; import jakarta.transaction.Transaction; +import java.util.logging.Logger; + /** * Resource Manager for a resource request from a component that is not to be associated with a transaction. * diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/rm/ResourceManagerImpl.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/rm/ResourceManagerImpl.java index 1356032856b..b9fd0b269ca 100755 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/rm/ResourceManagerImpl.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/rm/ResourceManagerImpl.java @@ -17,17 +17,6 @@ package com.sun.enterprise.resource.rm; -import static java.util.logging.Level.FINEST; -import static java.util.logging.Level.INFO; -import static java.util.logging.Level.SEVERE; -import static java.util.logging.Level.WARNING; - -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.glassfish.api.invocation.ComponentInvocation; -import org.glassfish.api.invocation.InvocationException; - import com.sun.appserv.connectors.internal.api.PoolingException; import com.sun.enterprise.connectors.ConnectorRuntime; import com.sun.enterprise.resource.ResourceHandle; @@ -37,6 +26,17 @@ import jakarta.transaction.SystemException; import jakarta.transaction.Transaction; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.glassfish.api.invocation.ComponentInvocation; +import org.glassfish.api.invocation.InvocationException; + +import static java.util.logging.Level.FINEST; +import static java.util.logging.Level.INFO; +import static java.util.logging.Level.SEVERE; +import static java.util.logging.Level.WARNING; + /** * Resource Manager for any resource request from a component. * diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/rm/SystemResourceManagerImpl.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/rm/SystemResourceManagerImpl.java index 6f3d9cdde56..a693bc17ca9 100755 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/rm/SystemResourceManagerImpl.java +++ b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/rm/SystemResourceManagerImpl.java @@ -17,12 +17,6 @@ package com.sun.enterprise.resource.rm; -import static java.util.logging.Level.FINEST; -import static java.util.logging.Level.SEVERE; -import static java.util.logging.Level.WARNING; - -import java.util.logging.Logger; - import com.sun.appserv.connectors.internal.api.PoolingException; import com.sun.enterprise.connectors.ConnectorRuntime; import com.sun.enterprise.resource.ResourceHandle; @@ -32,6 +26,12 @@ import jakarta.transaction.SystemException; import jakarta.transaction.Transaction; +import java.util.logging.Logger; + +import static java.util.logging.Level.FINEST; +import static java.util.logging.Level.SEVERE; +import static java.util.logging.Level.WARNING; + /** * SystemResourceManagerImpl manages the resource requests from system * diff --git a/appserver/connectors/connectors-runtime/src/test/java/com/sun/enterprise/resource/listener/LocalTxConnectionEventListenerTest.java b/appserver/connectors/connectors-runtime/src/test/java/com/sun/enterprise/resource/listener/LocalTxConnectionEventListenerTest.java index ee02d2a19af..2ded2bbc40b 100644 --- a/appserver/connectors/connectors-runtime/src/test/java/com/sun/enterprise/resource/listener/LocalTxConnectionEventListenerTest.java +++ b/appserver/connectors/connectors-runtime/src/test/java/com/sun/enterprise/resource/listener/LocalTxConnectionEventListenerTest.java @@ -16,17 +16,6 @@ package com.sun.enterprise.resource.listener; -import static org.easymock.EasyMock.createNiceMock; -import static org.easymock.EasyMock.replay; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; - -import java.util.Map; - -import org.glassfish.api.naming.SimpleJndiName; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - import com.sun.appserv.connectors.internal.api.PoolingException; import com.sun.enterprise.connectors.ConnectorRuntime; import com.sun.enterprise.resource.ResourceHandle; @@ -35,6 +24,17 @@ import jakarta.resource.ResourceException; import jakarta.resource.spi.ManagedConnection; +import java.util.Map; + +import org.glassfish.api.naming.SimpleJndiName; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.replay; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + public class LocalTxConnectionEventListenerTest { @BeforeEach diff --git a/appserver/connectors/connectors-runtime/src/test/java/com/sun/enterprise/resource/pool/ConnectionPoolTest.java b/appserver/connectors/connectors-runtime/src/test/java/com/sun/enterprise/resource/pool/ConnectionPoolTest.java index f080c09c95f..6fea4229fb3 100644 --- a/appserver/connectors/connectors-runtime/src/test/java/com/sun/enterprise/resource/pool/ConnectionPoolTest.java +++ b/appserver/connectors/connectors-runtime/src/test/java/com/sun/enterprise/resource/pool/ConnectionPoolTest.java @@ -16,19 +16,26 @@ package com.sun.enterprise.resource.pool; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.createNiceMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.isNull; -import static org.easymock.EasyMock.notNull; -import static org.easymock.EasyMock.replay; -import static org.junit.jupiter.api.Assertions.assertAll; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; +import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; +import com.sun.appserv.connectors.internal.api.PoolingException; +import com.sun.enterprise.connectors.ConnectorConnectionPool; +import com.sun.enterprise.connectors.ConnectorRuntime; +import com.sun.enterprise.connectors.util.ConnectionPoolObjectsUtils; +import com.sun.enterprise.deployment.ConnectorDescriptor; +import com.sun.enterprise.resource.ResourceHandle; +import com.sun.enterprise.resource.ResourceSpec; +import com.sun.enterprise.resource.ResourceState; +import com.sun.enterprise.resource.allocator.LocalTxConnectorAllocator; +import com.sun.enterprise.resource.allocator.ResourceAllocator; +import com.sun.enterprise.resource.pool.datastructure.DataStructure; +import com.sun.enterprise.transaction.api.JavaEETransaction; +import com.sun.logging.LogDomains; + +import jakarta.resource.ResourceException; +import jakarta.resource.spi.ManagedConnection; +import jakarta.resource.spi.ManagedConnectionFactory; +import jakarta.resource.spi.RetryableUnavailableException; +import jakarta.transaction.Transaction; import java.util.ArrayList; import java.util.Collections; @@ -54,26 +61,19 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; -import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; -import com.sun.appserv.connectors.internal.api.PoolingException; -import com.sun.enterprise.connectors.ConnectorConnectionPool; -import com.sun.enterprise.connectors.ConnectorRuntime; -import com.sun.enterprise.connectors.util.ConnectionPoolObjectsUtils; -import com.sun.enterprise.deployment.ConnectorDescriptor; -import com.sun.enterprise.resource.ResourceHandle; -import com.sun.enterprise.resource.ResourceSpec; -import com.sun.enterprise.resource.ResourceState; -import com.sun.enterprise.resource.allocator.LocalTxConnectorAllocator; -import com.sun.enterprise.resource.allocator.ResourceAllocator; -import com.sun.enterprise.resource.pool.datastructure.DataStructure; -import com.sun.enterprise.transaction.api.JavaEETransaction; -import com.sun.logging.LogDomains; - -import jakarta.resource.ResourceException; -import jakarta.resource.spi.ManagedConnection; -import jakarta.resource.spi.ManagedConnectionFactory; -import jakarta.resource.spi.RetryableUnavailableException; -import jakarta.transaction.Transaction; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.isNull; +import static org.easymock.EasyMock.notNull; +import static org.easymock.EasyMock.replay; +import static org.junit.jupiter.api.Assertions.assertAll; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class ConnectionPoolTest { diff --git a/appserver/connectors/connectors-runtime/src/test/java/com/sun/enterprise/resource/pool/datastructure/RWLockDataStructureTest.java b/appserver/connectors/connectors-runtime/src/test/java/com/sun/enterprise/resource/pool/datastructure/RWLockDataStructureTest.java index 5dbd7930a68..7c13e8ce5c3 100644 --- a/appserver/connectors/connectors-runtime/src/test/java/com/sun/enterprise/resource/pool/datastructure/RWLockDataStructureTest.java +++ b/appserver/connectors/connectors-runtime/src/test/java/com/sun/enterprise/resource/pool/datastructure/RWLockDataStructureTest.java @@ -48,8 +48,8 @@ import static org.easymock.EasyMock.replay; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.nullValue; -import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasSize; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/CommonWorkManager.java b/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/CommonWorkManager.java index f0403de0790..2364a4731ea 100755 --- a/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/CommonWorkManager.java +++ b/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/CommonWorkManager.java @@ -16,26 +16,32 @@ package com.sun.enterprise.connectors.work; -import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; -import com.sun.appserv.connectors.internal.api.ConnectorRuntime; import com.sun.appserv.connectors.internal.api.ConnectorConstants; +import com.sun.appserv.connectors.internal.api.ConnectorRuntime; +import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; import com.sun.appserv.connectors.internal.api.ConnectorsUtil; -import com.sun.corba.ee.spi.threadpool.ThreadPoolManager; -import com.sun.corba.ee.spi.threadpool.ThreadPool; import com.sun.corba.ee.spi.threadpool.NoSuchThreadPoolException; +import com.sun.corba.ee.spi.threadpool.ThreadPool; +import com.sun.corba.ee.spi.threadpool.ThreadPoolManager; +import com.sun.enterprise.connectors.work.context.WorkContextHandlerImpl; import com.sun.enterprise.connectors.work.monitor.WorkManagementProbeProvider; import com.sun.enterprise.connectors.work.monitor.WorkManagementStatsProvider; -import com.sun.enterprise.connectors.work.context.WorkContextHandlerImpl; -import jakarta.resource.spi.work.*; +import jakarta.resource.spi.work.ExecutionContext; +import jakarta.resource.spi.work.Work; +import jakarta.resource.spi.work.WorkCompletedException; +import jakarta.resource.spi.work.WorkException; +import jakarta.resource.spi.work.WorkListener; +import jakarta.resource.spi.work.WorkManager; +import jakarta.resource.spi.work.WorkRejectedException; import java.text.MessageFormat; import java.util.logging.Level; import java.util.logging.Logger; -import org.glassfish.external.probe.provider.StatsProviderManager; -import org.glassfish.external.probe.provider.PluginPoint; import org.glassfish.enterprise.iiop.util.S1ASThreadPoolManager; +import org.glassfish.external.probe.provider.PluginPoint; +import org.glassfish.external.probe.provider.StatsProviderManager; import org.glassfish.logging.annotation.LogMessageInfo; diff --git a/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/LogFacade.java b/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/LogFacade.java index e8d990baf90..c0291664168 100644 --- a/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/LogFacade.java +++ b/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/LogFacade.java @@ -17,8 +17,9 @@ package com.sun.enterprise.connectors.work; import java.util.logging.Logger; -import org.glassfish.logging.annotation.LoggerInfo; + import org.glassfish.logging.annotation.LogMessagesResourceBundle; +import org.glassfish.logging.annotation.LoggerInfo; public class LogFacade { diff --git a/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/OneWork.java b/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/OneWork.java index 78e984668fa..01d129101a0 100755 --- a/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/OneWork.java +++ b/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/OneWork.java @@ -16,9 +16,11 @@ package com.sun.enterprise.connectors.work; +import jakarta.resource.spi.work.Work; + import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.resource.spi.work.Work; + import org.glassfish.logging.annotation.LogMessageInfo; /** diff --git a/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/WorkCoordinator.java b/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/WorkCoordinator.java index 5afbb6a1039..28d8ad02920 100755 --- a/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/WorkCoordinator.java +++ b/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/WorkCoordinator.java @@ -16,16 +16,24 @@ package com.sun.enterprise.connectors.work; +import com.sun.appserv.connectors.internal.api.ConnectorRuntime; import com.sun.corba.ee.spi.threadpool.WorkQueue; -import com.sun.enterprise.transaction.api.JavaEETransactionManager; import com.sun.enterprise.connectors.work.context.WorkContextHandlerImpl; import com.sun.enterprise.connectors.work.monitor.WorkManagementProbeProvider; import com.sun.enterprise.security.SecurityContext; -import com.sun.appserv.connectors.internal.api.ConnectorRuntime; +import com.sun.enterprise.transaction.api.JavaEETransactionManager; import jakarta.resource.ResourceException; import jakarta.resource.spi.ResourceAdapterAssociation; -import jakarta.resource.spi.work.*; +import jakarta.resource.spi.work.ExecutionContext; +import jakarta.resource.spi.work.Work; +import jakarta.resource.spi.work.WorkCompletedException; +import jakarta.resource.spi.work.WorkEvent; +import jakarta.resource.spi.work.WorkException; +import jakarta.resource.spi.work.WorkListener; +import jakarta.resource.spi.work.WorkRejectedException; + +import java.util.logging.Logger; import org.glassfish.logging.annotation.LogMessageInfo; @@ -33,8 +41,6 @@ import static java.util.logging.Level.SEVERE; import static java.util.logging.Level.WARNING; -import java.util.logging.Logger; - /** * WorkCoordinator : Coordinates one work's execution. Handles all exception conditions and does JTS coordination. * diff --git a/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/WorkManagerFactoryImpl.java b/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/WorkManagerFactoryImpl.java index 72bf2b72f79..38e86f78183 100755 --- a/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/WorkManagerFactoryImpl.java +++ b/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/WorkManagerFactoryImpl.java @@ -16,18 +16,15 @@ package com.sun.enterprise.connectors.work; -import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; import com.sun.appserv.connectors.internal.api.ConnectorRuntime; +import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; import com.sun.appserv.connectors.internal.api.WorkManagerFactory; -import org.glassfish.logging.annotation.LogMessageInfo; -import org.jvnet.hk2.annotations.Service; - -import jakarta.inject.Singleton; - import jakarta.inject.Inject; import jakarta.inject.Provider; +import jakarta.inject.Singleton; import jakarta.resource.spi.work.WorkManager; + import java.lang.reflect.Method; import java.util.Collections; import java.util.HashMap; @@ -35,6 +32,9 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.glassfish.logging.annotation.LogMessageInfo; +import org.jvnet.hk2.annotations.Service; + /** * WorkManagerFactoryImpl allows other customized WorkManager implementation * to be plugged into the server. The name of the customized diff --git a/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/WorkManagerProxy.java b/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/WorkManagerProxy.java index 9cd61d67e47..3dfac93bfa3 100755 --- a/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/WorkManagerProxy.java +++ b/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/WorkManagerProxy.java @@ -17,8 +17,16 @@ package com.sun.enterprise.connectors.work; -import jakarta.resource.spi.work.*; -import java.io.*; +import jakarta.resource.spi.work.ExecutionContext; +import jakarta.resource.spi.work.Work; +import jakarta.resource.spi.work.WorkException; +import jakarta.resource.spi.work.WorkListener; +import jakarta.resource.spi.work.WorkManager; + +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; /** * Proxy for WorkManager.
      diff --git a/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/context/ConnectorCallbackHandler.java b/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/context/ConnectorCallbackHandler.java index 7d84b4b4eeb..95238f6baec 100644 --- a/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/context/ConnectorCallbackHandler.java +++ b/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/context/ConnectorCallbackHandler.java @@ -17,9 +17,12 @@ package com.sun.enterprise.connectors.work.context; -import static com.sun.enterprise.util.Utility.isEmpty; -import static java.util.logging.Level.FINEST; -import static java.util.logging.Level.WARNING; +import com.sun.enterprise.connectors.work.LogFacade; +import com.sun.enterprise.security.SecurityContext; + +import jakarta.security.auth.message.callback.CallerPrincipalCallback; +import jakarta.security.auth.message.callback.GroupPrincipalCallback; +import jakarta.security.auth.message.callback.PasswordValidationCallback; import java.io.IOException; import java.security.Principal; @@ -34,18 +37,15 @@ import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; +import org.glassfish.epicyro.config.helper.Caller; +import org.glassfish.epicyro.config.helper.CallerPrincipal; import org.glassfish.logging.annotation.LogMessageInfo; import org.glassfish.security.common.Group; import org.glassfish.security.common.UserNameAndPassword; -import org.glassfish.epicyro.config.helper.Caller; -import org.glassfish.epicyro.config.helper.CallerPrincipal; - -import com.sun.enterprise.connectors.work.LogFacade; -import com.sun.enterprise.security.SecurityContext; -import jakarta.security.auth.message.callback.CallerPrincipalCallback; -import jakarta.security.auth.message.callback.GroupPrincipalCallback; -import jakarta.security.auth.message.callback.PasswordValidationCallback; +import static com.sun.enterprise.util.Utility.isEmpty; +import static java.util.logging.Level.FINEST; +import static java.util.logging.Level.WARNING; /** * Connector callback handler to intercept the callbacks provided by the work instance in order to map the security diff --git a/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/context/WorkContextHandlerImpl.java b/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/context/WorkContextHandlerImpl.java index 10d1f92a4bc..4cff16ed3b8 100644 --- a/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/context/WorkContextHandlerImpl.java +++ b/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/context/WorkContextHandlerImpl.java @@ -38,9 +38,6 @@ import jakarta.resource.spi.work.WorkException; import jakarta.resource.spi.work.WorkRejectedException; -import static java.util.logging.Level.FINEST; -import static java.util.logging.Level.WARNING; - import java.io.Serializable; import java.security.Principal; import java.util.ArrayList; @@ -67,6 +64,9 @@ import org.glassfish.security.common.UserNameAndPassword; import org.jvnet.hk2.annotations.Service; +import static java.util.logging.Level.FINEST; +import static java.util.logging.Level.WARNING; + /** * Handles work contexts submitted as part of the work instance diff --git a/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/monitor/WorkManagementProbeProvider.java b/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/monitor/WorkManagementProbeProvider.java index 5f3f29d837f..69b1a6d365e 100644 --- a/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/monitor/WorkManagementProbeProvider.java +++ b/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/monitor/WorkManagementProbeProvider.java @@ -16,9 +16,9 @@ package com.sun.enterprise.connectors.work.monitor; -import org.glassfish.external.probe.provider.annotations.ProbeProvider; import org.glassfish.external.probe.provider.annotations.Probe; import org.glassfish.external.probe.provider.annotations.ProbeParam; +import org.glassfish.external.probe.provider.annotations.ProbeProvider; /** diff --git a/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/monitor/WorkManagementStatsProvider.java b/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/monitor/WorkManagementStatsProvider.java index 0ca8f2137d2..c2902a44c52 100644 --- a/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/monitor/WorkManagementStatsProvider.java +++ b/appserver/connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/monitor/WorkManagementStatsProvider.java @@ -16,17 +16,17 @@ package com.sun.enterprise.connectors.work.monitor; +import org.glassfish.external.probe.provider.annotations.ProbeListener; +import org.glassfish.external.probe.provider.annotations.ProbeParam; +import org.glassfish.external.statistics.CountStatistic; +import org.glassfish.external.statistics.RangeStatistic; +import org.glassfish.external.statistics.impl.CountStatisticImpl; +import org.glassfish.external.statistics.impl.RangeStatisticImpl; +import org.glassfish.external.statistics.impl.StatisticImpl; import org.glassfish.gmbal.AMXMetadata; -import org.glassfish.gmbal.ManagedObject; import org.glassfish.gmbal.Description; import org.glassfish.gmbal.ManagedAttribute; -import org.glassfish.external.statistics.impl.CountStatisticImpl; -import org.glassfish.external.statistics.impl.StatisticImpl; -import org.glassfish.external.statistics.impl.RangeStatisticImpl; -import org.glassfish.external.statistics.CountStatistic; -import org.glassfish.external.statistics.RangeStatistic; -import org.glassfish.external.probe.provider.annotations.ProbeListener; -import org.glassfish.external.probe.provider.annotations.ProbeParam; +import org.glassfish.gmbal.ManagedObject; /** * Provides the monitoring data for Connector Work Manager From 91276be85ec4c7897409e923de0c95eb369235bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 00:57:53 +0200 Subject: [PATCH 16/40] Imports: persistence modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../mapping/ejb/AbstractNameMapper.java | 6 +- .../mapping/ejb/EJBInfoHelper.java | 4 +- .../ejb/LogHelperMappingConversion.java | 2 +- .../persistence/mapping/ejb/MappingFile.java | 60 +++-- .../mapping/ejb/MappingGenerator.java | 39 +-- .../mapping/ejb/SunCmpMappingsUtils.java | 8 +- .../enhancer/ByteCodeEnhancerHelper.java | 6 +- .../enhancer/ByteCodeEnhancerTimer.java | 4 +- .../persistence/enhancer/FilterEnhancer.java | 33 ++- .../enhancer/LogHelperEnhancer.java | 2 +- .../jdo/api/persistence/enhancer/Main.java | 63 ++--- .../enhancer/PersistenceLauncher.java | 4 +- .../classfile/AnnotatedClassAttribute.java | 5 +- .../enhancer/classfile/Descriptor.java | 2 +- .../enhancer/generator/ImplHelper.java | 8 +- .../enhancer/impl/ClassAction.java | 26 +- .../enhancer/impl/ClassControl.java | 14 +- .../enhancer/impl/EnhancerControl.java | 5 +- .../enhancer/impl/Environment.java | 18 +- .../enhancer/impl/FieldAction.java | 8 +- .../enhancer/impl/MethodAction.java | 3 +- .../enhancer/impl/MethodAnnotater.java | 29 ++- .../enhancer/meta/JDOMetaDataModelImpl.java | 6 +- .../enhancer/meta/JDOMetaDataProperties.java | 16 +- .../enhancer/util/ClassFileSource.java | 23 +- .../enhancer/util/ClassPathElement.java | 8 +- .../api/persistence/enhancer/util/Timer.java | 8 +- .../generator/database/DBElementFactory.java | 18 +- .../generator/database/DDLGenerator.java | 19 +- .../generator/database/DatabaseGenerator.java | 36 ++- .../database/DatabaseOutputStream.java | 4 +- .../generator/database/JDBCInfo.java | 1 - .../database/LogHelperDatabaseGenerator.java | 2 +- .../generator/database/MappingPolicy.java | 17 +- .../api/persistence/support/JDOHelper.java | 2 +- .../support/SpecialDBOperation.java | 4 +- .../support/SynchronizationManager.java | 3 +- .../api/persistence/support/Transaction.java | 2 +- .../api/persistence/model/EnhancerModel.java | 7 +- .../sun/jdo/api/persistence/model/Model.java | 46 +++- .../persistence/model/ModelVetoException.java | 4 +- .../api/persistence/model/RuntimeModel.java | 28 ++- .../model/jdo/PersistenceClassElement.java | 5 +- .../model/jdo/PersistenceElement.java | 5 +- .../model/jdo/PersistenceFieldElement.java | 4 +- .../model/jdo/RelationshipElement.java | 1 + .../jdo/impl/PersistenceClassElementImpl.java | 8 +- .../impl/PersistenceElementCollection.java | 10 +- .../jdo/impl/PersistenceElementImpl.java | 6 +- .../jdo/impl/PersistenceFieldElementImpl.java | 4 +- .../impl/PersistenceMemberElementImpl.java | 6 +- .../jdo/impl/RelationshipElementImpl.java | 4 +- .../model/mapping/MappingClassElement.java | 8 +- .../model/mapping/MappingElement.java | 4 +- .../model/mapping/MappingFieldElement.java | 4 +- .../mapping/MappingReferenceKeyElement.java | 7 +- .../mapping/MappingRelationshipElement.java | 4 +- .../model/mapping/MappingTableElement.java | 6 +- .../mapping/impl/MappingClassElementImpl.java | 30 ++- .../mapping/impl/MappingElementImpl.java | 9 +- .../mapping/impl/MappingFieldElementImpl.java | 21 +- .../impl/MappingMemberElementImpl.java | 5 +- .../impl/MappingReferenceKeyElementImpl.java | 19 +- .../impl/MappingRelationshipElementImpl.java | 18 +- .../mapping/impl/MappingTableElementImpl.java | 18 +- .../persistence/model/util/DumpMapping.java | 22 +- .../model/util/LogHelperModel.java | 4 +- .../model/util/ModelValidationException.java | 5 +- .../model/util/ModelValidator.java | 41 +++- .../support/ejb/cmp/CMPBeanHelper.java | 17 +- .../support/ejb/cmp/EJBHashSet.java | 13 +- .../support/ejb/cmp/JDOEJB11HelperImpl.java | 33 ++- .../support/ejb/cmp/JDOEJB20HelperImpl.java | 15 +- .../ejb/cmp/LogHelperEntityFinder.java | 2 +- .../ejb/cmp/LogHelperEntityInternal.java | 2 +- .../ejb/cmp/LogHelperEntityLifecycle.java | 2 +- .../support/ejb/codegen/CMPDeployerImpl.java | 19 +- .../ejb/codegen/LogHelperCmpCompiler.java | 2 +- .../support/ejb/ejbc/Bundle.properties | 15 -- .../ejb/ejbc/CMP11TemplateFormatter.java | 3 +- .../ejb/ejbc/CMP20TemplateFormatter.java | 3 +- .../ejb/ejbc/CMPROTemplateFormatter.java | 3 +- .../ejb/ejbc/CMPTemplateFormatter.java | 7 +- .../ejb/ejbc/DeploymentEventListenerImpl.java | 231 ------------------ .../support/ejb/ejbc/EJBBundleInfoHelper.java | 9 +- .../support/ejb/ejbc/EjbConversionHelper.java | 5 +- .../support/ejb/ejbc/JDOCodeGenerator.java | 27 +- .../ejb/ejbc/JDOCodeGeneratorHelper.java | 7 +- .../ejb/ejbc/JDOConcreteBean11Generator.java | 10 +- .../ejb/ejbc/JDOConcreteBean20Generator.java | 28 ++- .../ejb/ejbc/JDOConcreteBeanGenerator.java | 36 +-- .../ejb/ejbc/LogHelperEJBCompiler.java | 2 +- .../support/ejb/ejbc/NameMapper.java | 5 +- .../ejbc/PersistenceManagerServiceImpl.java | 13 +- .../support/ejb/ejbqlc/EJBQLAST.java | 2 +- .../support/ejb/ejbqlc/EJBQLASTFactory.java | 7 +- .../support/ejb/ejbqlc/EJBQLC.java | 15 +- .../support/ejb/ejbqlc/ErrorMsg.java | 4 +- .../ejb/ejbqlc/LogHelperQueryCompilerEJB.java | 2 +- .../support/ejb/ejbqlc/SymbolTable.java | 2 +- .../support/ejb/ejbqlc/TypeSupport.java | 12 +- .../enhancer/meta/EJBMetaDataModelImpl.java | 10 +- .../support/ejb/model/util/NameMapper.java | 3 +- .../support/sqlstore/ExtentCollection.java | 5 +- .../sqlstore/LogHelperPersistenceManager.java | 2 +- .../support/sqlstore/LogHelperSQLStore.java | 2 +- .../sqlstore/LogHelperStateManager.java | 2 +- .../sqlstore/LogHelperTransaction.java | 2 +- .../support/sqlstore/RuntimeVersion.java | 3 +- .../support/sqlstore/SQLStateManager.java | 26 +- .../support/sqlstore/SQLStoreManager.java | 30 ++- .../support/sqlstore/Transaction.java | 6 +- .../sqlstore/connection/ConnectionImpl.java | 19 +- .../connection/ConnectionManager.java | 8 +- .../database/BaseSpecialDBOperation.java | 8 +- .../sqlstore/database/DBVendorType.java | 9 +- .../oracle/OracleSpecialDBOperation.java | 17 +- .../support/sqlstore/ejb/CMPHelper.java | 8 +- .../support/sqlstore/ejb/ContainerHelper.java | 7 +- .../support/sqlstore/ejb/EJBHelper.java | 8 +- .../support/sqlstore/ejb/JDOEJB11Helper.java | 9 +- .../support/sqlstore/ejb/JDOEJB20Helper.java | 8 +- .../sqlstore/ejb/LoggerFactoryiAS.java | 6 +- .../sqlstore/ejb/TransactionHelper.java | 9 +- .../sqlstore/ejb/TransactionHelperImpl.java | 9 +- .../sqlstore/impl/ConnectionFactoryImpl.java | 12 +- .../sqlstore/impl/PersistenceManagerImpl.java | 37 ++- .../impl/PersistenceManagerWrapper.java | 9 +- .../sqlstore/impl/TransactionImpl.java | 29 ++- .../impl/VersionConsistencyCacheImpl.java | 17 +- .../support/sqlstore/model/ClassDesc.java | 44 +++- .../sqlstore/model/ConfigCacheImpl.java | 8 +- .../support/sqlstore/model/FieldDesc.java | 14 +- .../sqlstore/model/ForeignFieldDesc.java | 7 +- .../support/sqlstore/model/KeyDesc.java | 3 +- .../sqlstore/model/LocalFieldDesc.java | 13 +- .../support/sqlstore/model/TableDesc.java | 4 +- .../sqlstore/query/LogHelperQueryExecute.java | 2 +- .../support/sqlstore/query/QueryImpl.java | 17 +- .../support/sqlstore/query/jqlc/ErrorMsg.java | 7 +- .../support/sqlstore/query/jqlc/JQLAST.java | 10 +- .../support/sqlstore/query/jqlc/JQLC.java | 27 +- .../query/jqlc/LogHelperQueryCompilerJDO.java | 2 +- .../sqlstore/query/jqlc/ParameterTable.java | 24 +- .../query/jqlc/QueryValueFetcher.java | 5 +- .../sqlstore/query/jqlc/VariableTable.java | 15 +- .../sqlstore/query/util/scope/Definition.java | 4 +- .../sqlstore/query/util/scope/Field.java | 4 +- .../sqlstore/query/util/scope/Parameter.java | 4 +- .../sqlstore/query/util/scope/TypeName.java | 4 +- .../sqlstore/query/util/scope/Variable.java | 4 +- .../sqlstore/query/util/type/ClassType.java | 17 +- .../sqlstore/query/util/type/FieldInfo.java | 7 +- .../sqlstore/query/util/type/TypeTable.java | 8 +- .../support/sqlstore/sco/ArrayList.java | 11 +- .../support/sqlstore/sco/Date.java | 8 +- .../support/sqlstore/sco/HashSet.java | 11 +- .../support/sqlstore/sco/SqlDate.java | 8 +- .../support/sqlstore/sco/SqlTime.java | 8 +- .../support/sqlstore/sco/SqlTimestamp.java | 8 +- .../support/sqlstore/sco/Vector.java | 11 +- .../support/sqlstore/sql/ResultDesc.java | 27 +- .../sqlstore/sql/RetrieveDescImpl.java | 3 +- .../sqlstore/sql/UpdateObjectDescImpl.java | 17 +- .../sqlstore/sql/concurrency/Concurrency.java | 4 +- .../concurrency/ConcurrencyCheckDirty.java | 3 +- .../sqlstore/sql/generator/ColumnRef.java | 3 +- .../sql/generator/CorrelatedSelectPlan.java | 7 +- .../sqlstore/sql/generator/DBStatement.java | 13 +- .../sqlstore/sql/generator/QueryPlan.java | 5 +- .../sql/generator/SelectQueryPlan.java | 32 ++- .../sql/generator/SelectStatement.java | 10 +- .../sqlstore/sql/generator/Statement.java | 18 +- .../sql/generator/UpdateQueryPlan.java | 14 +- .../sql/generator/UpdateStatement.java | 9 +- .../sql/generator/VerificationSelectPlan.java | 4 +- .../state/AutoPersistentNewDeleted.java | 3 +- .../AutoPersistentNewFlushedPending.java | 3 +- .../state/AutoPersistentNewPending.java | 3 +- .../sqlstore/state/LifeCycleState.java | 5 +- .../sqlstore/state/PersistentDeleted.java | 3 +- .../sqlstore/state/PersistentNewDeleted.java | 3 +- .../sqlstore/utility/AugmentationTest.java | 14 +- .../sqlstore/utility/StringScanner.java | 2 +- .../persistence/utility/JavaTypeHelper.java | 2 +- .../persistence/utility/LogHelperUtility.java | 2 +- .../spi/persistence/utility/MergedBundle.java | 10 +- .../persistence/utility/SemaphoreImpl.java | 4 +- .../spi/persistence/utility/StringHelper.java | 4 +- .../spi/persistence/utility/WeakHashSet.java | 6 +- .../persistence/utility/WeakValueHashMap.java | 1 - .../generator/JavaClassWriterHelper.java | 5 +- .../utility/generator/io/FormattedWriter.java | 4 +- .../generator/io/IOJavaClassWriter.java | 9 +- .../generator/io/IOJavaFileWriter.java | 13 +- .../utility/logging/AbstractLogger.java | 16 +- .../logging/AbstractLoggerFactory.java | 2 +- .../utility/logging/LoggerFactoryJDK14.java | 9 +- .../persistence/common/PersistenceHelper.java | 4 +- .../common/database/DBVendorTypeHelper.java | 3 +- .../common/database/PropertyHelper.java | 18 +- .../sun/appserv/ejb/ReadOnlyBeanHelper.java | 14 +- .../sun/appserv/ejb/ReadOnlyBeanNotifier.java | 2 +- .../container/CommitCEntityContainer.java | 1 + .../entitybean/container/EntityContainer.java | 58 ++--- .../container/EntityContainerFactory.java | 15 +- .../container/ReadOnlyBeanContainer.java | 49 ++-- .../container/ReadOnlyBeanNotifierImpl.java | 2 +- .../container/ReadOnlyContextImpl.java | 3 +- .../container/ReadOnlyEJBLocalHomeImpl.java | 5 +- .../container/cache/FIFOEJBObjectCache.java | 10 +- .../cache/UnboundedEJBObjectCache.java | 3 +- .../DistributedReadOnlyBeanServiceImpl.java | 4 +- .../ReadOnlyBeanMessageCallBack.java | 12 +- .../stats/EntityBeanStatsProvider.java | 13 +- .../jpaconnector/JPACompositeSniffer.java | 14 +- ...EmbeddedProviderContainerContractInfo.java | 4 +- .../jpa/PersistenceUnitLoader.java | 26 +- .../JPAStandardSchemaGenerationProcessor.java | 4 +- .../SchemaGenerationProcessor.java | 4 +- .../SchemaGenerationProcessorFactory.java | 4 +- 221 files changed, 1453 insertions(+), 1184 deletions(-) delete mode 100644 appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/DeploymentEventListenerImpl.java diff --git a/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/AbstractNameMapper.java b/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/AbstractNameMapper.java index 2358379b17c..31aaac67b1d 100644 --- a/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/AbstractNameMapper.java +++ b/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/AbstractNameMapper.java @@ -22,7 +22,11 @@ package com.sun.jdo.api.persistence.mapping.ejb; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.Map; /** This is a class which helps translate between the various names of the * CMP (ejb name, abstract schema, abstract bean, concrete bean, local diff --git a/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/EJBInfoHelper.java b/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/EJBInfoHelper.java index c7f612c3bc1..1d10741c00c 100644 --- a/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/EJBInfoHelper.java +++ b/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/EJBInfoHelper.java @@ -22,12 +22,12 @@ package com.sun.jdo.api.persistence.mapping.ejb; +import com.sun.jdo.api.persistence.model.Model; + import java.util.Collection; import org.netbeans.modules.dbschema.SchemaElement; -import com.sun.jdo.api.persistence.model.Model; - /** This is an interface which represents information found in the * ejb-jar.xml descriptor and provides a variety of other information * and helper objects needed to do mapping and generating of ejb related diff --git a/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/LogHelperMappingConversion.java b/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/LogHelperMappingConversion.java index 9d913e1fb4a..4a029f868f3 100644 --- a/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/LogHelperMappingConversion.java +++ b/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/LogHelperMappingConversion.java @@ -23,8 +23,8 @@ package com.sun.jdo.api.persistence.mapping.ejb; -import com.sun.jdo.spi.persistence.utility.logging.Logger; import com.sun.jdo.spi.persistence.utility.logging.LogHelper; +import com.sun.jdo.spi.persistence.utility.logging.Logger; /** * diff --git a/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/MappingFile.java b/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/MappingFile.java index de32e2fac9d..00e63b5aca7 100644 --- a/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/MappingFile.java +++ b/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/MappingFile.java @@ -22,31 +22,55 @@ package com.sun.jdo.api.persistence.mapping.ejb; +import com.sun.jdo.api.persistence.mapping.ejb.beans.CheckVersionOfAccessedInstances; +import com.sun.jdo.api.persistence.mapping.ejb.beans.CmpFieldMapping; +import com.sun.jdo.api.persistence.mapping.ejb.beans.CmrFieldMapping; +import com.sun.jdo.api.persistence.mapping.ejb.beans.ColumnPair; +import com.sun.jdo.api.persistence.mapping.ejb.beans.Consistency; +import com.sun.jdo.api.persistence.mapping.ejb.beans.EntityMapping; +import com.sun.jdo.api.persistence.mapping.ejb.beans.FetchedWith; +import com.sun.jdo.api.persistence.mapping.ejb.beans.SecondaryTable; +import com.sun.jdo.api.persistence.mapping.ejb.beans.SunCmpMapping; +import com.sun.jdo.api.persistence.mapping.ejb.beans.SunCmpMappings; +import com.sun.jdo.api.persistence.model.ModelException; +import com.sun.jdo.api.persistence.model.jdo.PersistenceClassElement; +import com.sun.jdo.api.persistence.model.jdo.PersistenceFieldElement; +import com.sun.jdo.api.persistence.model.jdo.RelationshipElement; +import com.sun.jdo.api.persistence.model.jdo.impl.PersistenceClassElementImpl; +import com.sun.jdo.api.persistence.model.jdo.impl.PersistenceFieldElementImpl; +import com.sun.jdo.api.persistence.model.jdo.impl.RelationshipElementImpl; +import com.sun.jdo.api.persistence.model.mapping.MappingClassElement; +import com.sun.jdo.api.persistence.model.mapping.MappingFieldElement; +import com.sun.jdo.api.persistence.model.mapping.MappingReferenceKeyElement; +import com.sun.jdo.api.persistence.model.mapping.MappingRelationshipElement; +import com.sun.jdo.api.persistence.model.mapping.MappingTableElement; +import com.sun.jdo.api.persistence.model.mapping.impl.MappingClassElementImpl; +import com.sun.jdo.api.persistence.model.mapping.impl.MappingFieldElementImpl; +import com.sun.jdo.api.persistence.model.mapping.impl.MappingRelationshipElementImpl; +import com.sun.jdo.spi.persistence.utility.StringHelper; +import com.sun.jdo.spi.persistence.utility.logging.Logger; + +import java.io.File; +import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.File; - -import java.util.Collection; -import java.util.Map; -import java.util.List; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; -import java.util.ResourceBundle; import java.util.Iterator; -import java.io.IOException; - -import org.netbeans.modules.dbschema.*; +import java.util.List; +import java.util.Map; +import java.util.ResourceBundle; -import com.sun.jdo.api.persistence.mapping.ejb.beans.*; -import com.sun.jdo.spi.persistence.utility.StringHelper; -import com.sun.jdo.api.persistence.model.*; -import com.sun.jdo.api.persistence.model.mapping.*; -import com.sun.jdo.api.persistence.model.mapping.impl.*; -import com.sun.jdo.api.persistence.model.jdo.*; -import com.sun.jdo.api.persistence.model.jdo.impl.*; -import com.sun.jdo.spi.persistence.utility.logging.Logger; import org.glassfish.persistence.common.I18NHelper; - +import org.netbeans.modules.dbschema.ColumnElement; +import org.netbeans.modules.dbschema.ColumnPairElement; +import org.netbeans.modules.dbschema.DBException; +import org.netbeans.modules.dbschema.DBIdentifier; +import org.netbeans.modules.dbschema.ForeignKeyElement; +import org.netbeans.modules.dbschema.SchemaElement; +import org.netbeans.modules.dbschema.TableElement; +import org.netbeans.modules.dbschema.UniqueKeyElement; import org.netbeans.modules.schema2beans.Schema2BeansException; /** This class supports the conversion between the iAS mapping file diff --git a/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/MappingGenerator.java b/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/MappingGenerator.java index 2fbd21274b5..4bc12b43d17 100644 --- a/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/MappingGenerator.java +++ b/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/MappingGenerator.java @@ -22,28 +22,39 @@ package com.sun.jdo.api.persistence.mapping.ejb; -import java.util.*; -import java.sql.Types; -import java.io.IOException; - -import com.sun.jdo.api.persistence.mapping.ejb.beans.*; - +import com.sun.jdo.api.persistence.mapping.ejb.beans.CmpFieldMapping; +import com.sun.jdo.api.persistence.mapping.ejb.beans.CmrFieldMapping; +import com.sun.jdo.api.persistence.mapping.ejb.beans.ColumnPair; +import com.sun.jdo.api.persistence.mapping.ejb.beans.EntityMapping; +import com.sun.jdo.api.persistence.mapping.ejb.beans.SunCmpMapping; +import com.sun.jdo.api.persistence.mapping.ejb.beans.SunCmpMappings; import com.sun.jdo.api.persistence.model.Model; import com.sun.jdo.api.persistence.model.ModelException; -import com.sun.jdo.api.persistence.model.mapping.MappingClassElement; -import com.sun.jdo.api.persistence.model.mapping.MappingFieldElement; import com.sun.jdo.api.persistence.model.jdo.PersistenceClassElement; import com.sun.jdo.api.persistence.model.jdo.PersistenceFieldElement; - -import com.sun.jdo.spi.persistence.utility.StringHelper; -import com.sun.jdo.spi.persistence.utility.JavaTypeHelper; - +import com.sun.jdo.api.persistence.model.mapping.MappingClassElement; +import com.sun.jdo.api.persistence.model.mapping.MappingFieldElement; import com.sun.jdo.spi.persistence.generator.database.DatabaseGenerator; import com.sun.jdo.spi.persistence.generator.database.MappingPolicy; +import com.sun.jdo.spi.persistence.utility.JavaTypeHelper; +import com.sun.jdo.spi.persistence.utility.StringHelper; -import org.netbeans.modules.dbschema.*; +import java.io.IOException; +import java.sql.Types; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + +import org.netbeans.modules.dbschema.ColumnElement; +import org.netbeans.modules.dbschema.DBException; +import org.netbeans.modules.dbschema.DBIdentifier; +import org.netbeans.modules.dbschema.SchemaElement; import org.netbeans.modules.dbschema.jdbcimpl.SchemaElementImpl; - import org.netbeans.modules.schema2beans.Schema2BeansException; /* diff --git a/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/SunCmpMappingsUtils.java b/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/SunCmpMappingsUtils.java index c64b4822a52..a9831eda1d5 100644 --- a/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/SunCmpMappingsUtils.java +++ b/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/SunCmpMappingsUtils.java @@ -16,6 +16,12 @@ package com.sun.jdo.api.persistence.mapping.ejb; +import com.sun.jdo.api.persistence.mapping.ejb.beans.CmpFieldMapping; +import com.sun.jdo.api.persistence.mapping.ejb.beans.CmrFieldMapping; +import com.sun.jdo.api.persistence.mapping.ejb.beans.EntityMapping; +import com.sun.jdo.api.persistence.mapping.ejb.beans.SunCmpMapping; +import com.sun.jdo.api.persistence.mapping.ejb.beans.SunCmpMappings; + import java.util.ArrayList; import java.util.List; import java.util.ResourceBundle; @@ -23,8 +29,6 @@ import org.netbeans.modules.schema2beans.BaseBean; import org.netbeans.modules.schema2beans.GraphManager; -import com.sun.jdo.api.persistence.mapping.ejb.beans.*; - /** Finder utilities for elements of the SunCmpMappings * object graph. diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/ByteCodeEnhancerHelper.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/ByteCodeEnhancerHelper.java index 55610faa780..264a7dbf5dd 100644 --- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/ByteCodeEnhancerHelper.java +++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/ByteCodeEnhancerHelper.java @@ -22,14 +22,14 @@ package com.sun.jdo.api.persistence.enhancer; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; + //***************** import ************************************************ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; - import java.util.zip.CRC32; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/ByteCodeEnhancerTimer.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/ByteCodeEnhancerTimer.java index bad4b4a8929..37761218db5 100644 --- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/ByteCodeEnhancerTimer.java +++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/ByteCodeEnhancerTimer.java @@ -16,11 +16,11 @@ package com.sun.jdo.api.persistence.enhancer; +import com.sun.jdo.api.persistence.enhancer.util.Support; + import java.io.InputStream; import java.io.OutputStream; -import com.sun.jdo.api.persistence.enhancer.util.Support; - //@lars: changes to reflect to new ByteCodeEnhancer interface diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/FilterEnhancer.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/FilterEnhancer.java index 1f31c465cb8..8f59b158a44 100644 --- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/FilterEnhancer.java +++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/FilterEnhancer.java @@ -20,31 +20,26 @@ package com.sun.jdo.api.persistence.enhancer; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.PrintWriter; -import java.io.DataInputStream; -import java.io.DataOutputStream; - -import java.util.Properties; - -import com.sun.jdo.api.persistence.model.Model; - +import com.sun.jdo.api.persistence.enhancer.classfile.ClassFile; +import com.sun.jdo.api.persistence.enhancer.impl.ClassControl; +import com.sun.jdo.api.persistence.enhancer.impl.EnhancerControl; +import com.sun.jdo.api.persistence.enhancer.impl.Environment; import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaData; import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaDataModelImpl; import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaDataPropertyImpl; - -import com.sun.jdo.api.persistence.enhancer.impl.EnhancerControl; -import com.sun.jdo.api.persistence.enhancer.impl.Environment; -import com.sun.jdo.api.persistence.enhancer.impl.ClassControl; - -import com.sun.jdo.api.persistence.enhancer.classfile.ClassFile; - +import com.sun.jdo.api.persistence.enhancer.util.ClassFileSource; //@olsen: added: support for I18N import com.sun.jdo.api.persistence.enhancer.util.Support; import com.sun.jdo.api.persistence.enhancer.util.UserException; -import com.sun.jdo.api.persistence.enhancer.util.ClassFileSource; +import com.sun.jdo.api.persistence.model.Model; + +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.PrintWriter; +import java.util.Properties; //@lars: the output stream is always written with the class - even if it hasn't been enhanced diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/LogHelperEnhancer.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/LogHelperEnhancer.java index b75683e507d..962b57471fe 100644 --- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/LogHelperEnhancer.java +++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/LogHelperEnhancer.java @@ -16,8 +16,8 @@ package com.sun.jdo.api.persistence.enhancer; -import com.sun.jdo.spi.persistence.utility.logging.Logger; import com.sun.jdo.spi.persistence.utility.logging.LogHelper; +import com.sun.jdo.spi.persistence.utility.logging.Logger; /** * diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/Main.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/Main.java index cee0c8a4d20..a71b4eb0ee3 100644 --- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/Main.java +++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/Main.java @@ -16,60 +16,35 @@ package com.sun.jdo.api.persistence.enhancer; -//@olsen: -//import java.io.*; -import java.io.IOException; -import java.io.FileNotFoundException; +import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaData; +import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaDataModelImpl; +import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaDataPropertyImpl; +import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaDataTimer; +import com.sun.jdo.api.persistence.enhancer.util.Support; +import com.sun.jdo.api.persistence.model.Model; + +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.BufferedReader; +import java.io.DataInputStream; +import java.io.DataOutputStream; import java.io.File; -import java.io.InputStream; -import java.io.OutputStream; import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.FileOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.PrintWriter; import java.io.FileReader; -import java.io.BufferedReader; - +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.PrintWriter; +import java.net.URL; +import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; -import java.util.ArrayList; import java.util.Properties; import java.util.StringTokenizer; - import java.util.zip.ZipInputStream; import java.util.zip.ZipOutputStream; -import java.net.URL; - -import com.sun.jdo.api.persistence.model.Model; - -//import com.sun.jdo.api.persistence.enhancer.util.ClassFileSource; -//import com.sun.jdo.api.persistence.enhancer.util.ZipFileRegistry; -//import com.sun.jdo.api.persistence.enhancer.util.ClassPath; -//import com.sun.jdo.api.persistence.enhancer.util.FilePath; - -//@olsen: added support for timing statistics -import com.sun.jdo.api.persistence.enhancer.util.Support; - -//import com.sun.jdo.api.persistence.enhancer.classfile.ClassFile; - -import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaData; -import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaDataModelImpl; -import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaDataPropertyImpl; -import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaDataTimer; - -//import com.sun.jdo.api.persistence.enhancer.impl.ClassControl; -//import com.sun.jdo.api.persistence.enhancer.impl.Environment; - - -//import org.openidex.jarpackager.ArchiveEntry; //@yury Added the capability to create ClassFileSources out of ArchiveEntries - -//@olsen: disabled feature -/* -import com.sun.jdo.api.persistence.enhancer.impl.FieldMap; -*/ //@lars: moved functionality into ByteCodeEnhancerHelper //@lars: design improvements diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/PersistenceLauncher.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/PersistenceLauncher.java index 663d63c0f67..9a61b7a54f1 100644 --- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/PersistenceLauncher.java +++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/PersistenceLauncher.java @@ -22,12 +22,12 @@ package com.sun.jdo.api.persistence.enhancer; +import com.sun.jdo.api.persistence.enhancer.util.Support; + import java.io.PrintWriter; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import com.sun.jdo.api.persistence.enhancer.util.Support; - /** * Application launcher for persistence-capable classes. * diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/classfile/AnnotatedClassAttribute.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/classfile/AnnotatedClassAttribute.java index 2af145dd8be..06f7fe3bbd0 100644 --- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/classfile/AnnotatedClassAttribute.java +++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/classfile/AnnotatedClassAttribute.java @@ -16,7 +16,10 @@ package com.sun.jdo.api.persistence.enhancer.classfile; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.PrintStream; /** * AnnotatedClassAttribute represents a class level attribute diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/classfile/Descriptor.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/classfile/Descriptor.java index 4b8873bdb58..24bc270c647 100644 --- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/classfile/Descriptor.java +++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/classfile/Descriptor.java @@ -16,8 +16,8 @@ package com.sun.jdo.api.persistence.enhancer.classfile; -import java.util.Stack; import java.util.Map; +import java.util.Stack; //@olsen: subst: Hashtable -> Map, HashMap diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/generator/ImplHelper.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/generator/ImplHelper.java index 5c12e6f79b1..5a1cd6b42f1 100644 --- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/generator/ImplHelper.java +++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/generator/ImplHelper.java @@ -16,15 +16,15 @@ package com.sun.jdo.api.persistence.enhancer.generator; -import java.util.List; -import java.util.ArrayList; -import java.util.HashMap; - import com.sun.jdo.api.persistence.enhancer.meta.ExtendedJDOMetaData; import com.sun.jdo.api.persistence.enhancer.util.Assertion; import com.sun.jdo.spi.persistence.utility.JavaTypeHelper; import com.sun.jdo.spi.persistence.utility.generator.JavaClassWriterHelper; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + /** * */ diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/ClassAction.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/ClassAction.java index bb499ec9b92..55942b1f8fd 100644 --- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/ClassAction.java +++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/ClassAction.java @@ -16,21 +16,25 @@ package com.sun.jdo.api.persistence.enhancer.impl; -//import java.io.*; +import com.sun.jdo.api.persistence.enhancer.classfile.AttributeVector; +import com.sun.jdo.api.persistence.enhancer.classfile.ClassAttribute; +import com.sun.jdo.api.persistence.enhancer.classfile.ClassField; +import com.sun.jdo.api.persistence.enhancer.classfile.ClassFile; +import com.sun.jdo.api.persistence.enhancer.classfile.ClassMethod; +import com.sun.jdo.api.persistence.enhancer.classfile.ConstClass; +import com.sun.jdo.api.persistence.enhancer.classfile.ConstantPool; +import com.sun.jdo.api.persistence.enhancer.classfile.GenericAttribute; +import com.sun.jdo.api.persistence.enhancer.classfile.SyntheticAttribute; +import com.sun.jdo.api.persistence.enhancer.classfile.VMConstants; +import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaData; +import com.sun.jdo.api.persistence.enhancer.util.Support; -import java.util.Map; -import java.util.HashMap; +import java.util.ArrayList; import java.util.Enumeration; +import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.ArrayList; - -import com.sun.jdo.api.persistence.enhancer.classfile.*; - -import com.sun.jdo.api.persistence.enhancer.util.Support; - -//@olsen: added import -import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaData; +import java.util.Map; //@olsen: cosmetics diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/ClassControl.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/ClassControl.java index 9b6f79a63d8..d9f83d1b0a4 100644 --- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/ClassControl.java +++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/ClassControl.java @@ -16,17 +16,19 @@ package com.sun.jdo.api.persistence.enhancer.impl; -import java.io.*; - import com.sun.jdo.api.persistence.enhancer.classfile.ClassFile; import com.sun.jdo.api.persistence.enhancer.classfile.ConstClass; - +//@olsen: added import +import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaData; +import com.sun.jdo.api.persistence.enhancer.util.ClassFileSource; import com.sun.jdo.api.persistence.enhancer.util.Support; import com.sun.jdo.api.persistence.enhancer.util.UserException; -import com.sun.jdo.api.persistence.enhancer.util.ClassFileSource; -//@olsen: added import -import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaData; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; //@olsen: cosmetics diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/EnhancerControl.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/EnhancerControl.java index 0c5845d83a8..4b7c5850170 100644 --- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/EnhancerControl.java +++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/EnhancerControl.java @@ -16,11 +16,12 @@ package com.sun.jdo.api.persistence.enhancer.impl; -import java.util.Iterator; -import java.util.ArrayList; //@olsen: added general support import com.sun.jdo.api.persistence.enhancer.util.Support; +import java.util.ArrayList; +import java.util.Iterator; + //@olsen: disabled feature /* import com.sun.jdo.api.persistence.enhancer.classfile.ClassFile; diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/Environment.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/Environment.java index 0ee8e19d13a..87a5e77e198 100644 --- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/Environment.java +++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/Environment.java @@ -16,21 +16,19 @@ package com.sun.jdo.api.persistence.enhancer.impl; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.HashMap; -import java.util.ArrayList; - -import java.io.File; //@olsen: added import -import java.io.PrintWriter; - -import com.sun.jdo.api.persistence.enhancer.util.ClassPath; +import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaData; import com.sun.jdo.api.persistence.enhancer.util.ClassFileSource; +import com.sun.jdo.api.persistence.enhancer.util.ClassPath; import com.sun.jdo.api.persistence.enhancer.util.Support; +import java.io.File; //@olsen: added import -import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaData; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.Iterator; //@lars added: field for last error message diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/FieldAction.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/FieldAction.java index d9580b6cdc0..fada0666ef9 100644 --- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/FieldAction.java +++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/FieldAction.java @@ -17,14 +17,12 @@ package com.sun.jdo.api.persistence.enhancer.impl; import com.sun.jdo.api.persistence.enhancer.classfile.ClassField; -import com.sun.jdo.api.persistence.enhancer.classfile.VMConstants; import com.sun.jdo.api.persistence.enhancer.classfile.Descriptor; - -import com.sun.jdo.api.persistence.enhancer.util.Support; -import com.sun.jdo.api.persistence.enhancer.util.InternalError; - +import com.sun.jdo.api.persistence.enhancer.classfile.VMConstants; //@olsen: added import import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaData; +import com.sun.jdo.api.persistence.enhancer.util.InternalError; +import com.sun.jdo.api.persistence.enhancer.util.Support; //@olsen: cosmetics diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/MethodAction.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/MethodAction.java index 70022120998..8d87a9dcad7 100644 --- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/MethodAction.java +++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/MethodAction.java @@ -16,8 +16,7 @@ package com.sun.jdo.api.persistence.enhancer.impl; -import com.sun.jdo.api.persistence.enhancer.classfile.*; - +import com.sun.jdo.api.persistence.enhancer.classfile.ClassMethod; import com.sun.jdo.api.persistence.enhancer.util.Support; //@olsen: cosmetics diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/MethodAnnotater.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/MethodAnnotater.java index 3304f1f5d88..071306e9550 100644 --- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/MethodAnnotater.java +++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/MethodAnnotater.java @@ -16,16 +16,29 @@ package com.sun.jdo.api.persistence.enhancer.impl; -import java.util.Map; -import java.util.HashMap; -import java.util.Vector; -import java.util.Stack; -import com.sun.jdo.api.persistence.enhancer.classfile.*; - -import com.sun.jdo.api.persistence.enhancer.util.Support; -import com.sun.jdo.api.persistence.enhancer.util.InternalError; +import com.sun.jdo.api.persistence.enhancer.classfile.ClassMethod; +import com.sun.jdo.api.persistence.enhancer.classfile.CodeAttribute; +import com.sun.jdo.api.persistence.enhancer.classfile.ConstClass; +import com.sun.jdo.api.persistence.enhancer.classfile.ConstFieldRef; +import com.sun.jdo.api.persistence.enhancer.classfile.ConstMethodRef; +import com.sun.jdo.api.persistence.enhancer.classfile.ConstNameAndType; +import com.sun.jdo.api.persistence.enhancer.classfile.ConstantPool; +import com.sun.jdo.api.persistence.enhancer.classfile.Descriptor; +import com.sun.jdo.api.persistence.enhancer.classfile.Insn; +import com.sun.jdo.api.persistence.enhancer.classfile.InsnConstOp; +import com.sun.jdo.api.persistence.enhancer.classfile.InsnInterfaceInvoke; +import com.sun.jdo.api.persistence.enhancer.classfile.InsnTarget; +import com.sun.jdo.api.persistence.enhancer.classfile.InsnUtils; +import com.sun.jdo.api.persistence.enhancer.classfile.VMConstants; //@olsen: added import import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaData; +import com.sun.jdo.api.persistence.enhancer.util.InternalError; +import com.sun.jdo.api.persistence.enhancer.util.Support; + +import java.util.HashMap; +import java.util.Map; +import java.util.Stack; +import java.util.Vector; //@olsen: cosmetics diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/meta/JDOMetaDataModelImpl.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/meta/JDOMetaDataModelImpl.java index c4d9d3fc1cb..a2f373f4e70 100644 --- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/meta/JDOMetaDataModelImpl.java +++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/meta/JDOMetaDataModelImpl.java @@ -16,14 +16,14 @@ package com.sun.jdo.api.persistence.enhancer.meta; -import java.io.PrintWriter; - import com.sun.jdo.api.persistence.enhancer.util.Support; import com.sun.jdo.api.persistence.model.Model; -import com.sun.jdo.api.persistence.model.jdo.PersistenceFieldElement; import com.sun.jdo.api.persistence.model.jdo.PersistenceClassElement; +import com.sun.jdo.api.persistence.model.jdo.PersistenceFieldElement; import com.sun.jdo.api.persistence.model.jdo.RelationshipElement; +import java.io.PrintWriter; + /** * Provides the JDO meta information based on a JDO meta model. diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/meta/JDOMetaDataProperties.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/meta/JDOMetaDataProperties.java index 8c609e3f898..9be07d897e9 100644 --- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/meta/JDOMetaDataProperties.java +++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/meta/JDOMetaDataProperties.java @@ -25,21 +25,19 @@ //***************** import ************************************************ import java.lang.reflect.Modifier; - -import java.util.Comparator; -import java.util.Enumeration; -import java.util.Map; -import java.util.List; +import java.text.MessageFormat; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.HashSet; +import java.util.Comparator; +import java.util.Enumeration; import java.util.HashMap; -import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map; import java.util.Properties; import java.util.StringTokenizer; -import java.text.MessageFormat; - //######################################################################### /** diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/util/ClassFileSource.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/util/ClassFileSource.java index 15727e7c5db..12e795cb393 100644 --- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/util/ClassFileSource.java +++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/util/ClassFileSource.java @@ -16,18 +16,19 @@ package com.sun.jdo.api.persistence.enhancer.util; -//@lars: removed openide-dependencies -//@olsen: not needed -//import com.sun.jdo.api.persistence.enhancer.FilterEnv; -//@olsen: added: support for I18N -//@olsen: subst: FilterError -> UserException, assert() - -import java.util.zip.ZipFile; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.StringTokenizer; import java.util.zip.ZipEntry; -import java.io.*; -import java.util.*; -//@yury: added ability to get the class bytecode from the Forte4J archive entry -//import org.openidex.jarpackager.ArchiveEntry; +import java.util.zip.ZipFile; /** * ClassFileSource provides a mechanism for associating a class diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/util/ClassPathElement.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/util/ClassPathElement.java index f533c9e9a3b..758cc97afe8 100644 --- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/util/ClassPathElement.java +++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/util/ClassPathElement.java @@ -16,13 +16,13 @@ package com.sun.jdo.api.persistence.enhancer.util; -import java.util.Enumeration; -import java.util.NoSuchElementException; import java.io.File; -import java.io.IOException; import java.io.FilenameFilter; -import java.util.zip.ZipFile; +import java.io.IOException; +import java.util.Enumeration; +import java.util.NoSuchElementException; import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; /** * Abstract base class for components of a class path. diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/util/Timer.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/util/Timer.java index 98a2d8a1f90..08cf6f3d8fa 100644 --- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/util/Timer.java +++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/util/Timer.java @@ -16,14 +16,12 @@ package com.sun.jdo.api.persistence.enhancer.util; -import java.util.HashMap; +import java.io.PrintWriter; +import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; - -import java.text.DecimalFormat; - -import java.io.PrintWriter; +import java.util.HashMap; /** diff --git a/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/DBElementFactory.java b/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/DBElementFactory.java index 24631fd9d80..8b9fe42a551 100644 --- a/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/DBElementFactory.java +++ b/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/DBElementFactory.java @@ -23,8 +23,22 @@ package com.sun.jdo.spi.persistence.generator.database; -import org.netbeans.modules.dbschema.*; -import org.netbeans.modules.dbschema.jdbcimpl.*; +import org.netbeans.modules.dbschema.ColumnElement; +import org.netbeans.modules.dbschema.ColumnPairElement; +import org.netbeans.modules.dbschema.DBException; +import org.netbeans.modules.dbschema.DBIdentifier; +import org.netbeans.modules.dbschema.ForeignKeyElement; +import org.netbeans.modules.dbschema.IndexElement; +import org.netbeans.modules.dbschema.SchemaElement; +import org.netbeans.modules.dbschema.TableElement; +import org.netbeans.modules.dbschema.UniqueKeyElement; +import org.netbeans.modules.dbschema.jdbcimpl.ColumnElementImpl; +import org.netbeans.modules.dbschema.jdbcimpl.ColumnPairElementImpl; +import org.netbeans.modules.dbschema.jdbcimpl.ForeignKeyElementImpl; +import org.netbeans.modules.dbschema.jdbcimpl.IndexElementImpl; +import org.netbeans.modules.dbschema.jdbcimpl.SchemaElementImpl; +import org.netbeans.modules.dbschema.jdbcimpl.TableElementImpl; +import org.netbeans.modules.dbschema.jdbcimpl.UniqueKeyElementImpl; import org.netbeans.modules.dbschema.util.NameUtil; /* diff --git a/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/DDLGenerator.java b/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/DDLGenerator.java index 1ffc284b5a8..e0f79b495ae 100644 --- a/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/DDLGenerator.java +++ b/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/DDLGenerator.java @@ -22,11 +22,20 @@ package com.sun.jdo.spi.persistence.generator.database; -import java.io.*; -import java.util.*; -import java.sql.*; - -import org.netbeans.modules.dbschema.*; +import java.io.IOException; +import java.io.OutputStream; +import java.io.PrintStream; +import java.sql.SQLException; +import java.sql.Types; +import java.util.ArrayList; +import java.util.List; + +import org.netbeans.modules.dbschema.ColumnElement; +import org.netbeans.modules.dbschema.DBException; +import org.netbeans.modules.dbschema.ForeignKeyElement; +import org.netbeans.modules.dbschema.SchemaElement; +import org.netbeans.modules.dbschema.TableElement; +import org.netbeans.modules.dbschema.UniqueKeyElement; // XXX Instead of only static methods, generateDDL could create an // instance of this class with the parameters that are currently passed diff --git a/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/DatabaseGenerator.java b/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/DatabaseGenerator.java index d2d2f37de33..18c082fc704 100644 --- a/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/DatabaseGenerator.java +++ b/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/DatabaseGenerator.java @@ -22,26 +22,40 @@ package com.sun.jdo.spi.persistence.generator.database; +import com.sun.jdo.api.persistence.model.Model; +import com.sun.jdo.api.persistence.model.ModelException; +import com.sun.jdo.api.persistence.model.jdo.PersistenceClassElement; +import com.sun.jdo.api.persistence.model.jdo.PersistenceFieldElement; +import com.sun.jdo.api.persistence.model.jdo.RelationshipElement; +import com.sun.jdo.api.persistence.model.mapping.MappingClassElement; +import com.sun.jdo.api.persistence.model.mapping.MappingFieldElement; +import com.sun.jdo.api.persistence.model.mapping.MappingRelationshipElement; +import com.sun.jdo.api.persistence.model.mapping.MappingTableElement; +import com.sun.jdo.api.persistence.model.mapping.impl.MappingClassElementImpl; +import com.sun.jdo.api.persistence.model.mapping.impl.MappingFieldElementImpl; +import com.sun.jdo.api.persistence.model.mapping.impl.MappingRelationshipElementImpl; +import com.sun.jdo.spi.persistence.utility.JavaTypeHelper; +import com.sun.jdo.spi.persistence.utility.logging.Logger; + import java.io.IOException; import java.util.ArrayList; -import java.util.Iterator; import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.ResourceBundle; - -import org.netbeans.modules.dbschema.*; -import com.sun.jdo.api.persistence.model.mapping.*; -import com.sun.jdo.api.persistence.model.mapping.impl.*; -import com.sun.jdo.api.persistence.model.jdo.*; -import com.sun.jdo.api.persistence.model.Model; -import com.sun.jdo.api.persistence.model.ModelException; -import com.sun.jdo.spi.persistence.utility.JavaTypeHelper; +import java.util.Set; import org.glassfish.persistence.common.I18NHelper; -import com.sun.jdo.spi.persistence.utility.logging.Logger; +import org.netbeans.modules.dbschema.ColumnElement; +import org.netbeans.modules.dbschema.ColumnPairElement; +import org.netbeans.modules.dbschema.DBException; +import org.netbeans.modules.dbschema.DBIdentifier; +import org.netbeans.modules.dbschema.ForeignKeyElement; +import org.netbeans.modules.dbschema.SchemaElement; +import org.netbeans.modules.dbschema.TableElement; +import org.netbeans.modules.dbschema.UniqueKeyElement; /** diff --git a/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/DatabaseOutputStream.java b/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/DatabaseOutputStream.java index de34aab6acb..b02e91876c0 100644 --- a/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/DatabaseOutputStream.java +++ b/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/DatabaseOutputStream.java @@ -23,13 +23,13 @@ package com.sun.jdo.spi.persistence.generator.database; +import com.sun.jdo.spi.persistence.utility.logging.Logger; + import java.io.OutputStream; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; -import com.sun.jdo.spi.persistence.utility.logging.Logger; - /* * Represents a database connection as an output stream. diff --git a/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/JDBCInfo.java b/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/JDBCInfo.java index b5695c1f61a..a5af1048045 100644 --- a/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/JDBCInfo.java +++ b/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/JDBCInfo.java @@ -18,7 +18,6 @@ import com.sun.jdo.spi.persistence.utility.StringHelper; - import com.sun.jdo.spi.persistence.utility.logging.Logger; /** diff --git a/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/LogHelperDatabaseGenerator.java b/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/LogHelperDatabaseGenerator.java index 12d5d64ceb2..648ed1e3b36 100644 --- a/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/LogHelperDatabaseGenerator.java +++ b/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/LogHelperDatabaseGenerator.java @@ -23,8 +23,8 @@ package com.sun.jdo.spi.persistence.generator.database; -import com.sun.jdo.spi.persistence.utility.logging.Logger; import com.sun.jdo.spi.persistence.utility.logging.LogHelper; +import com.sun.jdo.spi.persistence.utility.logging.Logger; /** * diff --git a/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/MappingPolicy.java b/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/MappingPolicy.java index d5ae9c6dbee..b22d3f46fc9 100644 --- a/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/MappingPolicy.java +++ b/appserver/persistence/cmp/generator-database/src/main/java/com/sun/jdo/spi/persistence/generator/database/MappingPolicy.java @@ -22,10 +22,16 @@ package com.sun.jdo.spi.persistence.generator.database; +import com.sun.jdo.spi.persistence.utility.StringHelper; +import com.sun.jdo.spi.persistence.utility.logging.Logger; + import java.io.BufferedInputStream; import java.io.FileInputStream; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.sql.Types; import java.util.Enumeration; import java.util.HashMap; import java.util.HashSet; @@ -36,17 +42,10 @@ import java.util.Set; import java.util.StringTokenizer; import java.util.TreeSet; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.sql.Types; +import org.glassfish.persistence.common.DatabaseConstants; import org.glassfish.persistence.common.I18NHelper; -import com.sun.jdo.spi.persistence.utility.StringHelper; - -import com.sun.jdo.spi.persistence.utility.logging.Logger; - import org.glassfish.persistence.common.database.DBVendorTypeHelper; -import org.glassfish.persistence.common.DatabaseConstants; // XXX Capitalization of acronyms such as Jdbc vs. JDBC is inconsistent // throught out this package. diff --git a/appserver/persistence/cmp/internal-api/src/main/java/com/sun/jdo/api/persistence/support/JDOHelper.java b/appserver/persistence/cmp/internal-api/src/main/java/com/sun/jdo/api/persistence/support/JDOHelper.java index 8b0a0b7cef8..b94005ef1b2 100644 --- a/appserver/persistence/cmp/internal-api/src/main/java/com/sun/jdo/api/persistence/support/JDOHelper.java +++ b/appserver/persistence/cmp/internal-api/src/main/java/com/sun/jdo/api/persistence/support/JDOHelper.java @@ -22,8 +22,8 @@ package com.sun.jdo.api.persistence.support; -import java.util.ResourceBundle; import java.util.Collection; +import java.util.ResourceBundle; import org.glassfish.persistence.common.I18NHelper; diff --git a/appserver/persistence/cmp/internal-api/src/main/java/com/sun/jdo/api/persistence/support/SpecialDBOperation.java b/appserver/persistence/cmp/internal-api/src/main/java/com/sun/jdo/api/persistence/support/SpecialDBOperation.java index 3dd9e9da643..f6e06f7a286 100644 --- a/appserver/persistence/cmp/internal-api/src/main/java/com/sun/jdo/api/persistence/support/SpecialDBOperation.java +++ b/appserver/persistence/cmp/internal-api/src/main/java/com/sun/jdo/api/persistence/support/SpecialDBOperation.java @@ -16,10 +16,10 @@ package com.sun.jdo.api.persistence.support; -import java.util.List; +import java.sql.DatabaseMetaData; import java.sql.PreparedStatement; import java.sql.SQLException; -import java.sql.DatabaseMetaData; +import java.util.List; /** * SpecialDBOperation interface is defined for database specific operations. diff --git a/appserver/persistence/cmp/internal-api/src/main/java/com/sun/jdo/api/persistence/support/SynchronizationManager.java b/appserver/persistence/cmp/internal-api/src/main/java/com/sun/jdo/api/persistence/support/SynchronizationManager.java index 1071d0f8280..53962f5bb94 100644 --- a/appserver/persistence/cmp/internal-api/src/main/java/com/sun/jdo/api/persistence/support/SynchronizationManager.java +++ b/appserver/persistence/cmp/internal-api/src/main/java/com/sun/jdo/api/persistence/support/SynchronizationManager.java @@ -22,9 +22,10 @@ package com.sun.jdo.api.persistence.support; +import jakarta.transaction.Synchronization; + import java.util.ArrayList; import java.util.List; -import jakarta.transaction.Synchronization; /** This class allows for multiple instances to be called at transaction * completion, which JDO does not currently provide. JDO only provides diff --git a/appserver/persistence/cmp/internal-api/src/main/java/com/sun/jdo/api/persistence/support/Transaction.java b/appserver/persistence/cmp/internal-api/src/main/java/com/sun/jdo/api/persistence/support/Transaction.java index e8546655ddf..3a72d2144ba 100644 --- a/appserver/persistence/cmp/internal-api/src/main/java/com/sun/jdo/api/persistence/support/Transaction.java +++ b/appserver/persistence/cmp/internal-api/src/main/java/com/sun/jdo/api/persistence/support/Transaction.java @@ -21,7 +21,7 @@ */ package com.sun.jdo.api.persistence.support; -import jakarta.transaction.*; +import jakarta.transaction.Synchronization; /** The JDO Transaction interface is a sub-interface of the PersistenceManager * that deals with options and completion of transactions under user control. diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/EnhancerModel.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/EnhancerModel.java index 85342740658..ef9cdbf5336 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/EnhancerModel.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/EnhancerModel.java @@ -16,12 +16,13 @@ package com.sun.jdo.api.persistence.model; -import java.util.List; -import java.io.IOException; +import com.sun.jdo.api.persistence.model.jdo.PersistenceFieldElement; + import java.io.BufferedInputStream; import java.io.BufferedOutputStream; +import java.io.IOException; import java.io.InputStream; -import com.sun.jdo.api.persistence.model.jdo.PersistenceFieldElement; +import java.util.List; /** * diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/Model.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/Model.java index 4b67f39f6ef..694b0919369 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/Model.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/Model.java @@ -22,24 +22,44 @@ package com.sun.jdo.api.persistence.model; -import java.io.*; -import java.util.*; -import java.lang.reflect.Modifier; - -import org.netbeans.modules.dbschema.migration.archiver.XMLInputStream; -import org.netbeans.modules.dbschema.migration.archiver.XMLOutputStream; - -import org.netbeans.modules.dbschema.SchemaElement; -import com.sun.jdo.api.persistence.model.util.LogHelperModel; -import com.sun.jdo.api.persistence.model.util.ModelValidator; -import com.sun.jdo.api.persistence.model.jdo.*; -import com.sun.jdo.api.persistence.model.jdo.impl.*; +import com.sun.jdo.api.persistence.model.jdo.PersistenceClassElement; +import com.sun.jdo.api.persistence.model.jdo.PersistenceFieldElement; +import com.sun.jdo.api.persistence.model.jdo.RelationshipElement; +import com.sun.jdo.api.persistence.model.jdo.impl.PersistenceClassElementImpl; +import com.sun.jdo.api.persistence.model.jdo.impl.PersistenceFieldElementImpl; +import com.sun.jdo.api.persistence.model.jdo.impl.RelationshipElementImpl; import com.sun.jdo.api.persistence.model.mapping.MappingClassElement; import com.sun.jdo.api.persistence.model.mapping.MappingFieldElement; import com.sun.jdo.api.persistence.model.mapping.impl.MappingClassElementImpl; -import com.sun.jdo.spi.persistence.utility.*; +import com.sun.jdo.api.persistence.model.util.LogHelperModel; +import com.sun.jdo.api.persistence.model.util.ModelValidator; +import com.sun.jdo.spi.persistence.utility.JavaTypeHelper; +import com.sun.jdo.spi.persistence.utility.StringHelper; +import com.sun.jdo.spi.persistence.utility.WeakHashSet; +import com.sun.jdo.spi.persistence.utility.WeakValueHashMap; import com.sun.jdo.spi.persistence.utility.logging.Logger; + +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.ResourceBundle; +import java.util.Set; + import org.glassfish.persistence.common.I18NHelper; +import org.netbeans.modules.dbschema.SchemaElement; +import org.netbeans.modules.dbschema.migration.archiver.XMLInputStream; +import org.netbeans.modules.dbschema.migration.archiver.XMLOutputStream; /* TODO: 1. think about moving illegal lists of static info out to a properties file diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/ModelVetoException.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/ModelVetoException.java index d74d8d7a993..6f20301f79a 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/ModelVetoException.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/ModelVetoException.java @@ -22,11 +22,11 @@ package com.sun.jdo.api.persistence.model; +import com.sun.jdo.spi.persistence.utility.StringHelper; + import java.io.PrintStream; import java.io.PrintWriter; -import com.sun.jdo.spi.persistence.utility.StringHelper; - /** * * @author raccah diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/RuntimeModel.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/RuntimeModel.java index 53e84c83b4b..18ae78133d3 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/RuntimeModel.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/RuntimeModel.java @@ -22,17 +22,33 @@ package com.sun.jdo.api.persistence.model; -import java.io.*; +import com.sun.jdo.api.persistence.model.mapping.MappingClassElement; +import com.sun.jdo.spi.persistence.utility.JavaTypeHelper; +import com.sun.jdo.spi.persistence.utility.StringHelper; + +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Field; +import java.lang.reflect.Member; +import java.lang.reflect.Method; import java.net.URL; -import java.util.*; -import java.lang.reflect.*; import java.security.AccessController; import java.security.PrivilegedAction; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; -import org.netbeans.modules.dbschema.SchemaElement; -import com.sun.jdo.api.persistence.model.mapping.MappingClassElement; -import com.sun.jdo.spi.persistence.utility.*; import org.glassfish.persistence.common.I18NHelper; +import org.netbeans.modules.dbschema.SchemaElement; /** * diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/PersistenceClassElement.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/PersistenceClassElement.java index b4729e298c3..553a33c3622 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/PersistenceClassElement.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/PersistenceClassElement.java @@ -22,11 +22,12 @@ package com.sun.jdo.api.persistence.model.jdo; -import java.util.ArrayList; - import com.sun.jdo.api.persistence.model.Model; import com.sun.jdo.api.persistence.model.ModelException; import com.sun.jdo.spi.persistence.utility.StringHelper; + +import java.util.ArrayList; + import org.glassfish.persistence.common.I18NHelper; /* TODO: diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/PersistenceElement.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/PersistenceElement.java index 4d2586f9a83..764988bbdf7 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/PersistenceElement.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/PersistenceElement.java @@ -22,12 +22,13 @@ package com.sun.jdo.api.persistence.model.jdo; -import java.util.ResourceBundle; +import com.sun.jdo.api.persistence.model.ModelException; + import java.beans.PropertyChangeListener; import java.beans.VetoableChangeListener; import java.text.Collator; +import java.util.ResourceBundle; -import com.sun.jdo.api.persistence.model.ModelException; import org.glassfish.persistence.common.I18NHelper; /** diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/PersistenceFieldElement.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/PersistenceFieldElement.java index 196ee122402..3a668f952e8 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/PersistenceFieldElement.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/PersistenceFieldElement.java @@ -22,10 +22,10 @@ package com.sun.jdo.api.persistence.model.jdo; -import java.util.ArrayList; - import com.sun.jdo.api.persistence.model.ModelException; +import java.util.ArrayList; + /* TODO: 1. throw (Model or IllegalArgument)Exception on set illegal constant values? also applies to PersistenceClass, Relationship classes diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/RelationshipElement.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/RelationshipElement.java index b9c40c7f6d5..f104b7e0bc5 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/RelationshipElement.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/RelationshipElement.java @@ -24,6 +24,7 @@ import com.sun.jdo.api.persistence.model.Model; import com.sun.jdo.api.persistence.model.ModelException; + import org.glassfish.persistence.common.I18NHelper; /* TODO: diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/impl/PersistenceClassElementImpl.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/impl/PersistenceClassElementImpl.java index 0979f07c56e..b4fd937a26e 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/impl/PersistenceClassElementImpl.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/impl/PersistenceClassElementImpl.java @@ -22,13 +22,15 @@ package com.sun.jdo.api.persistence.model.jdo.impl; -import java.beans.PropertyVetoException; - -import com.sun.jdo.api.persistence.model.jdo.*; import com.sun.jdo.api.persistence.model.ModelException; import com.sun.jdo.api.persistence.model.ModelVetoException; +import com.sun.jdo.api.persistence.model.jdo.ConcurrencyGroupElement; +import com.sun.jdo.api.persistence.model.jdo.PersistenceClassElement; +import com.sun.jdo.api.persistence.model.jdo.PersistenceFieldElement; import com.sun.jdo.spi.persistence.utility.JavaTypeHelper; +import java.beans.PropertyVetoException; + /** * * @author raccah diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/impl/PersistenceElementCollection.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/impl/PersistenceElementCollection.java index 6fcf0163e48..b6444484d93 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/impl/PersistenceElementCollection.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/impl/PersistenceElementCollection.java @@ -22,12 +22,14 @@ package com.sun.jdo.api.persistence.model.jdo.impl; -import java.util.*; -import java.beans.PropertyVetoException; - import com.sun.jdo.api.persistence.model.ModelException; import com.sun.jdo.api.persistence.model.ModelVetoException; -import com.sun.jdo.api.persistence.model.jdo.*; +import com.sun.jdo.api.persistence.model.jdo.PersistenceElement; + +import java.beans.PropertyVetoException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; /** * diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/impl/PersistenceElementImpl.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/impl/PersistenceElementImpl.java index 8914b589730..882ef3f6300 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/impl/PersistenceElementImpl.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/impl/PersistenceElementImpl.java @@ -27,7 +27,11 @@ import com.sun.jdo.api.persistence.model.jdo.PersistenceElement; import com.sun.jdo.api.persistence.model.jdo.PersistenceElementProperties; -import java.beans.*; +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.beans.PropertyVetoException; +import java.beans.VetoableChangeListener; +import java.beans.VetoableChangeSupport; /* TODO: 1. way to get to declaring class from here? diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/impl/PersistenceFieldElementImpl.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/impl/PersistenceFieldElementImpl.java index 218d0d4bd6d..3c4a83680a2 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/impl/PersistenceFieldElementImpl.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/impl/PersistenceFieldElementImpl.java @@ -22,13 +22,13 @@ package com.sun.jdo.api.persistence.model.jdo.impl; -import java.beans.PropertyVetoException; - import com.sun.jdo.api.persistence.model.ModelException; import com.sun.jdo.api.persistence.model.ModelVetoException; import com.sun.jdo.api.persistence.model.jdo.PersistenceFieldElement; import com.sun.jdo.spi.persistence.utility.JavaTypeHelper; +import java.beans.PropertyVetoException; + /** * * @author raccah diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/impl/PersistenceMemberElementImpl.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/impl/PersistenceMemberElementImpl.java index b7a28907bab..508023d7afc 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/impl/PersistenceMemberElementImpl.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/impl/PersistenceMemberElementImpl.java @@ -22,10 +22,10 @@ package com.sun.jdo.api.persistence.model.jdo.impl; -import java.beans.PropertyVetoException; - -import com.sun.jdo.api.persistence.model.jdo.PersistenceMemberElement; import com.sun.jdo.api.persistence.model.jdo.PersistenceClassElement; +import com.sun.jdo.api.persistence.model.jdo.PersistenceMemberElement; + +import java.beans.PropertyVetoException; /** * diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/impl/RelationshipElementImpl.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/impl/RelationshipElementImpl.java index 2a0b61a3d9f..7f796476595 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/impl/RelationshipElementImpl.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/jdo/impl/RelationshipElementImpl.java @@ -22,13 +22,13 @@ package com.sun.jdo.api.persistence.model.jdo.impl; -import java.beans.PropertyVetoException; - import com.sun.jdo.api.persistence.model.ModelException; import com.sun.jdo.api.persistence.model.ModelVetoException; import com.sun.jdo.api.persistence.model.jdo.RelationshipElement; import com.sun.jdo.spi.persistence.utility.JavaTypeHelper; +import java.beans.PropertyVetoException; + /* TODO: 1. upper and lower bound defaults/ get method constraints based on field type (whether it's a collection or nullable etc.); pseudo-code: diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/MappingClassElement.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/MappingClassElement.java index e3113c1b933..c72e7f57e7c 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/MappingClassElement.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/MappingClassElement.java @@ -22,13 +22,13 @@ package com.sun.jdo.api.persistence.model.mapping; -import java.util.List; +import com.sun.jdo.api.persistence.model.ModelException; + import java.util.ArrayList; +import java.util.List; -import org.netbeans.modules.dbschema.TableElement; import org.netbeans.modules.dbschema.SchemaElement; - -import com.sun.jdo.api.persistence.model.ModelException; +import org.netbeans.modules.dbschema.TableElement; /** * diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/MappingElement.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/MappingElement.java index 751fdee0632..7272cd62fc8 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/MappingElement.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/MappingElement.java @@ -22,11 +22,11 @@ package com.sun.jdo.api.persistence.model.mapping; +import com.sun.jdo.api.persistence.model.ModelException; + import java.beans.PropertyChangeListener; import java.beans.VetoableChangeListener; -import com.sun.jdo.api.persistence.model.ModelException; - /** * * @author raccah diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/MappingFieldElement.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/MappingFieldElement.java index 162c775c658..d93e000338e 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/MappingFieldElement.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/MappingFieldElement.java @@ -22,12 +22,12 @@ package com.sun.jdo.api.persistence.model.mapping; +import com.sun.jdo.api.persistence.model.ModelException; + import java.util.ArrayList; import org.netbeans.modules.dbschema.DBMemberElement; -import com.sun.jdo.api.persistence.model.ModelException; - /** * * @author raccah diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/MappingReferenceKeyElement.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/MappingReferenceKeyElement.java index 783868acdb7..1eaadc862c5 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/MappingReferenceKeyElement.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/MappingReferenceKeyElement.java @@ -22,11 +22,12 @@ package com.sun.jdo.api.persistence.model.mapping; -import java.util.ArrayList; +import com.sun.jdo.api.persistence.model.ModelException; -import org.netbeans.modules.dbschema.*; +import java.util.ArrayList; -import com.sun.jdo.api.persistence.model.ModelException; +import org.netbeans.modules.dbschema.ColumnPairElement; +import org.netbeans.modules.dbschema.ReferenceKey; /** * This is an element which represents a relationship between two tables diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/MappingRelationshipElement.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/MappingRelationshipElement.java index dbfeb5aa883..d0efef19870 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/MappingRelationshipElement.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/MappingRelationshipElement.java @@ -22,12 +22,12 @@ package com.sun.jdo.api.persistence.model.mapping; +import com.sun.jdo.api.persistence.model.ModelException; + import java.util.ArrayList; import org.netbeans.modules.dbschema.ColumnPairElement; -import com.sun.jdo.api.persistence.model.ModelException; - /** * This is a specialized field element which represents a relationship * between two classes. The mapping portion should be set up as follows: diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/MappingTableElement.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/MappingTableElement.java index d9ed1830638..dc674b3acbc 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/MappingTableElement.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/MappingTableElement.java @@ -22,12 +22,12 @@ package com.sun.jdo.api.persistence.model.mapping; +import com.sun.jdo.api.persistence.model.ModelException; + import java.util.ArrayList; -import org.netbeans.modules.dbschema.TableElement; import org.netbeans.modules.dbschema.ColumnElement; - -import com.sun.jdo.api.persistence.model.ModelException; +import org.netbeans.modules.dbschema.TableElement; /** * This is an element which represents a database table. It exists (separately diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingClassElementImpl.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingClassElementImpl.java index aa1f8b793e2..9f88d3c7bef 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingClassElementImpl.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingClassElementImpl.java @@ -22,17 +22,31 @@ package com.sun.jdo.api.persistence.model.mapping.impl; -import java.util.*; -import java.beans.PropertyVetoException; - -import org.netbeans.modules.dbschema.*; -import org.netbeans.modules.dbschema.util.NameUtil; - -import com.sun.jdo.api.persistence.model.*; -import com.sun.jdo.api.persistence.model.mapping.*; +import com.sun.jdo.api.persistence.model.Model; +import com.sun.jdo.api.persistence.model.ModelException; +import com.sun.jdo.api.persistence.model.ModelVetoException; import com.sun.jdo.api.persistence.model.jdo.PersistenceClassElement; +import com.sun.jdo.api.persistence.model.mapping.MappingClassElement; +import com.sun.jdo.api.persistence.model.mapping.MappingFieldElement; +import com.sun.jdo.api.persistence.model.mapping.MappingReferenceKeyElement; +import com.sun.jdo.api.persistence.model.mapping.MappingTableElement; import com.sun.jdo.spi.persistence.utility.JavaTypeHelper; + +import java.beans.PropertyVetoException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; + import org.glassfish.persistence.common.I18NHelper; +import org.netbeans.modules.dbschema.ColumnElement; +import org.netbeans.modules.dbschema.DBIdentifier; +import org.netbeans.modules.dbschema.ForeignKeyElement; +import org.netbeans.modules.dbschema.SchemaElement; +import org.netbeans.modules.dbschema.TableElement; +import org.netbeans.modules.dbschema.UniqueKeyElement; +import org.netbeans.modules.dbschema.util.NameUtil; /** * diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingElementImpl.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingElementImpl.java index 123c89884c7..6dfc27fb9d2 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingElementImpl.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingElementImpl.java @@ -25,12 +25,17 @@ import com.sun.jdo.api.persistence.model.ModelException; import com.sun.jdo.api.persistence.model.ModelVetoException; import com.sun.jdo.api.persistence.model.mapping.MappingElement; -import org.glassfish.persistence.common.I18NHelper; -import java.beans.*; +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.beans.PropertyVetoException; +import java.beans.VetoableChangeListener; +import java.beans.VetoableChangeSupport; import java.text.Collator; import java.util.ResourceBundle; +import org.glassfish.persistence.common.I18NHelper; + /** * * @author raccah diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingFieldElementImpl.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingFieldElementImpl.java index d6227715bb2..72ee4d15074 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingFieldElementImpl.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingFieldElementImpl.java @@ -22,18 +22,25 @@ package com.sun.jdo.api.persistence.model.mapping.impl; -import java.util.*; +import com.sun.jdo.api.persistence.model.ModelException; +import com.sun.jdo.api.persistence.model.ModelVetoException; +import com.sun.jdo.api.persistence.model.jdo.ConcurrencyGroupElement; +import com.sun.jdo.api.persistence.model.jdo.PersistenceClassElement; +import com.sun.jdo.api.persistence.model.jdo.PersistenceFieldElement; +import com.sun.jdo.api.persistence.model.mapping.MappingClassElement; +import com.sun.jdo.api.persistence.model.mapping.MappingFieldElement; +import com.sun.jdo.api.persistence.model.mapping.MappingTableElement; +import com.sun.jdo.spi.persistence.utility.JavaTypeHelper; + import java.beans.PropertyVetoException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.ListIterator; +import org.glassfish.persistence.common.I18NHelper; import org.netbeans.modules.dbschema.DBMemberElement; import org.netbeans.modules.dbschema.util.NameUtil; -import com.sun.jdo.api.persistence.model.*; -import com.sun.jdo.api.persistence.model.mapping.*; -import com.sun.jdo.api.persistence.model.jdo.*; -import com.sun.jdo.spi.persistence.utility.JavaTypeHelper; -import org.glassfish.persistence.common.I18NHelper; - /** * * @author Mark Munro diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingMemberElementImpl.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingMemberElementImpl.java index 92eb974e778..e627833e5d6 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingMemberElementImpl.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingMemberElementImpl.java @@ -22,9 +22,10 @@ package com.sun.jdo.api.persistence.model.mapping.impl; -import java.beans.PropertyVetoException; +import com.sun.jdo.api.persistence.model.mapping.MappingClassElement; +import com.sun.jdo.api.persistence.model.mapping.MappingMemberElement; -import com.sun.jdo.api.persistence.model.mapping.*; +import java.beans.PropertyVetoException; /** * diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingReferenceKeyElementImpl.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingReferenceKeyElementImpl.java index facde83de99..798958abbed 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingReferenceKeyElementImpl.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingReferenceKeyElementImpl.java @@ -22,18 +22,21 @@ package com.sun.jdo.api.persistence.model.mapping.impl; -import java.util.ArrayList; -import java.util.ListIterator; -import java.beans.PropertyVetoException; - -import org.netbeans.modules.dbschema.*; -import org.netbeans.modules.dbschema.util.NameUtil; - import com.sun.jdo.api.persistence.model.ModelException; import com.sun.jdo.api.persistence.model.ModelVetoException; -import com.sun.jdo.api.persistence.model.mapping.MappingTableElement; import com.sun.jdo.api.persistence.model.mapping.MappingReferenceKeyElement; +import com.sun.jdo.api.persistence.model.mapping.MappingTableElement; + +import java.beans.PropertyVetoException; +import java.util.ArrayList; +import java.util.ListIterator; + import org.glassfish.persistence.common.I18NHelper; +import org.netbeans.modules.dbschema.ColumnElement; +import org.netbeans.modules.dbschema.ColumnPairElement; +import org.netbeans.modules.dbschema.DBIdentifier; +import org.netbeans.modules.dbschema.TableElement; +import org.netbeans.modules.dbschema.util.NameUtil; /** * diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingRelationshipElementImpl.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingRelationshipElementImpl.java index 4a72c7a30dd..f56cd54e6af 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingRelationshipElementImpl.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingRelationshipElementImpl.java @@ -22,17 +22,21 @@ package com.sun.jdo.api.persistence.model.mapping.impl; -import java.util.*; -import java.beans.PropertyVetoException; - -import org.netbeans.modules.dbschema.*; -import org.netbeans.modules.dbschema.util.NameUtil; - import com.sun.jdo.api.persistence.model.ModelException; import com.sun.jdo.api.persistence.model.ModelVetoException; -import com.sun.jdo.api.persistence.model.mapping.*; import com.sun.jdo.api.persistence.model.jdo.RelationshipElement; +import com.sun.jdo.api.persistence.model.mapping.MappingClassElement; +import com.sun.jdo.api.persistence.model.mapping.MappingFieldElement; +import com.sun.jdo.api.persistence.model.mapping.MappingRelationshipElement; + +import java.beans.PropertyVetoException; +import java.util.ArrayList; +import java.util.ListIterator; + import org.glassfish.persistence.common.I18NHelper; +import org.netbeans.modules.dbschema.ColumnPairElement; +import org.netbeans.modules.dbschema.DBMemberElement; +import org.netbeans.modules.dbschema.util.NameUtil; /** * diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingTableElementImpl.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingTableElementImpl.java index 65627de0715..8a4a7cdf23b 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingTableElementImpl.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/mapping/impl/MappingTableElementImpl.java @@ -22,18 +22,22 @@ package com.sun.jdo.api.persistence.model.mapping.impl; -import java.util.*; +import com.sun.jdo.api.persistence.model.ModelException; +import com.sun.jdo.api.persistence.model.ModelVetoException; +import com.sun.jdo.api.persistence.model.mapping.MappingClassElement; +import com.sun.jdo.api.persistence.model.mapping.MappingReferenceKeyElement; +import com.sun.jdo.api.persistence.model.mapping.MappingTableElement; + import java.beans.PropertyVetoException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.ListIterator; -import org.netbeans.modules.dbschema.TableElement; +import org.glassfish.persistence.common.I18NHelper; import org.netbeans.modules.dbschema.ColumnElement; +import org.netbeans.modules.dbschema.TableElement; import org.netbeans.modules.dbschema.util.NameUtil; -import com.sun.jdo.api.persistence.model.ModelException; -import com.sun.jdo.api.persistence.model.ModelVetoException; -import com.sun.jdo.api.persistence.model.mapping.*; -import org.glassfish.persistence.common.I18NHelper; - /** * * @author Mark Munro diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/util/DumpMapping.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/util/DumpMapping.java index 17606dcc196..2417b358302 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/util/DumpMapping.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/util/DumpMapping.java @@ -21,13 +21,23 @@ package com.sun.jdo.api.persistence.model.util; -import java.util.*; -import java.io.PrintStream; +import com.sun.jdo.api.persistence.model.Model; +import com.sun.jdo.api.persistence.model.jdo.ConcurrencyGroupElement; +import com.sun.jdo.api.persistence.model.jdo.PersistenceClassElement; +import com.sun.jdo.api.persistence.model.jdo.PersistenceFieldElement; +import com.sun.jdo.api.persistence.model.jdo.RelationshipElement; +import com.sun.jdo.api.persistence.model.mapping.MappingClassElement; +import com.sun.jdo.api.persistence.model.mapping.MappingReferenceKeyElement; +import com.sun.jdo.api.persistence.model.mapping.MappingRelationshipElement; +import com.sun.jdo.api.persistence.model.mapping.impl.MappingClassElementImpl; +import com.sun.jdo.api.persistence.model.mapping.impl.MappingFieldElementImpl; +import com.sun.jdo.api.persistence.model.mapping.impl.MappingRelationshipElementImpl; +import com.sun.jdo.api.persistence.model.mapping.impl.MappingTableElementImpl; -import com.sun.jdo.api.persistence.model.*; -import com.sun.jdo.api.persistence.model.mapping.*; -import com.sun.jdo.api.persistence.model.mapping.impl.*; -import com.sun.jdo.api.persistence.model.jdo.*; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.Map; import org.netbeans.modules.dbschema.ColumnElement; import org.netbeans.modules.dbschema.ColumnPairElement; diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/util/LogHelperModel.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/util/LogHelperModel.java index 4bfa09cee1a..0978eef502e 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/util/LogHelperModel.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/util/LogHelperModel.java @@ -22,9 +22,9 @@ package com.sun.jdo.api.persistence.model.util; -import com.sun.jdo.spi.persistence.utility.logging.Logger; -import com.sun.jdo.spi.persistence.utility.logging.LogHelper; import com.sun.jdo.api.persistence.model.Model; +import com.sun.jdo.spi.persistence.utility.logging.LogHelper; +import com.sun.jdo.spi.persistence.utility.logging.Logger; /** * diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/util/ModelValidationException.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/util/ModelValidationException.java index 21bf6047225..3fb1b9266a0 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/util/ModelValidationException.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/util/ModelValidationException.java @@ -22,11 +22,12 @@ package com.sun.jdo.api.persistence.model.util; +import com.sun.jdo.api.persistence.model.ModelException; +import com.sun.jdo.spi.persistence.utility.StringHelper; + import java.util.ResourceBundle; -import com.sun.jdo.api.persistence.model.ModelException; import org.glassfish.persistence.common.I18NHelper; -import com.sun.jdo.spi.persistence.utility.StringHelper; /** * diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/util/ModelValidator.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/util/ModelValidator.java index 8e9609c2603..678e289e067 100644 --- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/util/ModelValidator.java +++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/util/ModelValidator.java @@ -22,20 +22,43 @@ package com.sun.jdo.api.persistence.model.util; -import java.util.*; +import com.sun.jdo.api.persistence.model.Model; +import com.sun.jdo.api.persistence.model.jdo.PersistenceClassElement; +import com.sun.jdo.api.persistence.model.jdo.PersistenceFieldElement; +import com.sun.jdo.api.persistence.model.jdo.RelationshipElement; +import com.sun.jdo.api.persistence.model.mapping.MappingClassElement; +import com.sun.jdo.api.persistence.model.mapping.MappingFieldElement; +import com.sun.jdo.api.persistence.model.mapping.MappingReferenceKeyElement; +import com.sun.jdo.api.persistence.model.mapping.MappingRelationshipElement; +import com.sun.jdo.api.persistence.model.mapping.MappingTableElement; +import com.sun.jdo.spi.persistence.utility.JavaTypeHelper; +import com.sun.jdo.spi.persistence.utility.StringHelper; +import com.sun.jdo.spi.persistence.utility.logging.Logger; + import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.ResourceBundle; -import org.netbeans.modules.dbschema.*; +import org.glassfish.persistence.common.I18NHelper; +import org.netbeans.modules.dbschema.ColumnElement; +import org.netbeans.modules.dbschema.ColumnPairElement; +import org.netbeans.modules.dbschema.DBIdentifier; +import org.netbeans.modules.dbschema.DBMemberElement; +import org.netbeans.modules.dbschema.ForeignKeyElement; +import org.netbeans.modules.dbschema.KeyElement; +import org.netbeans.modules.dbschema.SchemaElement; +import org.netbeans.modules.dbschema.TableElement; +import org.netbeans.modules.dbschema.UniqueKeyElement; import org.netbeans.modules.dbschema.util.NameUtil; import org.netbeans.modules.dbschema.util.SQLTypeUtil; -import com.sun.jdo.api.persistence.model.Model; -import com.sun.jdo.api.persistence.model.jdo.*; -import com.sun.jdo.api.persistence.model.mapping.*; -import com.sun.jdo.spi.persistence.utility.*; -import com.sun.jdo.spi.persistence.utility.logging.Logger; -import org.glassfish.persistence.common.I18NHelper; - /** * * @author Rochelle Raccah diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/CMPBeanHelper.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/CMPBeanHelper.java index 70ee714f210..21c1e1093d4 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/CMPBeanHelper.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/CMPBeanHelper.java @@ -21,22 +21,21 @@ */ package com.sun.jdo.spi.persistence.support.ejb.cmp; -import java.util.Collection; -import java.util.ResourceBundle; +import com.sun.jdo.api.persistence.support.JDOException; +import com.sun.jdo.api.persistence.support.JDOHelper; +import com.sun.jdo.api.persistence.support.PersistenceCapable; +import com.sun.jdo.api.persistence.support.PersistenceManager; +import com.sun.jdo.spi.persistence.support.sqlstore.ejb.EJBHelper; +import com.sun.jdo.spi.persistence.utility.logging.Logger; import jakarta.ejb.DuplicateKeyException; import jakarta.ejb.EJBException; import jakarta.ejb.ObjectNotFoundException; -import com.sun.jdo.api.persistence.support.JDOHelper; -import com.sun.jdo.api.persistence.support.JDOException; -import com.sun.jdo.api.persistence.support.PersistenceCapable; -import com.sun.jdo.api.persistence.support.PersistenceManager; - -import com.sun.jdo.spi.persistence.support.sqlstore.ejb.EJBHelper; +import java.util.Collection; +import java.util.ResourceBundle; import org.glassfish.persistence.common.I18NHelper; -import com.sun.jdo.spi.persistence.utility.logging.Logger; /** Provides static helper methods for CMP bean implementation to simplify * the generated code. diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/EJBHashSet.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/EJBHashSet.java index 42749fd97b2..e4480bf5c03 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/EJBHashSet.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/EJBHashSet.java @@ -22,15 +22,18 @@ package com.sun.jdo.spi.persistence.support.ejb.cmp; -import java.util.*; - -import jakarta.ejb.EJBLocalObject; - import com.sun.jdo.api.persistence.support.PersistenceManager; import com.sun.jdo.api.persistence.support.Transaction; +import com.sun.jdo.spi.persistence.support.sqlstore.LogHelperSQLStore; import com.sun.jdo.spi.persistence.support.sqlstore.ejb.JDOEJB20Helper; import com.sun.jdo.spi.persistence.utility.logging.Logger; -import com.sun.jdo.spi.persistence.support.sqlstore.LogHelperSQLStore; + +import jakarta.ejb.EJBLocalObject; + +import java.util.Collection; +import java.util.ConcurrentModificationException; +import java.util.HashSet; +import java.util.Iterator; /* * This is the implementation of the java.util.Set interface for the CMP * fields of the Collection type. Represents many side of the relationships. diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/JDOEJB11HelperImpl.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/JDOEJB11HelperImpl.java index e3251bcc9f5..1ba9d7cbd12 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/JDOEJB11HelperImpl.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/JDOEJB11HelperImpl.java @@ -22,27 +22,34 @@ package com.sun.jdo.spi.persistence.support.ejb.cmp; -import java.util.Collection; -import java.util.Set; -import java.util.ResourceBundle; -import java.io.*; - -import jakarta.ejb.EJBObject; -import jakarta.ejb.EJBException; - -import com.sun.jdo.api.persistence.support.PersistenceManager; -import com.sun.jdo.api.persistence.support.JDOHelper; import com.sun.jdo.api.persistence.support.JDOFatalDataStoreException; import com.sun.jdo.api.persistence.support.JDOFatalInternalException; +import com.sun.jdo.api.persistence.support.JDOHelper; import com.sun.jdo.api.persistence.support.JDOObjectNotFoundException; import com.sun.jdo.api.persistence.support.JDOUserException; - -import com.sun.jdo.spi.persistence.support.sqlstore.ejb.JDOEJB11Helper; +import com.sun.jdo.api.persistence.support.PersistenceManager; import com.sun.jdo.spi.persistence.support.sqlstore.ejb.CMPHelper; +import com.sun.jdo.spi.persistence.support.sqlstore.ejb.JDOEJB11Helper; import com.sun.jdo.spi.persistence.support.sqlstore.utility.NumericConverter; import com.sun.jdo.spi.persistence.support.sqlstore.utility.NumericConverterFactory; - import com.sun.jdo.spi.persistence.utility.logging.Logger; + +import jakarta.ejb.EJBException; +import jakarta.ejb.EJBObject; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.ObjectStreamClass; +import java.io.Serializable; +import java.io.StreamCorruptedException; +import java.util.Collection; +import java.util.ResourceBundle; +import java.util.Set; + import org.glassfish.persistence.common.I18NHelper; /* diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/JDOEJB20HelperImpl.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/JDOEJB20HelperImpl.java index cf51c82809a..a9c71d7dc5a 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/JDOEJB20HelperImpl.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/JDOEJB20HelperImpl.java @@ -22,17 +22,18 @@ package com.sun.jdo.spi.persistence.support.ejb.cmp; -import java.util.Collection; -import java.util.Set; - -import jakarta.ejb.EJBLocalObject; -import jakarta.ejb.EJBException; -import jakarta.ejb.EJBContext; - import com.sun.jdo.api.persistence.support.PersistenceManager; import com.sun.jdo.spi.persistence.support.sqlstore.ejb.CMPHelper; import com.sun.jdo.spi.persistence.support.sqlstore.ejb.JDOEJB20Helper; import com.sun.jdo.spi.persistence.utility.logging.Logger; + +import jakarta.ejb.EJBContext; +import jakarta.ejb.EJBException; +import jakarta.ejb.EJBLocalObject; + +import java.util.Collection; +import java.util.Set; + import org.glassfish.persistence.common.I18NHelper; diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/LogHelperEntityFinder.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/LogHelperEntityFinder.java index c89dfbfceeb..ab9e78bff8b 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/LogHelperEntityFinder.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/LogHelperEntityFinder.java @@ -16,8 +16,8 @@ package com.sun.jdo.spi.persistence.support.ejb.cmp; -import com.sun.jdo.spi.persistence.utility.logging.Logger; import com.sun.jdo.spi.persistence.utility.logging.LogHelper; +import com.sun.jdo.spi.persistence.utility.logging.Logger; /** * diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/LogHelperEntityInternal.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/LogHelperEntityInternal.java index b611d782f9c..7b64b3c46f2 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/LogHelperEntityInternal.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/LogHelperEntityInternal.java @@ -16,8 +16,8 @@ package com.sun.jdo.spi.persistence.support.ejb.cmp; -import com.sun.jdo.spi.persistence.utility.logging.Logger; import com.sun.jdo.spi.persistence.utility.logging.LogHelper; +import com.sun.jdo.spi.persistence.utility.logging.Logger; /** * diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/LogHelperEntityLifecycle.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/LogHelperEntityLifecycle.java index 4ff850d8942..c563089aec0 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/LogHelperEntityLifecycle.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/cmp/LogHelperEntityLifecycle.java @@ -16,8 +16,8 @@ package com.sun.jdo.spi.persistence.support.ejb.cmp; -import com.sun.jdo.spi.persistence.utility.logging.Logger; import com.sun.jdo.spi.persistence.utility.logging.LogHelper; +import com.sun.jdo.spi.persistence.utility.logging.Logger; /** * diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/codegen/CMPDeployerImpl.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/codegen/CMPDeployerImpl.java index 70bb173444f..a450b2fea05 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/codegen/CMPDeployerImpl.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/codegen/CMPDeployerImpl.java @@ -16,13 +16,22 @@ package com.sun.jdo.spi.persistence.support.ejb.codegen; +import com.sun.enterprise.config.serverbeans.JavaConfig; +import com.sun.enterprise.deployment.Application; +import com.sun.jdo.spi.persistence.support.ejb.ejbc.CMPProcessor; +import com.sun.jdo.spi.persistence.support.ejb.ejbc.JDOCodeGenerator; +import com.sun.jdo.spi.persistence.support.sqlstore.ejb.EJBHelper; +import com.sun.jdo.spi.persistence.utility.logging.Logger; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.io.File; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.ResourceBundle; -import jakarta.inject.Inject; -import jakarta.inject.Named; + import javax.tools.Diagnostic; import javax.tools.DiagnosticCollector; import javax.tools.JavaCompiler; @@ -30,12 +39,6 @@ import javax.tools.StandardJavaFileManager; import javax.tools.ToolProvider; -import com.sun.enterprise.config.serverbeans.JavaConfig; -import com.sun.enterprise.deployment.Application; -import com.sun.jdo.spi.persistence.support.ejb.ejbc.CMPProcessor; -import com.sun.jdo.spi.persistence.support.ejb.ejbc.JDOCodeGenerator; -import com.sun.jdo.spi.persistence.support.sqlstore.ejb.EJBHelper; -import com.sun.jdo.spi.persistence.utility.logging.Logger; import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.api.deployment.DeploymentContext; import org.glassfish.deployment.common.DeploymentException; diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/codegen/LogHelperCmpCompiler.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/codegen/LogHelperCmpCompiler.java index d175bf61711..fe10bd6f137 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/codegen/LogHelperCmpCompiler.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/codegen/LogHelperCmpCompiler.java @@ -16,8 +16,8 @@ package com.sun.jdo.spi.persistence.support.ejb.codegen; -import com.sun.jdo.spi.persistence.utility.logging.Logger; import com.sun.jdo.spi.persistence.utility.logging.LogHelper; +import com.sun.jdo.spi.persistence.utility.logging.Logger; /** * diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/Bundle.properties b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/Bundle.properties index 0f50fd3015e..86cb9c2798e 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/Bundle.properties +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/Bundle.properties @@ -237,21 +237,6 @@ CMG.MappingConversionException=JDO74046: JDOCodeGenerator: Caught a MappingConve JDO.pm_closed_exception=JDO74047: Persistence manager is closed. -# The following messages JDO76606 through JDO76615 were originally in -# cmp/support/sqlstore/src/com/sun/jdo/spi/persistence/support/sqlstore/Bundle.properties -# They have been moved to this bundle as part of the INF#82833 -# Most of these messages had been moved to persistence/common module -# -# DeploymentEventListenerImpl messages - ejb -# -# {0} Application name. -# {1} File name. -ejb.BaseProcessor.cannotdroptables=JDO76607: Cannot drop tables for application {0}. The expected DDL file {1} is not available. -# {0} File name. -ejb.BaseProcessor.nodropfile=JDO76608: Cannot drop tables for deployment. The expected DDL file {0} is not available. - -ejb.PersistenceProcessor.nondefaultprovider=JDO76616: The java2db feature is not supported for the persistence provider ''{0}'' that you specified. Hence the tables associated to the entities of the PU named ''{1}'' would not be created and/or dropped from the database. - # # # diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/CMP11TemplateFormatter.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/CMP11TemplateFormatter.java index 17fbcc5c8db..00a555a465e 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/CMP11TemplateFormatter.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/CMP11TemplateFormatter.java @@ -22,8 +22,7 @@ package com.sun.jdo.spi.persistence.support.ejb.ejbc; -import java.io.*; - +import java.io.IOException; import java.text.MessageFormat; /* diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/CMP20TemplateFormatter.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/CMP20TemplateFormatter.java index 640afcee91d..81ddc11c1ba 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/CMP20TemplateFormatter.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/CMP20TemplateFormatter.java @@ -22,8 +22,7 @@ package com.sun.jdo.spi.persistence.support.ejb.ejbc; -import java.io.*; - +import java.io.IOException; import java.text.MessageFormat; /* diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/CMPROTemplateFormatter.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/CMPROTemplateFormatter.java index 84462254900..f2823e9a27b 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/CMPROTemplateFormatter.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/CMPROTemplateFormatter.java @@ -22,8 +22,7 @@ package com.sun.jdo.spi.persistence.support.ejb.ejbc; -import java.io.*; - +import java.io.IOException; import java.text.MessageFormat; import java.util.Properties; diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/CMPTemplateFormatter.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/CMPTemplateFormatter.java index 9e8bb61f033..3c488f50500 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/CMPTemplateFormatter.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/CMPTemplateFormatter.java @@ -22,14 +22,15 @@ package com.sun.jdo.spi.persistence.support.ejb.ejbc; -import java.io.*; +import com.sun.jdo.spi.persistence.utility.generator.JavaClassWriterHelper; +import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.InputStream; import java.text.MessageFormat; import java.util.Properties; import java.util.StringTokenizer; -import com.sun.jdo.spi.persistence.utility.generator.JavaClassWriterHelper; - /* * This is the helper class for JDO specific generation of * a concrete bean implementation. diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/DeploymentEventListenerImpl.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/DeploymentEventListenerImpl.java deleted file mode 100644 index 2713c60cfe3..00000000000 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/DeploymentEventListenerImpl.java +++ /dev/null @@ -1,231 +0,0 @@ -/* - * 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 - */ - -/* - * DeploymentEventListenerImpl.java - * - * Created on April 8, 2003. - */ - -package com.sun.jdo.spi.persistence.support.ejb.ejbc; - -//import java.io.BufferedReader; -//import java.io.File; -//import java.io.FileReader; -//import java.io.IOException; -// -//import java.sql.Connection; -//import java.sql.Statement; -//import java.sql.SQLException; -// -//import java.util.Iterator; -//import java.util.ResourceBundle; -//import java.util.Properties; -//import java.util.Collection; -// -//import com.sun.enterprise.util.io.FileUtils; -// -//import com.sun.enterprise.deployment.Application; -//import com.sun.enterprise.deployment.EjbBundleDescriptor; -//import com.sun.enterprise.deployment.IASEjbCMPEntityDescriptor; -//import com.sun.enterprise.deployment.PersistenceUnitsDescriptor; -//import com.sun.enterprise.deployment.PersistenceUnitDescriptor; -//import com.sun.enterprise.deployment.ResourceReferenceDescriptor; -// -//import com.sun.enterprise.deployment.backend.DeploymentEvent; -//import com.sun.enterprise.deployment.backend.DeploymentEventInfo; -//import com.sun.enterprise.deployment.backend.DeploymentEventListener; -//import com.sun.enterprise.deployment.backend.DeploymentEventManager; -//import com.sun.enterprise.deployment.backend.DeploymentRequest; -//import com.sun.enterprise.deployment.backend.DeploymentStatus; -//import com.sun.enterprise.deployment.backend.IASDeploymentException; -// -//import com.sun.enterprise.server.Constants; -// -//import com.sun.jdo.api.persistence.support.JDOFatalUserException; -// -//import com.sun.jdo.spi.persistence.support.sqlstore.LogHelperSQLStore; -// -//import com.sun.jdo.spi.persistence.utility.logging.Logger; -//import com.sun.jdo.spi.persistence.utility.database.DatabaseConstants; -////import com.sun.jdo.spi.persistence.support.sqlstore.ejb.*; -// -///** Implementation of the DeploymentEventListener interface for -//* creating and dropping database schema definitions at the appropriate -//* deployment/undeployment events. -//* -//*/ -public class DeploymentEventListenerImpl { -// implements DeploymentEventListener, DatabaseConstants { -// -// /** I18N message handler */ -// private final static ResourceBundle messages = I18NHelper.loadBundle( -// "com.sun.jdo.spi.persistence.support.ejb.ejbc.Bundle", // NOI18N -// DeploymentEventListenerImpl.class.getClassLoader()); -// -// /** The logger */ -// private static Logger logger = LogHelperSQLStore.getLogger(); -// -// /** Garantees singleton. -// * Registers itself during initial load -// */ -// static { -// DeploymentEventManager.addListener (new DeploymentEventListenerImpl()); -// } -// -// /** Default constructor should not be public */ -// DeploymentEventListenerImpl() { } -// -// /** -// * This method is called when a DeploymentEventManager -// * needs to deliver a code>DeploymentEvent       event. -// * @param event the DeploymentEvent to be delivered. -// */ -// public void notifyDeploymentEvent(DeploymentEvent event) { -// int type = event.getEventType(); -// switch (type) { -// case DeploymentEvent.POST_DEPLOY: -// processEvent(event.getEventInfo(), true); -// break; -// case DeploymentEvent.PRE_UNDEPLOY: -// case DeploymentEvent.PRE_DEPLOY: -// processEvent(event.getEventInfo(), false); -// break; -// default: -// break; -// } -// } -// -// /** Event handling. -// * @param source the event source. -// * @param create true if we need to create tables as part of this event. -// */ -// private void processEvent(DeploymentEventInfo info, boolean create) { -// // Get the CLI overrides. -// String cliCreateTables = null; -// String cliDropTables = null; -// -// DeploymentRequest request = info.getDeploymentRequest(); -// -// // Do nothing for drop tables on the deploy -// if (isDeploy(request) && !create) { -// return; -// } -// -// Properties cliOverrides = request.getOptionalArguments(); -// -// String cliDropAndCreateTables = cliOverrides.getProperty( -// Constants.CMP_DROP_AND_CREATE_TABLES, Constants.UNDEFINED); -// -// if (create) { -// cliCreateTables = cliOverrides.getProperty( -// Constants.CMP_CREATE_TABLES, Constants.UNDEFINED); -// -// if (cliCreateTables.equals(Constants.UNDEFINED)) { -// // It might have been specified as CMP_DROP_AND_CREATE_TABLES. -// cliCreateTables = cliDropAndCreateTables; -// } -// } else { -// cliDropTables = cliOverrides.getProperty( -// Constants.CMP_DROP_TABLES, Constants.UNDEFINED); -// } -// -// Application application = info.getApplicationDescriptor(); -// if ( application == null) { -// return; -// } -// -// processApplication(request, info, create, cliCreateTables, -// cliDropAndCreateTables, cliDropTables); -// } //processEvent -// -// /** -// * This is the method that does the actual processing of the deployment event. -// * For each application process the cmp 2.x beans if any followed by processing -// * the ejb 3.0 beans. -// * @param request the deployment request object -// * @param info the event source -// * @param create true if we need to create tables as part of this event. -// * @param cliCreateTables the cli option for creating tables -// * @param cliDropAndCreateTables the cli option for dropping old tables and creating new tables -// * @param cliDropTables the cli option to drop tables at undeploy time -// */ -// private void processApplication(DeploymentRequest request, -// DeploymentEventInfo info, boolean create, -// String cliCreateTables, String cliDropAndCreateTables, -// String cliDropTables) { -// -// if (logger.isLoggable(logger.FINE)) { -// logger.fine("ejb.DeploymentEventListenerImpl.processingevent", //NOI18N -// (isRedeploy(request)? "redeploy" : ((create)? "deploy" : "undeploy")), //NOI18N -// info.getApplicationDescriptor().getRegistrationName()); -// } -// -// // Get status value for our use and initialize it. -// DeploymentStatus status = request.getCurrentDeploymentStatus(); -// status.setStageStatus(DeploymentStatus.SUCCESS); -// status.setStageStatusMessage(""); -// -// BaseProcessor processor = -// new CMPProcessor(info, create, cliCreateTables, -// cliDropAndCreateTables, cliDropTables); -// processor.processApplication(); -// -// processor = -// new PersistenceProcessor(info, create, cliCreateTables, -// cliDropAndCreateTables, cliDropTables); -// processor.processApplication(); -// } -// -// /** -// * This method returns a boolean value that determines if we are -// * trying to do a redeployment of an existing application but doesn't -// * throw an exception. -// * @param request the deployment request object -// * @return true if we are trying to redeploy an existing application -// */ -// private boolean isRedeploy(DeploymentRequest request) { -// boolean redeploy = false; -// try { -// if (request != null) { -// redeploy = request.isReDeploy(); -// } -// } catch (IASDeploymentException e) { -// // Ignore? This is a strange exception. -// } -// return redeploy; -// } -// -// /** -// * This method returns a boolean value that determines if we are -// * trying to do a deployment of an existing application but doesn't -// * throw an exception. -// * @param request the deployment request object -// * @return true if we are trying to redeploy an existing application -// */ -// private boolean isDeploy(DeploymentRequest request) { -// boolean deploy = false; -// try { -// if (request != null) { -// deploy = request.isDeploy(); -// } -// } catch (IASDeploymentException e) { -// // Ignore? This is a strange exception. -// } -// return deploy; -// } -// -} //DeploymentEventListenerImpl diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/EJBBundleInfoHelper.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/EJBBundleInfoHelper.java index f9893ca8004..9079a5be5eb 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/EJBBundleInfoHelper.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/EJBBundleInfoHelper.java @@ -22,16 +22,17 @@ package com.sun.jdo.spi.persistence.support.ejb.ejbc; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; - import com.sun.jdo.api.persistence.mapping.ejb.AbstractNameMapper; import com.sun.jdo.api.persistence.mapping.ejb.ConversionHelper; import com.sun.jdo.api.persistence.mapping.ejb.EJBInfoHelper; import com.sun.jdo.api.persistence.model.Model; import com.sun.jdo.spi.persistence.support.ejb.model.DeploymentDescriptorModel; import com.sun.jdo.spi.persistence.support.sqlstore.ejb.DeploymentHelper; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; + import org.glassfish.ejb.deployment.descriptor.EjbBundleDescriptorImpl; import org.glassfish.ejb.deployment.descriptor.EjbCMPEntityDescriptor; import org.glassfish.ejb.deployment.descriptor.EjbDescriptor; diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/EjbConversionHelper.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/EjbConversionHelper.java index 16ee28916c9..cf3092010fa 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/EjbConversionHelper.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/EjbConversionHelper.java @@ -22,6 +22,9 @@ package com.sun.jdo.spi.persistence.support.ejb.ejbc; +import com.sun.jdo.api.persistence.mapping.ejb.ConversionHelper; +import com.sun.jdo.spi.persistence.support.ejb.model.util.NameMapper; + import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -29,8 +32,6 @@ import java.util.List; import java.util.Set; -import com.sun.jdo.api.persistence.mapping.ejb.ConversionHelper; -import com.sun.jdo.spi.persistence.support.ejb.model.util.NameMapper; import org.glassfish.ejb.deployment.descriptor.EjbBundleDescriptorImpl; import org.glassfish.ejb.deployment.descriptor.IASEjbCMPEntityDescriptor; import org.glassfish.ejb.deployment.descriptor.PersistenceDescriptor; diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/JDOCodeGenerator.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/JDOCodeGenerator.java index b66648e9f4f..9ed24f09fd5 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/JDOCodeGenerator.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/JDOCodeGenerator.java @@ -22,19 +22,6 @@ package com.sun.jdo.spi.persistence.support.ejb.ejbc; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.ResourceBundle; - import com.sun.enterprise.deployment.Application; import com.sun.enterprise.deployment.io.DescriptorConstants; import com.sun.jdo.api.persistence.enhancer.generator.Main; @@ -54,6 +41,20 @@ import com.sun.jdo.spi.persistence.support.sqlstore.query.jqlc.JDOQLParameterDeclarationParser; import com.sun.jdo.spi.persistence.utility.MergedBundle; import com.sun.jdo.spi.persistence.utility.logging.Logger; + +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.ResourceBundle; + import org.glassfish.api.deployment.DeploymentContext; import org.glassfish.ejb.deployment.descriptor.EjbBundleDescriptorImpl; import org.glassfish.ejb.deployment.descriptor.IASEjbCMPEntityDescriptor; diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/JDOCodeGeneratorHelper.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/JDOCodeGeneratorHelper.java index 905b1d05ee5..9f718b4028f 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/JDOCodeGeneratorHelper.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/JDOCodeGeneratorHelper.java @@ -22,12 +22,11 @@ package com.sun.jdo.spi.persistence.support.ejb.ejbc; -import java.util.ResourceBundle; - -import com.sun.jdo.spi.persistence.support.ejb.codegen.GeneratorException; - import com.sun.enterprise.deployment.Application; import com.sun.enterprise.deployment.EjbBundleDescriptor; +import com.sun.jdo.spi.persistence.support.ejb.codegen.GeneratorException; + +import java.util.ResourceBundle; import org.glassfish.persistence.common.I18NHelper; diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/JDOConcreteBean11Generator.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/JDOConcreteBean11Generator.java index 22238618278..6c5e2cb579e 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/JDOConcreteBean11Generator.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/JDOConcreteBean11Generator.java @@ -22,14 +22,14 @@ package com.sun.jdo.spi.persistence.support.ejb.ejbc; +import com.sun.jdo.api.persistence.model.Model; +import com.sun.jdo.api.persistence.model.jdo.PersistenceFieldElement; +import com.sun.jdo.spi.persistence.support.ejb.ejbqlc.JDOQLElements; +import com.sun.jdo.spi.persistence.support.ejb.model.util.NameMapper; + import java.io.IOException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import com.sun.jdo.api.persistence.model.Model; -import com.sun.jdo.api.persistence.model.jdo.*; - -import com.sun.jdo.spi.persistence.support.ejb.model.util.NameMapper; -import com.sun.jdo.spi.persistence.support.ejb.ejbqlc.JDOQLElements; /* * This is the JDO specific generator for the concrete CMP beans for EJB1.1. diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/JDOConcreteBean20Generator.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/JDOConcreteBean20Generator.java index 90ab8640032..407b7652a6e 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/JDOConcreteBean20Generator.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/JDOConcreteBean20Generator.java @@ -22,25 +22,29 @@ package com.sun.jdo.spi.persistence.support.ejb.ejbc; -import java.util.*; -import java.io.IOException; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.text.MessageFormat; - import com.sun.jdo.api.persistence.model.Model; import com.sun.jdo.api.persistence.model.ModelException; -import com.sun.jdo.api.persistence.model.jdo.*; - +import com.sun.jdo.api.persistence.model.jdo.PersistenceFieldElement; +import com.sun.jdo.api.persistence.model.jdo.RelationshipElement; import com.sun.jdo.api.persistence.support.JDOUserException; -import com.sun.jdo.spi.persistence.support.ejb.model.util.NameMapper; import com.sun.jdo.spi.persistence.support.ejb.ejbqlc.EJBQLC; -import com.sun.jdo.spi.persistence.support.ejb.ejbqlc.JDOQLElements; import com.sun.jdo.spi.persistence.support.ejb.ejbqlc.EJBQLException; +import com.sun.jdo.spi.persistence.support.ejb.ejbqlc.JDOQLElements; +import com.sun.jdo.spi.persistence.support.ejb.model.util.NameMapper; +import com.sun.jdo.spi.persistence.utility.generator.JavaFileWriter; +import com.sun.jdo.spi.persistence.utility.logging.Logger; + +import java.io.IOException; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.glassfish.persistence.common.I18NHelper; -import com.sun.jdo.spi.persistence.utility.generator.*; -import com.sun.jdo.spi.persistence.utility.logging.Logger; /* * This is the JDO specific generator for the concrete CMP beans for EJB2.0 diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/JDOConcreteBeanGenerator.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/JDOConcreteBeanGenerator.java index 2a9323d15b0..f0bde3f329c 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/JDOConcreteBeanGenerator.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/JDOConcreteBeanGenerator.java @@ -22,28 +22,36 @@ package com.sun.jdo.spi.persistence.support.ejb.ejbc; -import java.util.*; -import java.io.File; -import java.io.IOException; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.text.MessageFormat; - import com.sun.jdo.api.persistence.model.Model; -import com.sun.jdo.api.persistence.model.jdo.*; +import com.sun.jdo.api.persistence.model.jdo.PersistenceClassElement; +import com.sun.jdo.api.persistence.model.jdo.PersistenceFieldElement; import com.sun.jdo.api.persistence.model.mapping.MappingClassElement; import com.sun.jdo.api.persistence.model.mapping.MappingFieldElement; - +import com.sun.jdo.spi.persistence.support.ejb.ejbqlc.JDOQLElements; import com.sun.jdo.spi.persistence.support.ejb.model.DeploymentDescriptorModel; import com.sun.jdo.spi.persistence.support.ejb.model.util.NameMapper; -import com.sun.jdo.spi.persistence.support.ejb.ejbqlc.JDOQLElements; - -import org.glassfish.persistence.common.I18NHelper; import com.sun.jdo.spi.persistence.utility.StringHelper; -import com.sun.jdo.spi.persistence.utility.generator.*; -import com.sun.jdo.spi.persistence.utility.generator.io.*; +import com.sun.jdo.spi.persistence.utility.generator.JavaClassWriter; +import com.sun.jdo.spi.persistence.utility.generator.JavaClassWriterHelper; +import com.sun.jdo.spi.persistence.utility.generator.JavaFileWriter; +import com.sun.jdo.spi.persistence.utility.generator.io.IOJavaClassWriter; +import com.sun.jdo.spi.persistence.utility.generator.io.IOJavaFileWriter; import com.sun.jdo.spi.persistence.utility.logging.Logger; +import java.io.File; +import java.io.IOException; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.ResourceBundle; + +import org.glassfish.persistence.common.I18NHelper; + /* * This is the base class for JDO specific generator for the concrete CMP * beans. diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/LogHelperEJBCompiler.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/LogHelperEJBCompiler.java index d3eff4d872d..5b34cf59127 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/LogHelperEJBCompiler.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/LogHelperEJBCompiler.java @@ -16,8 +16,8 @@ package com.sun.jdo.spi.persistence.support.ejb.ejbc; -import com.sun.jdo.spi.persistence.utility.logging.Logger; import com.sun.jdo.spi.persistence.utility.logging.LogHelper; +import com.sun.jdo.spi.persistence.utility.logging.Logger; /** * diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/NameMapper.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/NameMapper.java index 7832e9473ac..b911ef94091 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/NameMapper.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/NameMapper.java @@ -22,14 +22,15 @@ package com.sun.jdo.spi.persistence.support.ejb.ejbc; +import com.sun.jdo.spi.persistence.utility.JavaTypeHelper; +import com.sun.jdo.spi.persistence.utility.StringHelper; + import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Set; -import com.sun.jdo.spi.persistence.utility.JavaTypeHelper; -import com.sun.jdo.spi.persistence.utility.StringHelper; import org.glassfish.ejb.deployment.descriptor.CMRFieldInfo; import org.glassfish.ejb.deployment.descriptor.EjbBundleDescriptorImpl; import org.glassfish.ejb.deployment.descriptor.EjbCMPEntityDescriptor; diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/PersistenceManagerServiceImpl.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/PersistenceManagerServiceImpl.java index 6e65cb11641..5cddc88231a 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/PersistenceManagerServiceImpl.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/PersistenceManagerServiceImpl.java @@ -22,13 +22,13 @@ package com.sun.jdo.spi.persistence.support.ejb.ejbc; -import com.sun.jdo.spi.persistence.utility.logging.LogHelper; import com.sun.jdo.spi.persistence.support.sqlstore.ejb.CMPHelper; -import com.sun.jdo.spi.persistence.support.sqlstore.ejb.SunContainerHelper; import com.sun.jdo.spi.persistence.support.sqlstore.ejb.LoggerFactoryiAS; +import com.sun.jdo.spi.persistence.support.sqlstore.ejb.SunContainerHelper; +import com.sun.jdo.spi.persistence.utility.logging.LogHelper; -import org.jvnet.hk2.annotations.Service; import org.glassfish.ejb.spi.CMPService; +import org.jvnet.hk2.annotations.Service; /** * This class implements CMPService contract and allows to load Sun specific implementation of the @@ -46,13 +46,6 @@ public class PersistenceManagerServiceImpl implements CMPService { // implementation of the TransactionHelper and the ContainerHelper. private static final Class helper = forceInit(SunContainerHelper.class); - // Reference and force the initialization of the DeploymentEventListener - // implementation. -/** - private static final Class listener = - forceInit("com.sun.jdo.spi.persistence.support.ejb.ejbc.DeploymentEventListenerImpl"); -**/ - public boolean isReady() { // Checks that SunContainerHelper regeistered with CMPHelper return CMPHelper.isContainerReady(); diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/EJBQLAST.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/EJBQLAST.java index 80c0f7f1353..504f300311f 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/EJBQLAST.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/EJBQLAST.java @@ -22,8 +22,8 @@ package com.sun.jdo.spi.persistence.support.ejb.ejbqlc; -import antlr.Token; import antlr.CommonAST; +import antlr.Token; import antlr.collections.AST; /** diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/EJBQLASTFactory.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/EJBQLASTFactory.java index e9c41a17d66..9fb66135c3e 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/EJBQLASTFactory.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/EJBQLASTFactory.java @@ -22,12 +22,13 @@ package com.sun.jdo.spi.persistence.support.ejb.ejbqlc; -import antlr.collections.AST; -import antlr.ASTFactory; - import java.util.ResourceBundle; + import org.glassfish.persistence.common.I18NHelper; +import antlr.ASTFactory; +import antlr.collections.AST; + /** * Factory to create and connect EJBQLAST nodes. * diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/EJBQLC.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/EJBQLC.java index fec39e63fac..44cdbc9f01c 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/EJBQLC.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/EJBQLC.java @@ -22,18 +22,19 @@ package com.sun.jdo.spi.persistence.support.ejb.ejbqlc; +import com.sun.jdo.api.persistence.model.Model; +import com.sun.jdo.spi.persistence.support.ejb.model.util.NameMapper; +import com.sun.jdo.spi.persistence.utility.generator.JavaClassWriterHelper; +import com.sun.jdo.spi.persistence.utility.logging.Logger; + import java.io.Reader; import java.io.StringReader; -import java.util.ResourceBundle; import java.lang.reflect.Method; - -import antlr.TokenBuffer; +import java.util.ResourceBundle; import org.glassfish.persistence.common.I18NHelper; -import com.sun.jdo.api.persistence.model.Model; -import com.sun.jdo.spi.persistence.support.ejb.model.util.NameMapper; -import com.sun.jdo.spi.persistence.utility.logging.Logger; -import com.sun.jdo.spi.persistence.utility.generator.JavaClassWriterHelper; + +import antlr.TokenBuffer; /** * This class is the driver of the EJBQL compiler. It controls the compiler diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/ErrorMsg.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/ErrorMsg.java index 9a42c00dac6..33e7bd2282b 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/ErrorMsg.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/ErrorMsg.java @@ -22,9 +22,11 @@ package com.sun.jdo.spi.persistence.support.ejb.ejbqlc; +import com.sun.jdo.spi.persistence.utility.logging.Logger; + import java.util.ResourceBundle; + import org.glassfish.persistence.common.I18NHelper; -import com.sun.jdo.spi.persistence.utility.logging.Logger; /** * This is a helper class to report error messages from the EJBQL compiler. diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/LogHelperQueryCompilerEJB.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/LogHelperQueryCompilerEJB.java index 608fb7a201a..65803fdac17 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/LogHelperQueryCompilerEJB.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/LogHelperQueryCompilerEJB.java @@ -16,8 +16,8 @@ package com.sun.jdo.spi.persistence.support.ejb.ejbqlc; -import com.sun.jdo.spi.persistence.utility.logging.Logger; import com.sun.jdo.spi.persistence.utility.logging.LogHelper; +import com.sun.jdo.spi.persistence.utility.logging.Logger; /** * diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/SymbolTable.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/SymbolTable.java index deceb70d57e..964f330e0b1 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/SymbolTable.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/SymbolTable.java @@ -22,8 +22,8 @@ package com.sun.jdo.spi.persistence.support.ejb.ejbqlc; -import java.util.Map; import java.util.HashMap; +import java.util.Map; /** * The symbol table handling declared identifies. diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/TypeSupport.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/TypeSupport.java index a4ba595dbfc..52e35c6c929 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/TypeSupport.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbqlc/TypeSupport.java @@ -22,13 +22,17 @@ package com.sun.jdo.spi.persistence.support.ejb.ejbqlc; -import java.util.*; - -import org.glassfish.persistence.common.I18NHelper; import com.sun.jdo.api.persistence.model.Model; -import com.sun.jdo.api.persistence.model.jdo.*; +import com.sun.jdo.api.persistence.model.jdo.PersistenceClassElement; +import com.sun.jdo.api.persistence.model.jdo.RelationshipElement; import com.sun.jdo.spi.persistence.support.ejb.model.util.NameMapper; +import java.util.HashSet; +import java.util.ResourceBundle; +import java.util.Set; + +import org.glassfish.persistence.common.I18NHelper; + /** * Helper class to support type info access. * A type info is statically an object, internally the helper uses the type name diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/enhancer/meta/EJBMetaDataModelImpl.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/enhancer/meta/EJBMetaDataModelImpl.java index 190e2cb23de..5be08e1fdb1 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/enhancer/meta/EJBMetaDataModelImpl.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/enhancer/meta/EJBMetaDataModelImpl.java @@ -22,16 +22,16 @@ package com.sun.jdo.spi.persistence.support.ejb.enhancer.meta; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.List; - import com.sun.jdo.api.persistence.enhancer.meta.ExtendedJDOMetaData; import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaDataFatalError; import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaDataModelImpl; import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaDataUserException; -import com.sun.jdo.api.persistence.model.jdo.PersistenceFieldElement; import com.sun.jdo.api.persistence.model.Model; +import com.sun.jdo.api.persistence.model.jdo.PersistenceFieldElement; + +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.List; /** diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/model/util/NameMapper.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/model/util/NameMapper.java index 7b3817fb4c1..326d19149a1 100644 --- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/model/util/NameMapper.java +++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/model/util/NameMapper.java @@ -22,6 +22,8 @@ package com.sun.jdo.spi.persistence.support.ejb.model.util; +import com.sun.jdo.api.persistence.mapping.ejb.AbstractNameMapper; + import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -30,7 +32,6 @@ import java.util.Map; import java.util.Set; -import com.sun.jdo.api.persistence.mapping.ejb.AbstractNameMapper; import org.glassfish.ejb.deployment.descriptor.EjbBundleDescriptorImpl; import org.glassfish.ejb.deployment.descriptor.EjbCMPEntityDescriptor; import org.glassfish.ejb.deployment.descriptor.PersistenceDescriptor; diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ExtentCollection.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ExtentCollection.java index 3a785290ef8..9d6615bfd33 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ExtentCollection.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ExtentCollection.java @@ -22,15 +22,16 @@ package com.sun.jdo.spi.persistence.support.sqlstore; +import com.sun.jdo.api.persistence.model.Model; import com.sun.jdo.api.persistence.support.JDOUnsupportedOptionException; import com.sun.jdo.api.persistence.support.JDOUserException; -import com.sun.jdo.api.persistence.model.Model; -import org.glassfish.persistence.common.I18NHelper; import java.util.Collection; import java.util.Iterator; import java.util.ResourceBundle; +import org.glassfish.persistence.common.I18NHelper; + /** * * @author Michael Bouschen diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/LogHelperPersistenceManager.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/LogHelperPersistenceManager.java index 41ae2e94eaf..1702f12d6e3 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/LogHelperPersistenceManager.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/LogHelperPersistenceManager.java @@ -16,8 +16,8 @@ package com.sun.jdo.spi.persistence.support.sqlstore; -import com.sun.jdo.spi.persistence.utility.logging.Logger; import com.sun.jdo.spi.persistence.utility.logging.LogHelper; +import com.sun.jdo.spi.persistence.utility.logging.Logger; /** * diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/LogHelperSQLStore.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/LogHelperSQLStore.java index 679f6fd5092..5eb7d292cbb 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/LogHelperSQLStore.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/LogHelperSQLStore.java @@ -16,8 +16,8 @@ package com.sun.jdo.spi.persistence.support.sqlstore; -import com.sun.jdo.spi.persistence.utility.logging.Logger; import com.sun.jdo.spi.persistence.utility.logging.LogHelper; +import com.sun.jdo.spi.persistence.utility.logging.Logger; /** * diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/LogHelperStateManager.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/LogHelperStateManager.java index 5aeac277f5e..9ae43bf56b3 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/LogHelperStateManager.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/LogHelperStateManager.java @@ -16,8 +16,8 @@ package com.sun.jdo.spi.persistence.support.sqlstore; -import com.sun.jdo.spi.persistence.utility.logging.Logger; import com.sun.jdo.spi.persistence.utility.logging.LogHelper; +import com.sun.jdo.spi.persistence.utility.logging.Logger; /** * diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/LogHelperTransaction.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/LogHelperTransaction.java index 1b890f20c05..cd3b6885f9f 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/LogHelperTransaction.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/LogHelperTransaction.java @@ -16,8 +16,8 @@ package com.sun.jdo.spi.persistence.support.sqlstore; -import com.sun.jdo.spi.persistence.utility.logging.Logger; import com.sun.jdo.spi.persistence.utility.logging.LogHelper; +import com.sun.jdo.spi.persistence.utility.logging.Logger; /** * diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/RuntimeVersion.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/RuntimeVersion.java index 8fbd075a16e..1cb00d3609c 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/RuntimeVersion.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/RuntimeVersion.java @@ -23,7 +23,6 @@ package com.sun.jdo.spi.persistence.support.sqlstore; import com.sun.jdo.api.persistence.support.JDOException; -import org.glassfish.persistence.common.I18NHelper; import java.io.FileNotFoundException; import java.io.InputStream; @@ -32,6 +31,8 @@ import java.util.Properties; import java.util.ResourceBundle; +import org.glassfish.persistence.common.I18NHelper; + public class RuntimeVersion { private static Properties _properties = new Properties(); private final static ResourceBundle vendor_info = I18NHelper.loadBundle( diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/SQLStateManager.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/SQLStateManager.java index 27cc1f90f17..fe2b4cc9983 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/SQLStateManager.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/SQLStateManager.java @@ -22,27 +22,41 @@ package com.sun.jdo.spi.persistence.support.sqlstore; -import com.sun.jdo.api.persistence.support.*; +import com.sun.jdo.api.persistence.support.JDOException; +import com.sun.jdo.api.persistence.support.JDOFatalInternalException; +import com.sun.jdo.api.persistence.support.JDOObjectNotFoundException; +import com.sun.jdo.api.persistence.support.JDOUnsupportedOptionException; +import com.sun.jdo.api.persistence.support.JDOUserException; import com.sun.jdo.spi.persistence.support.sqlstore.ejb.EJBHelper; -import com.sun.jdo.spi.persistence.support.sqlstore.model.*; +import com.sun.jdo.spi.persistence.support.sqlstore.model.ClassDesc; +import com.sun.jdo.spi.persistence.support.sqlstore.model.FieldDesc; +import com.sun.jdo.spi.persistence.support.sqlstore.model.ForeignFieldDesc; +import com.sun.jdo.spi.persistence.support.sqlstore.model.LocalFieldDesc; import com.sun.jdo.spi.persistence.support.sqlstore.query.jqlc.QueryValueFetcher; import com.sun.jdo.spi.persistence.support.sqlstore.sco.SqlTimestamp; import com.sun.jdo.spi.persistence.support.sqlstore.sql.UpdateObjectDescImpl; +import com.sun.jdo.spi.persistence.support.sqlstore.state.Hollow; import com.sun.jdo.spi.persistence.support.sqlstore.state.LifeCycleState; -import com.sun.jdo.spi.persistence.support.sqlstore.state.PersistentNonTransactional; import com.sun.jdo.spi.persistence.support.sqlstore.state.PersistentClean; -import com.sun.jdo.spi.persistence.support.sqlstore.state.Hollow; +import com.sun.jdo.spi.persistence.support.sqlstore.state.PersistentNonTransactional; import com.sun.jdo.spi.persistence.utility.NullSemaphore; import com.sun.jdo.spi.persistence.utility.Semaphore; import com.sun.jdo.spi.persistence.utility.SemaphoreImpl; import com.sun.jdo.spi.persistence.utility.logging.Logger; -import org.glassfish.persistence.common.I18NHelper; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.sql.Timestamp; -import java.util.*; +import java.util.ArrayList; +import java.util.BitSet; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.ResourceBundle; + +import org.glassfish.persistence.common.I18NHelper; /** diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/SQLStoreManager.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/SQLStoreManager.java index 89f81a132d3..ffd6ab1a84a 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/SQLStoreManager.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/SQLStoreManager.java @@ -24,20 +24,36 @@ package com.sun.jdo.spi.persistence.support.sqlstore; // use internal version: import com.sun.jdo.api.persistence.support.Transaction; - -import com.sun.jdo.api.persistence.support.*; +import com.sun.jdo.api.persistence.support.JDODataStoreException; +import com.sun.jdo.api.persistence.support.JDOException; +import com.sun.jdo.api.persistence.support.JDOFatalInternalException; import com.sun.jdo.spi.persistence.support.sqlstore.database.DBVendorType; -import com.sun.jdo.spi.persistence.support.sqlstore.model.*; +import com.sun.jdo.spi.persistence.support.sqlstore.model.ClassDesc; +import com.sun.jdo.spi.persistence.support.sqlstore.model.ConfigCacheImpl; +import com.sun.jdo.spi.persistence.support.sqlstore.model.FieldDesc; +import com.sun.jdo.spi.persistence.support.sqlstore.model.ForeignFieldDesc; import com.sun.jdo.spi.persistence.support.sqlstore.sql.RetrieveDescImpl; import com.sun.jdo.spi.persistence.support.sqlstore.sql.UpdateObjectDescImpl; import com.sun.jdo.spi.persistence.support.sqlstore.sql.concurrency.Concurrency; -import com.sun.jdo.spi.persistence.support.sqlstore.sql.generator.*; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.generator.DBStatement; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.generator.SelectQueryPlan; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.generator.SelectStatement; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.generator.UpdateQueryPlan; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.generator.UpdateStatement; import com.sun.jdo.spi.persistence.utility.StringHelper; import com.sun.jdo.spi.persistence.utility.logging.Logger; -import org.glassfish.persistence.common.I18NHelper; -import java.sql.*; -import java.util.*; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.ResourceBundle; + +import org.glassfish.persistence.common.I18NHelper; /** *

      This class connects to a persistent store. It supports diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/Transaction.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/Transaction.java index 68451cdd182..1b617b62795 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/Transaction.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/Transaction.java @@ -16,8 +16,10 @@ package com.sun.jdo.spi.persistence.support.sqlstore; -import java.sql.*; -import jakarta.transaction.*; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; + +import java.sql.Connection; public interface Transaction extends com.sun.jdo.api.persistence.support.Transaction, Synchronization { diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/connection/ConnectionImpl.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/connection/ConnectionImpl.java index 2785d1dbb50..e4459129fe8 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/connection/ConnectionImpl.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/connection/ConnectionImpl.java @@ -24,13 +24,26 @@ import com.sun.jdo.api.persistence.support.JDODataStoreException; import com.sun.jdo.api.persistence.support.Transaction; +import com.sun.jdo.spi.persistence.support.sqlstore.LogHelperSQLStore; import com.sun.jdo.spi.persistence.support.sqlstore.ejb.EJBHelper; import com.sun.jdo.spi.persistence.utility.Linkable; import com.sun.jdo.spi.persistence.utility.logging.Logger; -import com.sun.jdo.spi.persistence.support.sqlstore.LogHelperSQLStore; - -import java.sql.*; +import java.sql.Array; +import java.sql.Blob; +import java.sql.CallableStatement; +import java.sql.Clob; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.NClob; +import java.sql.PreparedStatement; +import java.sql.SQLClientInfoException; +import java.sql.SQLException; +import java.sql.SQLWarning; +import java.sql.SQLXML; +import java.sql.Savepoint; +import java.sql.Statement; +import java.sql.Struct; import java.util.Properties; import java.util.concurrent.Executor; diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/connection/ConnectionManager.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/connection/ConnectionManager.java index cd313fcb187..d39ea5ce511 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/connection/ConnectionManager.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/connection/ConnectionManager.java @@ -22,14 +22,12 @@ package com.sun.jdo.spi.persistence.support.sqlstore.connection; -import org.glassfish.persistence.common.I18NHelper; import com.sun.jdo.api.persistence.support.Transaction; +import com.sun.jdo.spi.persistence.support.sqlstore.LogHelperSQLStore; +import com.sun.jdo.spi.persistence.support.sqlstore.utility.StringScanner; import com.sun.jdo.spi.persistence.utility.DoubleLinkedList; import com.sun.jdo.spi.persistence.utility.Linkable; -import com.sun.jdo.spi.persistence.support.sqlstore.utility.StringScanner; import com.sun.jdo.spi.persistence.utility.logging.Logger; -import com.sun.jdo.spi.persistence.support.sqlstore.LogHelperSQLStore; - import java.sql.Connection; import java.sql.DriverManager; @@ -37,6 +35,8 @@ import java.util.Hashtable; import java.util.ResourceBundle; +import org.glassfish.persistence.common.I18NHelper; + /** *

      This class represents a connection manager, which creates a * JDBC driver manager and manages diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/database/BaseSpecialDBOperation.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/database/BaseSpecialDBOperation.java index f333d9b6c4c..ac321c3659c 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/database/BaseSpecialDBOperation.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/database/BaseSpecialDBOperation.java @@ -16,12 +16,12 @@ package com.sun.jdo.spi.persistence.support.sqlstore.database; -import java.util.List; +import com.sun.jdo.api.persistence.support.SpecialDBOperation; + +import java.sql.DatabaseMetaData; import java.sql.PreparedStatement; import java.sql.SQLException; -import java.sql.DatabaseMetaData; - -import com.sun.jdo.api.persistence.support.SpecialDBOperation; +import java.util.List; /** * BaseSpecialDBOperation is the base class for all classes implementing diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/database/DBVendorType.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/database/DBVendorType.java index 4ce97e92a05..9525da78535 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/database/DBVendorType.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/database/DBVendorType.java @@ -22,18 +22,19 @@ import com.sun.jdo.api.persistence.support.SpecialDBOperation; import com.sun.jdo.spi.persistence.support.sqlstore.LogHelperSQLStore; import com.sun.jdo.spi.persistence.utility.FieldTypeEnumeration; -import org.glassfish.persistence.common.database.PropertyHelper; -import org.glassfish.persistence.common.database.DBVendorTypeHelper; import com.sun.jdo.spi.persistence.utility.logging.Logger; -import org.glassfish.persistence.common.I18NHelper; import java.io.IOException; -import java.sql.SQLException; import java.sql.DatabaseMetaData; +import java.sql.SQLException; import java.util.HashMap; import java.util.Properties; import java.util.ResourceBundle; +import org.glassfish.persistence.common.I18NHelper; +import org.glassfish.persistence.common.database.DBVendorTypeHelper; +import org.glassfish.persistence.common.database.PropertyHelper; + /** diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/database/oracle/OracleSpecialDBOperation.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/database/oracle/OracleSpecialDBOperation.java index 422071454ed..673b7b4ba56 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/database/oracle/OracleSpecialDBOperation.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/database/oracle/OracleSpecialDBOperation.java @@ -51,19 +51,20 @@ package com.sun.jdo.spi.persistence.support.sqlstore.database.oracle; -import java.util.List; -import java.util.Arrays; +import com.sun.jdo.api.persistence.support.FieldMapping; +import com.sun.jdo.spi.persistence.support.sqlstore.LogHelperSQLStore; +import com.sun.jdo.spi.persistence.support.sqlstore.database.BaseSpecialDBOperation; +import com.sun.jdo.spi.persistence.utility.logging.Logger; + import java.security.AccessController; import java.security.PrivilegedAction; -import java.sql.PreparedStatement; +import java.sql.Connection; import java.sql.DatabaseMetaData; +import java.sql.PreparedStatement; import java.sql.SQLException; -import java.sql.Connection; import java.sql.Types; -import com.sun.jdo.api.persistence.support.FieldMapping; -import com.sun.jdo.spi.persistence.support.sqlstore.LogHelperSQLStore; -import com.sun.jdo.spi.persistence.support.sqlstore.database.BaseSpecialDBOperation; -import com.sun.jdo.spi.persistence.utility.logging.Logger; +import java.util.Arrays; +import java.util.List; /** * OracleSpecialDBOperation is derived class for Oracle specific operation. diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/CMPHelper.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/CMPHelper.java index c52629dcfa0..338a015968e 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/CMPHelper.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/CMPHelper.java @@ -21,10 +21,6 @@ */ package com.sun.jdo.spi.persistence.support.sqlstore.ejb; -import java.util.ResourceBundle; - -import org.glassfish.persistence.common.I18NHelper; - import com.sun.jdo.api.persistence.support.JDOFatalInternalException; import com.sun.jdo.api.persistence.support.PersistenceManager; import com.sun.jdo.api.persistence.support.PersistenceManagerFactory; @@ -37,6 +33,10 @@ import jakarta.ejb.EJBObject; import jakarta.ejb.EntityContext; +import java.util.ResourceBundle; + +import org.glassfish.persistence.common.I18NHelper; + /** Provides helper methods for CMP support implementation with the * application server specific information. Calls corresponding methods * on the registered class which implements ContainerHelper interface. diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/ContainerHelper.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/ContainerHelper.java index d62b420b1fb..976ca1612a8 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/ContainerHelper.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/ContainerHelper.java @@ -22,11 +22,14 @@ package com.sun.jdo.spi.persistence.support.sqlstore.ejb; -import jakarta.ejb.*; - import com.sun.jdo.api.persistence.support.PersistenceManager; import com.sun.jdo.api.persistence.support.PersistenceManagerFactory; +import jakarta.ejb.EJBContext; +import jakarta.ejb.EJBLocalObject; +import jakarta.ejb.EJBObject; +import jakarta.ejb.EntityContext; + /** Provide an implementation that supports CMP integration with information * required for such support. This is an interface that a helper class * implements that is specific to an application server. diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/EJBHelper.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/EJBHelper.java index 0a04bc9d6be..5390278fbf3 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/EJBHelper.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/EJBHelper.java @@ -21,10 +21,6 @@ */ package com.sun.jdo.spi.persistence.support.sqlstore.ejb; -import java.util.ResourceBundle; - -import org.glassfish.persistence.common.I18NHelper; - import com.sun.jdo.api.persistence.support.JDOFatalInternalException; import com.sun.jdo.api.persistence.support.PersistenceManagerFactory; @@ -35,6 +31,10 @@ import jakarta.transaction.TransactionManager; import jakarta.transaction.UserTransaction; +import java.util.ResourceBundle; + +import org.glassfish.persistence.common.I18NHelper; + /** Provides helper methods for a Forte for Java implementation with the * application server specific information in the distributed transaction * environment. Calls corresponding methods on the registered class which diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/JDOEJB11Helper.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/JDOEJB11Helper.java index e59c552921c..acdf91cef9c 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/JDOEJB11Helper.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/JDOEJB11Helper.java @@ -22,13 +22,14 @@ package com.sun.jdo.spi.persistence.support.sqlstore.ejb; -import java.util.Collection; -import java.util.Set; +import com.sun.jdo.api.persistence.support.PersistenceManager; +import com.sun.jdo.spi.persistence.support.sqlstore.utility.NumericConverter; import jakarta.ejb.EJBObject; -import com.sun.jdo.api.persistence.support.PersistenceManager; -import com.sun.jdo.spi.persistence.support.sqlstore.utility.NumericConverter; +import java.io.Serializable; +import java.util.Collection; +import java.util.Set; /** * This is the helper interface for conversion of persistence-capable instances diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/JDOEJB20Helper.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/JDOEJB20Helper.java index 0fbfa37ebe7..5fc69072af8 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/JDOEJB20Helper.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/JDOEJB20Helper.java @@ -22,13 +22,13 @@ package com.sun.jdo.spi.persistence.support.sqlstore.ejb; -import java.util.Collection; -import java.util.Set; +import com.sun.jdo.api.persistence.support.PersistenceManager; -import jakarta.ejb.EJBLocalObject; import jakarta.ejb.EJBContext; +import jakarta.ejb.EJBLocalObject; -import com.sun.jdo.api.persistence.support.PersistenceManager; +import java.util.Collection; +import java.util.Set; /* * This is the helper interface for conversion of persistence-capable instances diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/LoggerFactoryiAS.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/LoggerFactoryiAS.java index 37532bd157c..41d76d4d7a9 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/LoggerFactoryiAS.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/LoggerFactoryiAS.java @@ -16,12 +16,12 @@ package com.sun.jdo.spi.persistence.support.sqlstore.ejb; -import java.security.AccessController; -import java.security.PrivilegedAction; - import com.sun.jdo.spi.persistence.utility.logging.LoggerFactoryJDK14; import com.sun.jdo.spi.persistence.utility.logging.LoggerJDK14; +import java.security.AccessController; +import java.security.PrivilegedAction; + /** * diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/TransactionHelper.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/TransactionHelper.java index a0b699b34c5..7d7d713bbd8 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/TransactionHelper.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/TransactionHelper.java @@ -22,10 +22,15 @@ package com.sun.jdo.spi.persistence.support.sqlstore.ejb; -import jakarta.transaction.*; - import com.sun.jdo.api.persistence.support.PersistenceManagerFactory; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; + /** Provide a Forte for Java implementation with information about the distributed * transaction environment. This is an interface that a helper class * implements that is specific to a managed environment. diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/TransactionHelperImpl.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/TransactionHelperImpl.java index 4d6ca8df120..a04c402db53 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/TransactionHelperImpl.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/TransactionHelperImpl.java @@ -22,11 +22,16 @@ package com.sun.jdo.spi.persistence.support.sqlstore.ejb; -import jakarta.transaction.*; - import com.sun.jdo.api.persistence.model.ClassLoaderStrategy; import com.sun.jdo.api.persistence.support.PersistenceManagerFactory; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; + /** This is an abstract class which is a generic implementation of the * TransactionHelper interface. Each concrete implementation that extends * this class is used for information about the distributed diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/ConnectionFactoryImpl.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/ConnectionFactoryImpl.java index d4089dc81c3..18433cca5b3 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/ConnectionFactoryImpl.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/ConnectionFactoryImpl.java @@ -22,6 +22,15 @@ package com.sun.jdo.spi.persistence.support.sqlstore.impl; +import com.sun.jdo.api.persistence.support.ConnectionFactory; +import com.sun.jdo.api.persistence.support.JDOCanRetryException; +import com.sun.jdo.api.persistence.support.JDODataStoreException; +import com.sun.jdo.api.persistence.support.JDOException; +import com.sun.jdo.api.persistence.support.JDOFatalException; +import com.sun.jdo.api.persistence.support.JDOUnsupportedOptionException; +import com.sun.jdo.api.persistence.support.JDOUserException; +import com.sun.jdo.spi.persistence.support.sqlstore.connection.ConnectionManager; + import java.io.PrintWriter; import java.sql.Connection; import java.sql.DatabaseMetaData; @@ -29,9 +38,6 @@ import java.util.Arrays; import java.util.ResourceBundle; - -import com.sun.jdo.api.persistence.support.*; -import com.sun.jdo.spi.persistence.support.sqlstore.connection.ConnectionManager; import org.glassfish.persistence.common.I18NHelper; /** diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/PersistenceManagerImpl.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/PersistenceManagerImpl.java index d52cef666d4..68f5480e364 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/PersistenceManagerImpl.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/PersistenceManagerImpl.java @@ -22,12 +22,28 @@ package com.sun.jdo.spi.persistence.support.sqlstore.impl; -import com.sun.jdo.api.persistence.support.*; +import com.sun.jdo.api.persistence.support.JDODataStoreException; +import com.sun.jdo.api.persistence.support.JDODuplicateObjectIdException; +import com.sun.jdo.api.persistence.support.JDOException; +import com.sun.jdo.api.persistence.support.JDOFatalInternalException; +import com.sun.jdo.api.persistence.support.JDOFatalUserException; +import com.sun.jdo.api.persistence.support.JDOHelper; +import com.sun.jdo.api.persistence.support.JDOUserException; +import com.sun.jdo.api.persistence.support.Query; import com.sun.jdo.api.persistence.support.Transaction; -import com.sun.jdo.spi.persistence.support.sqlstore.*; +import com.sun.jdo.spi.persistence.support.sqlstore.ExtentCollection; +import com.sun.jdo.spi.persistence.support.sqlstore.LogHelperPersistenceManager; import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceCapable; +import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceConfig; import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceManager; import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceManagerFactory; +import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceStore; +import com.sun.jdo.spi.persistence.support.sqlstore.RetrieveDesc; +import com.sun.jdo.spi.persistence.support.sqlstore.RuntimeVersion; +import com.sun.jdo.spi.persistence.support.sqlstore.SCOCollection; +import com.sun.jdo.spi.persistence.support.sqlstore.StateManager; +import com.sun.jdo.spi.persistence.support.sqlstore.ValueFetcher; +import com.sun.jdo.spi.persistence.support.sqlstore.VersionConsistencyCache; import com.sun.jdo.spi.persistence.support.sqlstore.ejb.EJBHelper; import com.sun.jdo.spi.persistence.support.sqlstore.query.QueryImpl; import com.sun.jdo.spi.persistence.utility.NullSemaphore; @@ -35,13 +51,26 @@ import com.sun.jdo.spi.persistence.utility.SemaphoreImpl; import com.sun.jdo.spi.persistence.utility.logging.Logger; -import org.glassfish.persistence.common.I18NHelper; import jakarta.transaction.Status; + import java.io.File; import java.io.FilenameFilter; import java.lang.reflect.Constructor; import java.lang.reflect.Field; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.ResourceBundle; +import java.util.Set; + +import org.glassfish.persistence.common.I18NHelper; public class PersistenceManagerImpl implements PersistenceManager { /** diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/PersistenceManagerWrapper.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/PersistenceManagerWrapper.java index 010dedace33..9a38e42b70e 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/PersistenceManagerWrapper.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/PersistenceManagerWrapper.java @@ -22,13 +22,18 @@ package com.sun.jdo.spi.persistence.support.sqlstore.impl; -import com.sun.jdo.api.persistence.support.*; -import org.glassfish.persistence.common.I18NHelper; +import com.sun.jdo.api.persistence.support.JDOUserException; +import com.sun.jdo.api.persistence.support.PersistenceManager; +import com.sun.jdo.api.persistence.support.PersistenceManagerFactory; +import com.sun.jdo.api.persistence.support.Query; +import com.sun.jdo.api.persistence.support.Transaction; import java.util.Collection; import java.util.Properties; import java.util.ResourceBundle; +import org.glassfish.persistence.common.I18NHelper; + /** PersistenceManagerWrapper is .... */ diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/TransactionImpl.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/TransactionImpl.java index f6c0c3d6f26..2bca5756aa5 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/TransactionImpl.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/TransactionImpl.java @@ -22,28 +22,31 @@ package com.sun.jdo.spi.persistence.support.sqlstore.impl; -import jakarta.transaction.*; - -import java.util.*; -import java.sql.Connection; -import javax.sql.DataSource; - import com.sun.jdo.api.persistence.support.ConnectionFactory; +import com.sun.jdo.api.persistence.support.JDODataStoreException; import com.sun.jdo.api.persistence.support.JDOException; -import com.sun.jdo.api.persistence.support.JDOUnsupportedOptionException; import com.sun.jdo.api.persistence.support.JDOFatalInternalException; +import com.sun.jdo.api.persistence.support.JDOUnsupportedOptionException; import com.sun.jdo.api.persistence.support.JDOUserException; -import com.sun.jdo.api.persistence.support.JDODataStoreException; - +import com.sun.jdo.spi.persistence.support.sqlstore.LogHelperTransaction; import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceManager; import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceManagerFactory; -import org.glassfish.persistence.common.I18NHelper; - import com.sun.jdo.spi.persistence.support.sqlstore.connection.ConnectionImpl; - import com.sun.jdo.spi.persistence.support.sqlstore.ejb.EJBHelper; import com.sun.jdo.spi.persistence.utility.logging.Logger; -import com.sun.jdo.spi.persistence.support.sqlstore.LogHelperTransaction; + +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; +import jakarta.transaction.TransactionManager; + +import java.sql.Connection; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.ResourceBundle; + +import javax.sql.DataSource; + +import org.glassfish.persistence.common.I18NHelper; /** * diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/VersionConsistencyCacheImpl.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/VersionConsistencyCacheImpl.java index 10319fee549..360aefc6ebd 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/VersionConsistencyCacheImpl.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/VersionConsistencyCacheImpl.java @@ -16,23 +16,22 @@ package com.sun.jdo.spi.persistence.support.sqlstore.impl; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Properties; -import java.util.ResourceBundle; - import com.sun.appserv.util.cache.Cache; import com.sun.appserv.util.cache.CacheListener; import com.sun.appserv.util.cache.LruCache; - import com.sun.jdo.spi.persistence.support.sqlstore.LogHelperPersistenceManager; import com.sun.jdo.spi.persistence.support.sqlstore.StateManager; import com.sun.jdo.spi.persistence.support.sqlstore.VersionConsistencyCache; - import com.sun.jdo.spi.persistence.utility.BucketizedHashtable; import com.sun.jdo.spi.persistence.utility.logging.Logger; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Properties; +import java.util.ResourceBundle; + import org.glassfish.persistence.common.I18NHelper; diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/ClassDesc.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/ClassDesc.java index 1912668535c..6a2717022a6 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/ClassDesc.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/ClassDesc.java @@ -23,9 +23,6 @@ package com.sun.jdo.spi.persistence.support.sqlstore.model; -import org.netbeans.modules.dbschema.ColumnElement; -import org.netbeans.modules.dbschema.ColumnPairElement; -import org.netbeans.modules.dbschema.TableElement; import com.sun.jdo.api.persistence.model.Model; import com.sun.jdo.api.persistence.model.jdo.ConcurrencyGroupElement; import com.sun.jdo.api.persistence.model.jdo.PersistenceClassElement; @@ -34,20 +31,49 @@ import com.sun.jdo.api.persistence.model.mapping.MappingClassElement; import com.sun.jdo.api.persistence.model.mapping.MappingFieldElement; import com.sun.jdo.api.persistence.model.mapping.MappingRelationshipElement; -import com.sun.jdo.api.persistence.model.mapping.impl.*; -import com.sun.jdo.api.persistence.support.*; -import com.sun.jdo.spi.persistence.support.sqlstore.*; +import com.sun.jdo.api.persistence.model.mapping.impl.MappingClassElementImpl; +import com.sun.jdo.api.persistence.model.mapping.impl.MappingFieldElementImpl; +import com.sun.jdo.api.persistence.model.mapping.impl.MappingReferenceKeyElementImpl; +import com.sun.jdo.api.persistence.model.mapping.impl.MappingRelationshipElementImpl; +import com.sun.jdo.api.persistence.model.mapping.impl.MappingTableElementImpl; +import com.sun.jdo.api.persistence.support.JDOException; +import com.sun.jdo.api.persistence.support.JDOFatalInternalException; +import com.sun.jdo.api.persistence.support.JDOFatalUserException; +import com.sun.jdo.api.persistence.support.JDOUnsupportedOptionException; +import com.sun.jdo.spi.persistence.support.sqlstore.ActionDesc; +import com.sun.jdo.spi.persistence.support.sqlstore.ConfigCache; +import com.sun.jdo.spi.persistence.support.sqlstore.LogHelperSQLStore; +import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceStore; +import com.sun.jdo.spi.persistence.support.sqlstore.RetrieveDesc; +import com.sun.jdo.spi.persistence.support.sqlstore.SQLStateManager; +import com.sun.jdo.spi.persistence.support.sqlstore.SQLStoreManager; +import com.sun.jdo.spi.persistence.support.sqlstore.StateManager; import com.sun.jdo.spi.persistence.support.sqlstore.sql.RetrieveDescImpl; import com.sun.jdo.spi.persistence.support.sqlstore.sql.UpdateObjectDescImpl; -import com.sun.jdo.spi.persistence.support.sqlstore.sql.concurrency.*; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.concurrency.Concurrency; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.concurrency.ConcurrencyCheckDirty; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.concurrency.ConcurrencyDBExplicit; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.concurrency.ConcurrencyDBNative; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.concurrency.ConcurrencyOptVerify; import com.sun.jdo.spi.persistence.support.sqlstore.sql.generator.UpdateQueryPlan; import com.sun.jdo.spi.persistence.utility.StringHelper; import com.sun.jdo.spi.persistence.utility.logging.Logger; -import org.glassfish.persistence.common.I18NHelper; import java.lang.reflect.Constructor; import java.lang.reflect.Field; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.ResourceBundle; + +import org.glassfish.persistence.common.I18NHelper; +import org.netbeans.modules.dbschema.ColumnElement; +import org.netbeans.modules.dbschema.ColumnPairElement; +import org.netbeans.modules.dbschema.TableElement; /** * diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/ConfigCacheImpl.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/ConfigCacheImpl.java index 5012990eb98..5e8b8d4a16e 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/ConfigCacheImpl.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/ConfigCacheImpl.java @@ -16,6 +16,7 @@ package com.sun.jdo.spi.persistence.support.sqlstore.model; +import com.sun.jdo.api.persistence.model.Model; import com.sun.jdo.spi.persistence.support.sqlstore.ConfigCache; import com.sun.jdo.spi.persistence.support.sqlstore.LogHelperSQLStore; import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceConfig; @@ -23,10 +24,13 @@ import com.sun.jdo.spi.persistence.support.sqlstore.ejb.ApplicationLifeCycleEventListener; import com.sun.jdo.spi.persistence.support.sqlstore.ejb.EJBHelper; import com.sun.jdo.spi.persistence.support.sqlstore.query.util.type.TypeTable; -import com.sun.jdo.api.persistence.model.Model; import com.sun.jdo.spi.persistence.utility.logging.Logger; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; /** * Caches SQLStore config information. diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/FieldDesc.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/FieldDesc.java index 188e11cc099..02c57ab5976 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/FieldDesc.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/FieldDesc.java @@ -24,14 +24,17 @@ package com.sun.jdo.spi.persistence.support.sqlstore.model; -import com.sun.jdo.api.persistence.support.JDOUserException; import com.sun.jdo.api.persistence.support.JDOFatalUserException; -import com.sun.jdo.spi.persistence.support.sqlstore.*; +import com.sun.jdo.api.persistence.support.JDOUserException; +import com.sun.jdo.spi.persistence.support.sqlstore.LogHelperSQLStore; +import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceCapable; +import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceManager; +import com.sun.jdo.spi.persistence.support.sqlstore.SCO; +import com.sun.jdo.spi.persistence.support.sqlstore.SCODate; +import com.sun.jdo.spi.persistence.support.sqlstore.StateManager; import com.sun.jdo.spi.persistence.support.sqlstore.sco.SqlTimestamp; import com.sun.jdo.spi.persistence.utility.FieldTypeEnumeration; import com.sun.jdo.spi.persistence.utility.logging.Logger; -import org.netbeans.modules.dbschema.ColumnElement; -import org.glassfish.persistence.common.I18NHelper; import java.lang.reflect.Field; import java.math.BigDecimal; @@ -40,6 +43,9 @@ import java.util.Date; import java.util.ResourceBundle; +import org.glassfish.persistence.common.I18NHelper; +import org.netbeans.modules.dbschema.ColumnElement; + /** * */ diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/ForeignFieldDesc.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/ForeignFieldDesc.java index d42ebfa66f0..cb77f0867f5 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/ForeignFieldDesc.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/ForeignFieldDesc.java @@ -23,17 +23,18 @@ package com.sun.jdo.spi.persistence.support.sqlstore.model; -import org.netbeans.modules.dbschema.ColumnElement; -import org.netbeans.modules.dbschema.TableElement; import com.sun.jdo.api.persistence.model.jdo.RelationshipElement; import com.sun.jdo.api.persistence.support.JDOFatalInternalException; import com.sun.jdo.spi.persistence.support.sqlstore.SQLStateManager; -import org.glassfish.persistence.common.I18NHelper; import com.sun.jdo.spi.persistence.utility.logging.Logger; import java.lang.reflect.Field; import java.util.ArrayList; +import org.glassfish.persistence.common.I18NHelper; +import org.netbeans.modules.dbschema.ColumnElement; +import org.netbeans.modules.dbschema.TableElement; + /** * */ diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/KeyDesc.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/KeyDesc.java index aa1b356392b..b06c19f74e1 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/KeyDesc.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/KeyDesc.java @@ -23,9 +23,10 @@ package com.sun.jdo.spi.persistence.support.sqlstore.model; -import org.netbeans.modules.dbschema.ColumnElement; import java.util.ArrayList; +import org.netbeans.modules.dbschema.ColumnElement; + /** * This class is used to encapsulate an association between * key fields and key columns. diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/LocalFieldDesc.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/LocalFieldDesc.java index d5d22813f2e..c993da228e4 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/LocalFieldDesc.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/LocalFieldDesc.java @@ -23,17 +23,18 @@ package com.sun.jdo.spi.persistence.support.sqlstore.model; -import org.netbeans.modules.dbschema.ColumnElement; +import com.sun.jdo.spi.persistence.support.sqlstore.StateManager; import com.sun.jdo.spi.persistence.utility.FieldTypeEnumeration; import com.sun.jdo.spi.persistence.utility.logging.Logger; -import com.sun.jdo.spi.persistence.support.sqlstore.StateManager; -import java.util.ArrayList; -import java.util.Iterator; import java.lang.reflect.Field; -import java.sql.Types; -import java.math.BigInteger; import java.math.BigDecimal; +import java.math.BigInteger; +import java.sql.Types; +import java.util.ArrayList; +import java.util.Iterator; + +import org.netbeans.modules.dbschema.ColumnElement; /** diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/TableDesc.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/TableDesc.java index 34829bd4e90..5968b1b1cc0 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/TableDesc.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/model/TableDesc.java @@ -23,10 +23,12 @@ package com.sun.jdo.spi.persistence.support.sqlstore.model; -import org.netbeans.modules.dbschema.TableElement; import com.sun.jdo.api.persistence.model.mapping.MappingClassElement; + import java.util.ArrayList; +import org.netbeans.modules.dbschema.TableElement; + /** * This class is used to represent a database table. */ diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/LogHelperQueryExecute.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/LogHelperQueryExecute.java index 9cb495af335..b6551d5cbc0 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/LogHelperQueryExecute.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/LogHelperQueryExecute.java @@ -16,8 +16,8 @@ package com.sun.jdo.spi.persistence.support.sqlstore.query; -import com.sun.jdo.spi.persistence.utility.logging.Logger; import com.sun.jdo.spi.persistence.utility.logging.LogHelper; +import com.sun.jdo.spi.persistence.utility.logging.Logger; /** * diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/QueryImpl.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/QueryImpl.java index 2febda4aad0..40ece48b3e0 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/QueryImpl.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/QueryImpl.java @@ -22,20 +22,21 @@ package com.sun.jdo.spi.persistence.support.sqlstore.query; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Map; -import java.util.ResourceBundle; - -import com.sun.jdo.api.persistence.support.Query; -import com.sun.jdo.api.persistence.support.Transaction; import com.sun.jdo.api.persistence.support.JDOException; import com.sun.jdo.api.persistence.support.JDOQueryException; +import com.sun.jdo.api.persistence.support.Query; +import com.sun.jdo.api.persistence.support.Transaction; import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceManager; import com.sun.jdo.spi.persistence.support.sqlstore.RetrieveDesc; -import com.sun.jdo.spi.persistence.utility.logging.Logger; import com.sun.jdo.spi.persistence.support.sqlstore.query.jqlc.JQLC; import com.sun.jdo.spi.persistence.support.sqlstore.query.jqlc.ParameterTable; +import com.sun.jdo.spi.persistence.utility.logging.Logger; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Map; +import java.util.ResourceBundle; + import org.glassfish.persistence.common.I18NHelper; /** diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/ErrorMsg.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/ErrorMsg.java index 41486b54c61..c2dcd581d28 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/ErrorMsg.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/ErrorMsg.java @@ -22,12 +22,13 @@ package com.sun.jdo.spi.persistence.support.sqlstore.query.jqlc; -import java.util.ResourceBundle; - -import com.sun.jdo.api.persistence.support.JDOQueryException; import com.sun.jdo.api.persistence.support.JDOFatalInternalException; +import com.sun.jdo.api.persistence.support.JDOQueryException; import com.sun.jdo.api.persistence.support.JDOUnsupportedOptionException; import com.sun.jdo.spi.persistence.utility.logging.Logger; + +import java.util.ResourceBundle; + import org.glassfish.persistence.common.I18NHelper; /** diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/JQLAST.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/JQLAST.java index 23b5267d97d..2b851f10480 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/JQLAST.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/JQLAST.java @@ -22,13 +22,13 @@ package com.sun.jdo.spi.persistence.support.sqlstore.query.jqlc; -import antlr.Token; +import com.sun.jdo.spi.persistence.support.sqlstore.RetrieveDesc; +import com.sun.jdo.spi.persistence.support.sqlstore.query.util.type.Type; + +import antlr.ASTFactory; import antlr.CommonAST; +import antlr.Token; import antlr.collections.AST; -import antlr.ASTFactory; - -import com.sun.jdo.spi.persistence.support.sqlstore.query.util.type.Type; -import com.sun.jdo.spi.persistence.support.sqlstore.RetrieveDesc; /** * This class represents a node in the intermediate representation (AST) diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/JQLC.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/JQLC.java index 137b2db4dab..7577e9d2eab 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/JQLC.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/JQLC.java @@ -22,24 +22,27 @@ package com.sun.jdo.spi.persistence.support.sqlstore.query.jqlc; -import java.io.Reader; -import java.io.StringReader; -import java.util.*; - -import antlr.TokenBuffer; -import antlr.ANTLRException; - -import org.glassfish.persistence.common.I18NHelper; +import com.sun.jdo.api.persistence.support.JDOFatalInternalException; import com.sun.jdo.api.persistence.support.JDOQueryException; import com.sun.jdo.api.persistence.support.JDOUnsupportedOptionException; -import com.sun.jdo.api.persistence.support.JDOFatalInternalException; -import com.sun.jdo.spi.persistence.utility.StringHelper; +import com.sun.jdo.spi.persistence.support.sqlstore.ExtentCollection; import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceManager; import com.sun.jdo.spi.persistence.support.sqlstore.RetrieveDesc; -import com.sun.jdo.spi.persistence.support.sqlstore.ExtentCollection; +import com.sun.jdo.spi.persistence.support.sqlstore.query.util.type.TypeTable; +import com.sun.jdo.spi.persistence.utility.StringHelper; import com.sun.jdo.spi.persistence.utility.logging.Logger; -import com.sun.jdo.spi.persistence.support.sqlstore.query.util.type.TypeTable; +import java.io.Reader; +import java.io.StringReader; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.ResourceBundle; + +import org.glassfish.persistence.common.I18NHelper; + +import antlr.ANTLRException; +import antlr.TokenBuffer; /** * diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/LogHelperQueryCompilerJDO.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/LogHelperQueryCompilerJDO.java index 4aea8179381..a6b5ed71676 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/LogHelperQueryCompilerJDO.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/LogHelperQueryCompilerJDO.java @@ -16,8 +16,8 @@ package com.sun.jdo.spi.persistence.support.sqlstore.query.jqlc; -import com.sun.jdo.spi.persistence.utility.logging.Logger; import com.sun.jdo.spi.persistence.utility.logging.LogHelper; +import com.sun.jdo.spi.persistence.utility.logging.Logger; /** * diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/ParameterTable.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/ParameterTable.java index 7ed43dadc9a..41689295933 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/ParameterTable.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/ParameterTable.java @@ -22,25 +22,25 @@ package com.sun.jdo.spi.persistence.support.sqlstore.query.jqlc; +import com.sun.jdo.api.persistence.support.JDOFatalInternalException; +import com.sun.jdo.api.persistence.support.JDOQueryException; +import com.sun.jdo.spi.persistence.support.sqlstore.ValueFetcher; +import com.sun.jdo.spi.persistence.support.sqlstore.query.util.type.DateType; +import com.sun.jdo.spi.persistence.support.sqlstore.query.util.type.MathType; +import com.sun.jdo.spi.persistence.support.sqlstore.query.util.type.PrimitiveType; +import com.sun.jdo.spi.persistence.support.sqlstore.query.util.type.StringType; +import com.sun.jdo.spi.persistence.support.sqlstore.query.util.type.Type; +import com.sun.jdo.spi.persistence.support.sqlstore.query.util.type.WrapperClassType; +import com.sun.jdo.spi.persistence.utility.JavaTypeHelper; +import com.sun.jdo.spi.persistence.utility.ParameterInfo; + import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.ResourceBundle; -import com.sun.jdo.api.persistence.support.JDOQueryException; -import com.sun.jdo.api.persistence.support.JDOFatalInternalException; -import com.sun.jdo.spi.persistence.support.sqlstore.query.util.type.Type; -import com.sun.jdo.spi.persistence.support.sqlstore.query.util.type.StringType; -import com.sun.jdo.spi.persistence.support.sqlstore.query.util.type.PrimitiveType; -import com.sun.jdo.spi.persistence.support.sqlstore.query.util.type.WrapperClassType; -import com.sun.jdo.spi.persistence.support.sqlstore.query.util.type.MathType; -import com.sun.jdo.spi.persistence.support.sqlstore.query.util.type.DateType; - import org.glassfish.persistence.common.I18NHelper; -import com.sun.jdo.spi.persistence.support.sqlstore.ValueFetcher; -import com.sun.jdo.spi.persistence.utility.JavaTypeHelper; -import com.sun.jdo.spi.persistence.utility.ParameterInfo; /** * The query parameter table diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/QueryValueFetcher.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/QueryValueFetcher.java index 2c322edf64d..8643d828aa6 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/QueryValueFetcher.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/QueryValueFetcher.java @@ -23,10 +23,11 @@ package com.sun.jdo.spi.persistence.support.sqlstore.query.jqlc; -import java.util.ResourceBundle; - import com.sun.jdo.api.persistence.support.JDOFatalInternalException; import com.sun.jdo.spi.persistence.support.sqlstore.ValueFetcher; + +import java.util.ResourceBundle; + import org.glassfish.persistence.common.I18NHelper; /** diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/VariableTable.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/VariableTable.java index b5aa1d657a9..432a311c3ff 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/VariableTable.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/jqlc/VariableTable.java @@ -22,12 +22,19 @@ package com.sun.jdo.spi.persistence.support.sqlstore.query.jqlc; -import java.util.*; +import com.sun.jdo.api.persistence.support.JDOFatalInternalException; +import com.sun.jdo.api.persistence.support.JDOUnsupportedOptionException; -import org.glassfish.persistence.common.I18NHelper; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.ResourceBundle; +import java.util.Set; -import com.sun.jdo.api.persistence.support.JDOUnsupportedOptionException; -import com.sun.jdo.api.persistence.support.JDOFatalInternalException; +import org.glassfish.persistence.common.I18NHelper; /** * The variable table diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/scope/Definition.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/scope/Definition.java index 0e7019dfd20..dd374aadaab 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/scope/Definition.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/scope/Definition.java @@ -22,12 +22,12 @@ package com.sun.jdo.spi.persistence.support.sqlstore.query.util.scope; +import com.sun.jdo.spi.persistence.support.sqlstore.query.util.type.Type; + import java.util.ResourceBundle; import org.glassfish.persistence.common.I18NHelper; -import com.sun.jdo.spi.persistence.support.sqlstore.query.util.type.Type; - /** * Super class of all possible identifier definitions * diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/scope/Field.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/scope/Field.java index 1f4eff8bfef..fc095d74ede 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/scope/Field.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/scope/Field.java @@ -22,10 +22,10 @@ package com.sun.jdo.spi.persistence.support.sqlstore.query.util.scope; -import org.glassfish.persistence.common.I18NHelper; - import com.sun.jdo.spi.persistence.support.sqlstore.query.util.type.FieldInfo; +import org.glassfish.persistence.common.I18NHelper; + /** * An object of class Field is used if an identifier * denotes a field. diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/scope/Parameter.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/scope/Parameter.java index 86bafc50cb4..dc2e1080f6e 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/scope/Parameter.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/scope/Parameter.java @@ -22,10 +22,10 @@ package com.sun.jdo.spi.persistence.support.sqlstore.query.util.scope; -import org.glassfish.persistence.common.I18NHelper; - import com.sun.jdo.spi.persistence.support.sqlstore.query.util.type.Type; +import org.glassfish.persistence.common.I18NHelper; + /** * An object of class Parameter is used if an identifier * is declared as variable. diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/scope/TypeName.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/scope/TypeName.java index 9d76b3b353c..f7802e48150 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/scope/TypeName.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/scope/TypeName.java @@ -22,10 +22,10 @@ package com.sun.jdo.spi.persistence.support.sqlstore.query.util.scope; -import org.glassfish.persistence.common.I18NHelper; - import com.sun.jdo.spi.persistence.support.sqlstore.query.util.type.Type; +import org.glassfish.persistence.common.I18NHelper; + /** * An object of class TypeName is used if an identifier * is declared as class name (using an import statement). diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/scope/Variable.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/scope/Variable.java index 5b4e0d57757..b249aa46733 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/scope/Variable.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/scope/Variable.java @@ -22,10 +22,10 @@ package com.sun.jdo.spi.persistence.support.sqlstore.query.util.scope; -import org.glassfish.persistence.common.I18NHelper; - import com.sun.jdo.spi.persistence.support.sqlstore.query.util.type.Type; +import org.glassfish.persistence.common.I18NHelper; + /** * An object of class Variable is used if an identifier * is declared as variable. diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/type/ClassType.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/type/ClassType.java index 40de68827f3..70d9592e6ec 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/type/ClassType.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/type/ClassType.java @@ -22,19 +22,18 @@ package com.sun.jdo.spi.persistence.support.sqlstore.query.util.type; -import java.util.Map; -import java.util.HashMap; -import java.util.List; -import java.util.ArrayList; +import com.sun.jdo.api.persistence.model.jdo.PersistenceClassElement; +import com.sun.jdo.api.persistence.model.jdo.PersistenceFieldElement; +import com.sun.jdo.api.persistence.support.JDOFatalUserException; +import com.sun.jdo.spi.persistence.utility.FieldTypeEnumeration; import java.lang.reflect.Field; import java.security.AccessController; import java.security.PrivilegedAction; - -import com.sun.jdo.spi.persistence.utility.FieldTypeEnumeration; -import com.sun.jdo.api.persistence.support.JDOFatalUserException; -import com.sun.jdo.api.persistence.model.jdo.PersistenceClassElement; -import com.sun.jdo.api.persistence.model.jdo.PersistenceFieldElement; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/type/FieldInfo.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/type/FieldInfo.java index 51d7f94d6ce..ec5c99a96fe 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/type/FieldInfo.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/type/FieldInfo.java @@ -22,13 +22,14 @@ package com.sun.jdo.spi.persistence.support.sqlstore.query.util.type; +import com.sun.jdo.api.persistence.model.jdo.PersistenceFieldElement; +import com.sun.jdo.api.persistence.model.jdo.RelationshipElement; +import com.sun.jdo.api.persistence.support.JDOFatalInternalException; + import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.ResourceBundle; -import com.sun.jdo.api.persistence.model.jdo.PersistenceFieldElement; -import com.sun.jdo.api.persistence.model.jdo.RelationshipElement; -import com.sun.jdo.api.persistence.support.JDOFatalInternalException; import org.glassfish.persistence.common.I18NHelper; /** diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/type/TypeTable.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/type/TypeTable.java index b952fbe5782..a74aca13705 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/type/TypeTable.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/query/util/type/TypeTable.java @@ -22,12 +22,14 @@ package com.sun.jdo.spi.persistence.support.sqlstore.query.util.type; -import java.util.*; -import java.math.*; - import com.sun.jdo.api.persistence.model.Model; import com.sun.jdo.spi.persistence.utility.FieldTypeEnumeration; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.HashMap; +import java.util.Map; + /** * * @author Michael Bouschen diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/ArrayList.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/ArrayList.java index efaf27c617e..e9d27e4fcdf 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/ArrayList.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/ArrayList.java @@ -20,15 +20,16 @@ package com.sun.jdo.spi.persistence.support.sqlstore.sco; -import java.util.Collection; -import java.util.Iterator; -import java.util.ResourceBundle; - -import com.sun.jdo.api.persistence.support.JDOUserException; import com.sun.jdo.api.persistence.support.JDOUnsupportedOptionException; +import com.sun.jdo.api.persistence.support.JDOUserException; import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceCapable; import com.sun.jdo.spi.persistence.support.sqlstore.SCOCollection; import com.sun.jdo.spi.persistence.support.sqlstore.StateManager; + +import java.util.Collection; +import java.util.Iterator; +import java.util.ResourceBundle; + import org.glassfish.persistence.common.I18NHelper; diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/Date.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/Date.java index ac972ce17b5..449031b5e77 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/Date.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/Date.java @@ -16,12 +16,12 @@ package com.sun.jdo.spi.persistence.support.sqlstore.sco; -import java.io.ObjectStreamException; - import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceCapable; -import com.sun.jdo.spi.persistence.support.sqlstore.StateManager; -import com.sun.jdo.spi.persistence.support.sqlstore.SCODate; import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceManager; +import com.sun.jdo.spi.persistence.support.sqlstore.SCODate; +import com.sun.jdo.spi.persistence.support.sqlstore.StateManager; + +import java.io.ObjectStreamException; /** * A mutable 2nd class object date. diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/HashSet.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/HashSet.java index fa5238183b7..f01c6784534 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/HashSet.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/HashSet.java @@ -20,16 +20,17 @@ package com.sun.jdo.spi.persistence.support.sqlstore.sco; +import com.sun.jdo.api.persistence.support.JDOUserException; +import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceCapable; +import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceManager; +import com.sun.jdo.spi.persistence.support.sqlstore.SCOCollection; +import com.sun.jdo.spi.persistence.support.sqlstore.StateManager; + import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.ResourceBundle; -import com.sun.jdo.api.persistence.support.JDOUserException; -import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceCapable; -import com.sun.jdo.spi.persistence.support.sqlstore.StateManager; -import com.sun.jdo.spi.persistence.support.sqlstore.SCOCollection; -import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceManager; import org.glassfish.persistence.common.I18NHelper; diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/SqlDate.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/SqlDate.java index 55ac717c754..0b1dc828ecd 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/SqlDate.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/SqlDate.java @@ -21,12 +21,12 @@ package com.sun.jdo.spi.persistence.support.sqlstore.sco; -import java.io.ObjectStreamException; - import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceCapable; -import com.sun.jdo.spi.persistence.support.sqlstore.StateManager; -import com.sun.jdo.spi.persistence.support.sqlstore.SCODate; import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceManager; +import com.sun.jdo.spi.persistence.support.sqlstore.SCODate; +import com.sun.jdo.spi.persistence.support.sqlstore.StateManager; + +import java.io.ObjectStreamException; /** * A mutable 2nd class object date. diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/SqlTime.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/SqlTime.java index 48bab5c6c13..ed44bb907d0 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/SqlTime.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/SqlTime.java @@ -21,12 +21,12 @@ package com.sun.jdo.spi.persistence.support.sqlstore.sco; -import java.io.ObjectStreamException; - import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceCapable; -import com.sun.jdo.spi.persistence.support.sqlstore.StateManager; -import com.sun.jdo.spi.persistence.support.sqlstore.SCODate; import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceManager; +import com.sun.jdo.spi.persistence.support.sqlstore.SCODate; +import com.sun.jdo.spi.persistence.support.sqlstore.StateManager; + +import java.io.ObjectStreamException; /** * A mutable 2nd class object date. diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/SqlTimestamp.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/SqlTimestamp.java index 758d569c8bc..b259ac4f9be 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/SqlTimestamp.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/SqlTimestamp.java @@ -21,12 +21,12 @@ package com.sun.jdo.spi.persistence.support.sqlstore.sco; -import java.io.ObjectStreamException; - import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceCapable; -import com.sun.jdo.spi.persistence.support.sqlstore.StateManager; -import com.sun.jdo.spi.persistence.support.sqlstore.SCODate; import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceManager; +import com.sun.jdo.spi.persistence.support.sqlstore.SCODate; +import com.sun.jdo.spi.persistence.support.sqlstore.StateManager; + +import java.io.ObjectStreamException; /** * A mutable 2nd class object date. diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/Vector.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/Vector.java index ab4a61b5976..e58a8db907a 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/Vector.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sco/Vector.java @@ -20,15 +20,16 @@ package com.sun.jdo.spi.persistence.support.sqlstore.sco; +import com.sun.jdo.api.persistence.support.JDOUnsupportedOptionException; +import com.sun.jdo.api.persistence.support.JDOUserException; +import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceCapable; +import com.sun.jdo.spi.persistence.support.sqlstore.SCOCollection; +import com.sun.jdo.spi.persistence.support.sqlstore.StateManager; + import java.util.Collection; import java.util.Iterator; import java.util.ResourceBundle; -import com.sun.jdo.api.persistence.support.JDOUserException; -import com.sun.jdo.api.persistence.support.JDOUnsupportedOptionException; -import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceCapable; -import com.sun.jdo.spi.persistence.support.sqlstore.StateManager; -import com.sun.jdo.spi.persistence.support.sqlstore.SCOCollection; import org.glassfish.persistence.common.I18NHelper; diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/ResultDesc.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/ResultDesc.java index 3e0b0f737ba..35c91226bd6 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/ResultDesc.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/ResultDesc.java @@ -25,24 +25,41 @@ package com.sun.jdo.spi.persistence.support.sqlstore.sql; import com.sun.jdo.api.persistence.support.JDOFatalInternalException; -import com.sun.jdo.spi.persistence.support.sqlstore.*; +import com.sun.jdo.spi.persistence.support.sqlstore.LogHelperSQLStore; +import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceCapable; +import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceManager; +import com.sun.jdo.spi.persistence.support.sqlstore.SCOCollection; +import com.sun.jdo.spi.persistence.support.sqlstore.SQLStateManager; +import com.sun.jdo.spi.persistence.support.sqlstore.StateManager; import com.sun.jdo.spi.persistence.support.sqlstore.model.ClassDesc; import com.sun.jdo.spi.persistence.support.sqlstore.model.FieldDesc; import com.sun.jdo.spi.persistence.support.sqlstore.model.ForeignFieldDesc; import com.sun.jdo.spi.persistence.support.sqlstore.model.LocalFieldDesc; import com.sun.jdo.spi.persistence.support.sqlstore.sql.generator.ColumnRef; -import com.sun.jdo.spi.persistence.utility.StringHelper; import com.sun.jdo.spi.persistence.utility.FieldTypeEnumeration; +import com.sun.jdo.spi.persistence.utility.StringHelper; import com.sun.jdo.spi.persistence.utility.logging.Logger; -import org.glassfish.persistence.common.I18NHelper; -import java.io.*; +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.Reader; import java.lang.reflect.Field; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; import java.sql.Types; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.ResourceBundle; + +import org.glassfish.persistence.common.I18NHelper; /** diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/RetrieveDescImpl.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/RetrieveDescImpl.java index 2e06d9f69fe..29f8be2e4b1 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/RetrieveDescImpl.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/RetrieveDescImpl.java @@ -35,12 +35,13 @@ import com.sun.jdo.spi.persistence.support.sqlstore.sql.generator.SelectQueryPlan; import com.sun.jdo.spi.persistence.utility.FieldTypeEnumeration; import com.sun.jdo.spi.persistence.utility.ParameterInfo; -import org.glassfish.persistence.common.I18NHelper; import java.util.ArrayList; import java.util.Iterator; import java.util.ResourceBundle; +import org.glassfish.persistence.common.I18NHelper; + /** */ public class RetrieveDescImpl extends Object implements RetrieveDesc, Cloneable { diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/UpdateObjectDescImpl.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/UpdateObjectDescImpl.java index 5c543df1aed..a9cfe743303 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/UpdateObjectDescImpl.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/UpdateObjectDescImpl.java @@ -24,16 +24,27 @@ package com.sun.jdo.spi.persistence.support.sqlstore.sql; import com.sun.jdo.api.persistence.support.JDOFatalInternalException; -import com.sun.jdo.spi.persistence.support.sqlstore.*; +import com.sun.jdo.spi.persistence.support.sqlstore.ActionDesc; +import com.sun.jdo.spi.persistence.support.sqlstore.LogHelperSQLStore; +import com.sun.jdo.spi.persistence.support.sqlstore.SQLStateManager; +import com.sun.jdo.spi.persistence.support.sqlstore.StateManager; +import com.sun.jdo.spi.persistence.support.sqlstore.UpdateObjectDesc; import com.sun.jdo.spi.persistence.support.sqlstore.model.ClassDesc; import com.sun.jdo.spi.persistence.support.sqlstore.model.FieldDesc; import com.sun.jdo.spi.persistence.support.sqlstore.model.ForeignFieldDesc; import com.sun.jdo.spi.persistence.support.sqlstore.model.LocalFieldDesc; import com.sun.jdo.spi.persistence.support.sqlstore.sql.concurrency.Concurrency; import com.sun.jdo.spi.persistence.utility.logging.Logger; -import org.glassfish.persistence.common.I18NHelper; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.ResourceBundle; + +import org.glassfish.persistence.common.I18NHelper; /** * Stores the update information for the associated state manager. diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/concurrency/Concurrency.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/concurrency/Concurrency.java index 34b4b4be0a2..b2970ce7273 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/concurrency/Concurrency.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/concurrency/Concurrency.java @@ -23,12 +23,12 @@ package com.sun.jdo.spi.persistence.support.sqlstore.sql.concurrency; -import com.sun.jdo.spi.persistence.support.sqlstore.Transaction; import com.sun.jdo.spi.persistence.support.sqlstore.SQLStateManager; +import com.sun.jdo.spi.persistence.support.sqlstore.Transaction; import com.sun.jdo.spi.persistence.support.sqlstore.UpdateObjectDesc; import com.sun.jdo.spi.persistence.support.sqlstore.model.ClassDesc; -import com.sun.jdo.spi.persistence.support.sqlstore.sql.generator.UpdateQueryPlan; import com.sun.jdo.spi.persistence.support.sqlstore.sql.generator.SelectQueryPlan; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.generator.UpdateQueryPlan; /** */ diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/concurrency/ConcurrencyCheckDirty.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/concurrency/ConcurrencyCheckDirty.java index 55e1dc8de7a..e1bd29482c7 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/concurrency/ConcurrencyCheckDirty.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/concurrency/ConcurrencyCheckDirty.java @@ -23,7 +23,6 @@ package com.sun.jdo.spi.persistence.support.sqlstore.sql.concurrency; -import org.netbeans.modules.dbschema.ColumnElement; import com.sun.jdo.spi.persistence.support.sqlstore.SQLStateManager; import com.sun.jdo.spi.persistence.support.sqlstore.UpdateObjectDesc; import com.sun.jdo.spi.persistence.support.sqlstore.model.FieldDesc; @@ -36,6 +35,8 @@ import java.util.BitSet; import java.util.Iterator; +import org.netbeans.modules.dbschema.ColumnElement; + /** */ public class ConcurrencyCheckDirty extends ConcurrencyDBNative { diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/ColumnRef.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/ColumnRef.java index 3b236045218..0218ec162eb 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/ColumnRef.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/ColumnRef.java @@ -23,9 +23,10 @@ package com.sun.jdo.spi.persistence.support.sqlstore.sql.generator; -import org.netbeans.modules.dbschema.ColumnElement; import com.sun.jdo.api.persistence.support.FieldMapping; +import org.netbeans.modules.dbschema.ColumnElement; + /** */ public class ColumnRef extends Object implements FieldMapping { diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/CorrelatedSelectPlan.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/CorrelatedSelectPlan.java index 676f90f61cd..f12c28f0675 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/CorrelatedSelectPlan.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/CorrelatedSelectPlan.java @@ -16,15 +16,16 @@ package com.sun.jdo.spi.persistence.support.sqlstore.sql.generator; +import com.sun.jdo.spi.persistence.support.sqlstore.ActionDesc; import com.sun.jdo.spi.persistence.support.sqlstore.RetrieveDesc; import com.sun.jdo.spi.persistence.support.sqlstore.SQLStoreManager; -import com.sun.jdo.spi.persistence.support.sqlstore.ActionDesc; -import com.sun.jdo.spi.persistence.support.sqlstore.model.ForeignFieldDesc; import com.sun.jdo.spi.persistence.support.sqlstore.model.ClassDesc; -import org.netbeans.modules.dbschema.ColumnElement; +import com.sun.jdo.spi.persistence.support.sqlstore.model.ForeignFieldDesc; import java.util.ArrayList; +import org.netbeans.modules.dbschema.ColumnElement; + /** * Implements the select plan for correlated subqueries. * diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/DBStatement.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/DBStatement.java index 55914addfa1..70be0c2c822 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/DBStatement.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/DBStatement.java @@ -23,7 +23,6 @@ package com.sun.jdo.spi.persistence.support.sqlstore.sql.generator; -import org.netbeans.modules.dbschema.ColumnElement; import com.sun.jdo.spi.persistence.support.sqlstore.LogHelperSQLStore; import com.sun.jdo.spi.persistence.support.sqlstore.database.DBVendorType; import com.sun.jdo.spi.persistence.support.sqlstore.model.LocalFieldDesc; @@ -33,7 +32,17 @@ import java.io.StringReader; import java.math.BigDecimal; import java.math.BigInteger; -import java.sql.*; +import java.sql.Blob; +import java.sql.Clob; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Time; +import java.sql.Timestamp; +import java.sql.Types; + +import org.netbeans.modules.dbschema.ColumnElement; /** */ diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/QueryPlan.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/QueryPlan.java index 1311a5d165b..eff58e3fbd9 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/QueryPlan.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/QueryPlan.java @@ -23,18 +23,19 @@ package com.sun.jdo.spi.persistence.support.sqlstore.sql.generator; -import org.netbeans.modules.dbschema.TableElement; import com.sun.jdo.api.persistence.support.JDOFatalInternalException; import com.sun.jdo.spi.persistence.support.sqlstore.ActionDesc; import com.sun.jdo.spi.persistence.support.sqlstore.SQLStoreManager; import com.sun.jdo.spi.persistence.support.sqlstore.model.ClassDesc; import com.sun.jdo.spi.persistence.support.sqlstore.model.ReferenceKeyDesc; import com.sun.jdo.spi.persistence.support.sqlstore.model.TableDesc; -import org.glassfish.persistence.common.I18NHelper; import java.util.ArrayList; import java.util.ResourceBundle; +import org.glassfish.persistence.common.I18NHelper; +import org.netbeans.modules.dbschema.TableElement; + /** * This class is used to generate SQL statements. diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/SelectQueryPlan.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/SelectQueryPlan.java index 265849a8a5a..2e67e4f5b41 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/SelectQueryPlan.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/SelectQueryPlan.java @@ -23,26 +23,46 @@ package com.sun.jdo.spi.persistence.support.sqlstore.sql.generator; -import org.netbeans.modules.dbschema.ColumnElement; import com.sun.jdo.api.persistence.support.JDOFatalInternalException; import com.sun.jdo.api.persistence.support.JDOUserException; import com.sun.jdo.spi.persistence.support.sqlstore.ActionDesc; import com.sun.jdo.spi.persistence.support.sqlstore.LogHelperSQLStore; +import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceManager; import com.sun.jdo.spi.persistence.support.sqlstore.RetrieveDesc; import com.sun.jdo.spi.persistence.support.sqlstore.SQLStoreManager; -import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceManager; -import com.sun.jdo.spi.persistence.support.sqlstore.model.*; +import com.sun.jdo.spi.persistence.support.sqlstore.model.ClassDesc; +import com.sun.jdo.spi.persistence.support.sqlstore.model.FieldDesc; +import com.sun.jdo.spi.persistence.support.sqlstore.model.ForeignFieldDesc; +import com.sun.jdo.spi.persistence.support.sqlstore.model.LocalFieldDesc; +import com.sun.jdo.spi.persistence.support.sqlstore.model.ReferenceKeyDesc; import com.sun.jdo.spi.persistence.support.sqlstore.sql.ResultDesc; import com.sun.jdo.spi.persistence.support.sqlstore.sql.RetrieveDescImpl; import com.sun.jdo.spi.persistence.support.sqlstore.sql.concurrency.Concurrency; -import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.*; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.Constraint; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.ConstraintField; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.ConstraintFieldDesc; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.ConstraintFieldName; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.ConstraintFieldNameSubQuery; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.ConstraintForeignFieldName; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.ConstraintJoin; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.ConstraintNode; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.ConstraintOperation; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.ConstraintSubquery; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.ConstraintValue; import com.sun.jdo.spi.persistence.utility.FieldTypeEnumeration; import com.sun.jdo.spi.persistence.utility.logging.Logger; -import org.glassfish.persistence.common.I18NHelper; -import java.util.*; import java.sql.ResultSet; import java.sql.SQLException; +import java.util.ArrayList; +import java.util.BitSet; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import org.glassfish.persistence.common.I18NHelper; +import org.netbeans.modules.dbschema.ColumnElement; /** diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/SelectStatement.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/SelectStatement.java index 474d9fccc1c..6a8a0d5d4d9 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/SelectStatement.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/SelectStatement.java @@ -23,8 +23,6 @@ package com.sun.jdo.spi.persistence.support.sqlstore.sql.generator; -import org.netbeans.modules.dbschema.ColumnElement; - import com.sun.jdo.api.persistence.support.JDOFatalDataStoreException; import com.sun.jdo.api.persistence.support.JDOFatalInternalException; import com.sun.jdo.spi.persistence.support.sqlstore.ActionDesc; @@ -34,14 +32,16 @@ import com.sun.jdo.spi.persistence.support.sqlstore.sql.RetrieveDescImpl; import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.ConstraintField; import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.ConstraintFieldDesc; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.ConstraintJoin; import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.ConstraintNode; import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.ConstraintOperation; -import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.ConstraintJoin; -import org.glassfish.persistence.common.I18NHelper; +import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import java.sql.SQLException; + +import org.glassfish.persistence.common.I18NHelper; +import org.netbeans.modules.dbschema.ColumnElement; /** diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/Statement.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/Statement.java index 24738f63051..177c8cf7012 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/Statement.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/Statement.java @@ -23,14 +23,20 @@ package com.sun.jdo.spi.persistence.support.sqlstore.sql.generator; -import org.netbeans.modules.dbschema.ColumnElement; -import org.netbeans.modules.dbschema.TableElement; import com.sun.jdo.api.persistence.support.JDOFatalInternalException; import com.sun.jdo.spi.persistence.support.sqlstore.ActionDesc; import com.sun.jdo.spi.persistence.support.sqlstore.database.DBVendorType; import com.sun.jdo.spi.persistence.support.sqlstore.model.LocalFieldDesc; -import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.*; -import org.glassfish.persistence.common.I18NHelper; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.Constraint; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.ConstraintConstant; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.ConstraintField; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.ConstraintFieldDesc; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.ConstraintFieldName; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.ConstraintNode; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.ConstraintOperation; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.ConstraintParamIndex; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.ConstraintSubquery; +import com.sun.jdo.spi.persistence.support.sqlstore.sql.constraint.ConstraintValue; import java.sql.SQLException; import java.util.ArrayList; @@ -38,6 +44,10 @@ import java.util.List; import java.util.ResourceBundle; +import org.glassfish.persistence.common.I18NHelper; +import org.netbeans.modules.dbschema.ColumnElement; +import org.netbeans.modules.dbschema.TableElement; + /** * This class is used to represent a SQL statement. */ diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/UpdateQueryPlan.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/UpdateQueryPlan.java index 86b2b43ad84..66b70160dc6 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/UpdateQueryPlan.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/UpdateQueryPlan.java @@ -23,22 +23,28 @@ package com.sun.jdo.spi.persistence.support.sqlstore.sql.generator; -import org.netbeans.modules.dbschema.ColumnElement; -import org.netbeans.modules.dbschema.TableElement; import com.sun.jdo.api.persistence.support.JDOFatalInternalException; import com.sun.jdo.spi.persistence.support.sqlstore.ActionDesc; import com.sun.jdo.spi.persistence.support.sqlstore.SQLStoreManager; import com.sun.jdo.spi.persistence.support.sqlstore.Transaction; -import com.sun.jdo.spi.persistence.support.sqlstore.model.*; +import com.sun.jdo.spi.persistence.support.sqlstore.model.FieldDesc; +import com.sun.jdo.spi.persistence.support.sqlstore.model.ForeignFieldDesc; +import com.sun.jdo.spi.persistence.support.sqlstore.model.KeyDesc; +import com.sun.jdo.spi.persistence.support.sqlstore.model.LocalFieldDesc; +import com.sun.jdo.spi.persistence.support.sqlstore.model.ReferenceKeyDesc; +import com.sun.jdo.spi.persistence.support.sqlstore.model.TableDesc; import com.sun.jdo.spi.persistence.support.sqlstore.sql.UpdateJoinTableDesc; import com.sun.jdo.spi.persistence.support.sqlstore.sql.UpdateObjectDescImpl; -import org.glassfish.persistence.common.I18NHelper; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.List; +import org.glassfish.persistence.common.I18NHelper; +import org.netbeans.modules.dbschema.ColumnElement; +import org.netbeans.modules.dbschema.TableElement; + /** * This class is used to generated update/insert/delete statements. diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/UpdateStatement.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/UpdateStatement.java index 3fc1e8832ea..846cddbf715 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/UpdateStatement.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/UpdateStatement.java @@ -23,7 +23,6 @@ package com.sun.jdo.spi.persistence.support.sqlstore.sql.generator; -import org.netbeans.modules.dbschema.ColumnElement; import com.sun.jdo.spi.persistence.support.sqlstore.SQLStateManager; import com.sun.jdo.spi.persistence.support.sqlstore.Transaction; import com.sun.jdo.spi.persistence.support.sqlstore.database.DBVendorType; @@ -34,7 +33,13 @@ import java.sql.Connection; import java.sql.SQLException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import org.netbeans.modules.dbschema.ColumnElement; /** * This class is used to generate update/insert/delete statements. diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/VerificationSelectPlan.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/VerificationSelectPlan.java index 4a07fb48021..9679f88d707 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/VerificationSelectPlan.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/sql/generator/VerificationSelectPlan.java @@ -16,7 +16,9 @@ package com.sun.jdo.spi.persistence.support.sqlstore.sql.generator; -import com.sun.jdo.spi.persistence.support.sqlstore.*; +import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceManager; +import com.sun.jdo.spi.persistence.support.sqlstore.RetrieveDesc; +import com.sun.jdo.spi.persistence.support.sqlstore.SQLStoreManager; import com.sun.jdo.spi.persistence.support.sqlstore.model.LocalFieldDesc; import java.sql.ResultSet; diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/AutoPersistentNewDeleted.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/AutoPersistentNewDeleted.java index d66efd84be4..8827184e4dc 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/AutoPersistentNewDeleted.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/AutoPersistentNewDeleted.java @@ -21,11 +21,12 @@ package com.sun.jdo.spi.persistence.support.sqlstore.state; import com.sun.jdo.api.persistence.support.JDOUserException; -import org.glassfish.persistence.common.I18NHelper; import com.sun.jdo.spi.persistence.support.sqlstore.ActionDesc; import java.util.ResourceBundle; +import org.glassfish.persistence.common.I18NHelper; + public class AutoPersistentNewDeleted extends LifeCycleState { /** * I18N message handler diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/AutoPersistentNewFlushedPending.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/AutoPersistentNewFlushedPending.java index 3c9519b53f2..f4c8927441a 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/AutoPersistentNewFlushedPending.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/AutoPersistentNewFlushedPending.java @@ -22,10 +22,11 @@ import com.sun.jdo.api.persistence.support.JDOUserException; import com.sun.jdo.spi.persistence.support.sqlstore.ActionDesc; -import org.glassfish.persistence.common.I18NHelper; import java.util.ResourceBundle; +import org.glassfish.persistence.common.I18NHelper; + public class AutoPersistentNewFlushedPending extends AutoPersistentNewFlushed { /** * I18N message handler diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/AutoPersistentNewPending.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/AutoPersistentNewPending.java index fae7a0bbbe3..fa307e424a7 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/AutoPersistentNewPending.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/AutoPersistentNewPending.java @@ -22,10 +22,11 @@ import com.sun.jdo.api.persistence.support.JDOUserException; import com.sun.jdo.spi.persistence.support.sqlstore.ActionDesc; -import org.glassfish.persistence.common.I18NHelper; import java.util.ResourceBundle; +import org.glassfish.persistence.common.I18NHelper; + public class AutoPersistentNewPending extends AutoPersistentNew { /** * I18N message handler diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/LifeCycleState.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/LifeCycleState.java index 8ad8cd7afef..9047c137f29 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/LifeCycleState.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/LifeCycleState.java @@ -21,12 +21,13 @@ package com.sun.jdo.spi.persistence.support.sqlstore.state; import com.sun.jdo.api.persistence.support.JDOUserException; -import com.sun.jdo.spi.persistence.utility.logging.Logger; import com.sun.jdo.spi.persistence.support.sqlstore.LogHelperStateManager; -import org.glassfish.persistence.common.I18NHelper; +import com.sun.jdo.spi.persistence.utility.logging.Logger; import java.util.ResourceBundle; +import org.glassfish.persistence.common.I18NHelper; + public abstract class LifeCycleState { diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/PersistentDeleted.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/PersistentDeleted.java index ca9c61f25ad..01f4e7a9745 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/PersistentDeleted.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/PersistentDeleted.java @@ -22,10 +22,11 @@ import com.sun.jdo.api.persistence.support.JDOUserException; import com.sun.jdo.spi.persistence.support.sqlstore.ActionDesc; -import org.glassfish.persistence.common.I18NHelper; import java.util.ResourceBundle; +import org.glassfish.persistence.common.I18NHelper; + public class PersistentDeleted extends LifeCycleState { /** * I18N message handler diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/PersistentNewDeleted.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/PersistentNewDeleted.java index 1faccdccb23..3e9548af06f 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/PersistentNewDeleted.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/PersistentNewDeleted.java @@ -22,10 +22,11 @@ import com.sun.jdo.api.persistence.support.JDOUserException; import com.sun.jdo.spi.persistence.support.sqlstore.ActionDesc; -import org.glassfish.persistence.common.I18NHelper; import java.util.ResourceBundle; +import org.glassfish.persistence.common.I18NHelper; + public class PersistentNewDeleted extends LifeCycleState { /** * I18N message handler diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/utility/AugmentationTest.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/utility/AugmentationTest.java index 8b620d72041..720e4cf95d0 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/utility/AugmentationTest.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/utility/AugmentationTest.java @@ -23,16 +23,20 @@ package com.sun.jdo.spi.persistence.support.sqlstore.utility; -import java.lang.reflect.*; -import java.util.List; -import java.util.ArrayList; -import java.io.PrintStream; - // note the use of the public vs. the internal interfaces by this class import com.sun.jdo.api.persistence.support.PersistenceManager; import com.sun.jdo.spi.persistence.support.sqlstore.PersistenceCapable; import com.sun.jdo.spi.persistence.support.sqlstore.StateManager; +import java.io.PrintStream; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.List; + /** * Utility class for testing a class file for correct augmentation. */ diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/utility/StringScanner.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/utility/StringScanner.java index 51477321343..ec2c367dbd0 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/utility/StringScanner.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/utility/StringScanner.java @@ -22,7 +22,7 @@ package com.sun.jdo.spi.persistence.support.sqlstore.utility; -import java.util.*; +import java.util.Vector; /** * Helper class for breaking up a string. diff --git a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/JavaTypeHelper.java b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/JavaTypeHelper.java index cfdf90bfb9a..c527dabf8b2 100644 --- a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/JavaTypeHelper.java +++ b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/JavaTypeHelper.java @@ -22,8 +22,8 @@ package com.sun.jdo.spi.persistence.utility; -import java.util.Map; import java.util.HashMap; +import java.util.Map; /** This is a helper class which provides some basic java type convenience * methods: extraction of a package from a fully qualified class name, diff --git a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/LogHelperUtility.java b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/LogHelperUtility.java index d48dc0d6ac2..cabd325030d 100644 --- a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/LogHelperUtility.java +++ b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/LogHelperUtility.java @@ -17,8 +17,8 @@ package com.sun.jdo.spi.persistence.utility; -import com.sun.jdo.spi.persistence.utility.logging.Logger; import com.sun.jdo.spi.persistence.utility.logging.LogHelper; +import com.sun.jdo.spi.persistence.utility.logging.Logger; /** LogHelper for utility package. * @author Dave Bristor diff --git a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/MergedBundle.java b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/MergedBundle.java index 4a88a1416a9..c6c4fd970f7 100644 --- a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/MergedBundle.java +++ b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/MergedBundle.java @@ -22,7 +22,15 @@ package com.sun.jdo.spi.persistence.utility; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashSet; +import java.util.List; +import java.util.MissingResourceException; +import java.util.ResourceBundle; +import java.util.Set; /** Special resource bundle which delegates to two others. * Ideally could just set the parent on the first, but this is protected, diff --git a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/SemaphoreImpl.java b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/SemaphoreImpl.java index 3a2c6d436ef..c1be6c8e992 100644 --- a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/SemaphoreImpl.java +++ b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/SemaphoreImpl.java @@ -16,8 +16,10 @@ package com.sun.jdo.spi.persistence.utility; -import java.util.ResourceBundle; import com.sun.jdo.spi.persistence.utility.logging.Logger; + +import java.util.ResourceBundle; + import org.glassfish.persistence.common.I18NHelper; diff --git a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/StringHelper.java b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/StringHelper.java index 9da13129a4b..bf9585eac8c 100644 --- a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/StringHelper.java +++ b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/StringHelper.java @@ -22,7 +22,9 @@ package com.sun.jdo.spi.persistence.utility; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.StringTokenizer; /** * NOTE: These utilities have been moved from another (more specific diff --git a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/WeakHashSet.java b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/WeakHashSet.java index 5b0aa3ab2df..a9f9e807885 100644 --- a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/WeakHashSet.java +++ b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/WeakHashSet.java @@ -16,8 +16,10 @@ package com.sun.jdo.spi.persistence.utility; -import java.util.*; -import java.lang.ref.*; +import java.lang.ref.ReferenceQueue; +import java.lang.ref.WeakReference; +import java.util.HashSet; +import java.util.Iterator; /** * A weak HashSet. An element stored in the WeakHashSet might be garbage collected, diff --git a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/WeakValueHashMap.java b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/WeakValueHashMap.java index dec6ad78bac..6d18a21e4e9 100644 --- a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/WeakValueHashMap.java +++ b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/WeakValueHashMap.java @@ -18,7 +18,6 @@ import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; - import java.util.AbstractCollection; import java.util.AbstractSet; import java.util.Collection; diff --git a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/generator/JavaClassWriterHelper.java b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/generator/JavaClassWriterHelper.java index 27c07145f75..44734aef127 100644 --- a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/generator/JavaClassWriterHelper.java +++ b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/generator/JavaClassWriterHelper.java @@ -22,14 +22,13 @@ package com.sun.jdo.spi.persistence.utility.generator; -import java.io.IOException; +import com.sun.jdo.spi.persistence.utility.JavaTypeHelper; +import java.io.IOException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.StringTokenizer; -import com.sun.jdo.spi.persistence.utility.JavaTypeHelper; - /* * This is the utility class for helper strings and type convertion. * diff --git a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/generator/io/FormattedWriter.java b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/generator/io/FormattedWriter.java index c0cee7b3ebd..34a3c99d03e 100644 --- a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/generator/io/FormattedWriter.java +++ b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/generator/io/FormattedWriter.java @@ -22,7 +22,9 @@ package com.sun.jdo.spi.persistence.utility.generator.io; -import java.util.*; +import java.util.Iterator; +import java.util.List; +import java.util.StringTokenizer; /** diff --git a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/generator/io/IOJavaClassWriter.java b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/generator/io/IOJavaClassWriter.java index bbd24f05e1b..aca17cf8ff1 100644 --- a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/generator/io/IOJavaClassWriter.java +++ b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/generator/io/IOJavaClassWriter.java @@ -22,12 +22,15 @@ package com.sun.jdo.spi.persistence.utility.generator.io; -import java.util.*; -import java.lang.reflect.Modifier; - import com.sun.jdo.spi.persistence.utility.StringHelper; import com.sun.jdo.spi.persistence.utility.generator.JavaClassWriter; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * This implementation of the {@link JavaClassWriter} interface is based on * simple {@link java.lang.StringBuffer} "println" type statements. diff --git a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/generator/io/IOJavaFileWriter.java b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/generator/io/IOJavaFileWriter.java index f3cf3352c48..bf8899e25d8 100644 --- a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/generator/io/IOJavaFileWriter.java +++ b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/generator/io/IOJavaFileWriter.java @@ -22,12 +22,17 @@ package com.sun.jdo.spi.persistence.utility.generator.io; -import java.io.*; -import java.util.*; +import com.sun.jdo.spi.persistence.utility.generator.JavaClassWriter; +import com.sun.jdo.spi.persistence.utility.generator.JavaFileWriter; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.ResourceBundle; import org.glassfish.persistence.common.I18NHelper; -import com.sun.jdo.spi.persistence.utility.generator.JavaFileWriter; -import com.sun.jdo.spi.persistence.utility.generator.JavaClassWriter; /** * This implementation of the {@link JavaFileWriter} interface is based on diff --git a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/logging/AbstractLogger.java b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/logging/AbstractLogger.java index 798a5117643..3a674168cd5 100644 --- a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/logging/AbstractLogger.java +++ b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/logging/AbstractLogger.java @@ -22,12 +22,22 @@ package com.sun.jdo.spi.persistence.utility.logging; -import java.io.*; -import java.util.*; +import com.sun.jdo.spi.persistence.utility.StringHelper; + +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; import java.text.MessageFormat; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +import java.util.MissingResourceException; +import java.util.Properties; +import java.util.ResourceBundle; import org.glassfish.persistence.common.I18NHelper; -import com.sun.jdo.spi.persistence.utility.StringHelper; /** * This class provides a default implementation of the diff --git a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/logging/AbstractLoggerFactory.java b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/logging/AbstractLoggerFactory.java index e85506e0416..6031eb3cc65 100644 --- a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/logging/AbstractLoggerFactory.java +++ b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/logging/AbstractLoggerFactory.java @@ -22,8 +22,8 @@ package com.sun.jdo.spi.persistence.utility.logging; -import java.util.Map; import java.util.HashMap; +import java.util.Map; /** * diff --git a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/logging/LoggerFactoryJDK14.java b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/logging/LoggerFactoryJDK14.java index 1b888da16d2..d5cd613e051 100644 --- a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/logging/LoggerFactoryJDK14.java +++ b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/logging/LoggerFactoryJDK14.java @@ -16,15 +16,16 @@ package com.sun.jdo.spi.persistence.utility.logging; +import java.security.AccessController; +import java.security.PrivilegedAction; import java.text.MessageFormat; import java.util.ResourceBundle; +import java.util.logging.FileHandler; +import java.util.logging.Formatter; import java.util.logging.Level; import java.util.logging.LogManager; -import java.util.logging.Formatter; -import java.util.logging.FileHandler; import java.util.logging.SimpleFormatter; -import java.security.AccessController; -import java.security.PrivilegedAction; + import org.glassfish.persistence.common.I18NHelper; /** diff --git a/appserver/persistence/common/src/main/java/org/glassfish/persistence/common/PersistenceHelper.java b/appserver/persistence/common/src/main/java/org/glassfish/persistence/common/PersistenceHelper.java index f98b509f6ee..e056786e75d 100644 --- a/appserver/persistence/common/src/main/java/org/glassfish/persistence/common/PersistenceHelper.java +++ b/appserver/persistence/common/src/main/java/org/glassfish/persistence/common/PersistenceHelper.java @@ -16,8 +16,6 @@ */ package org.glassfish.persistence.common; -import static java.lang.System.Logger.Level.DEBUG; - import com.sun.appserv.connectors.internal.api.ConnectorRuntime; import com.sun.enterprise.deployment.BundleDescriptor; import com.sun.enterprise.deployment.types.ResourceReferenceContainer; @@ -31,6 +29,8 @@ import org.glassfish.api.naming.SimpleJndiName; import org.glassfish.resourcebase.resources.api.ResourceInfo; +import static java.lang.System.Logger.Level.DEBUG; + /** * Contains helper methods for persistence module * diff --git a/appserver/persistence/common/src/main/java/org/glassfish/persistence/common/database/DBVendorTypeHelper.java b/appserver/persistence/common/src/main/java/org/glassfish/persistence/common/database/DBVendorTypeHelper.java index 0bc7cc56909..eff386cc68e 100644 --- a/appserver/persistence/common/src/main/java/org/glassfish/persistence/common/database/DBVendorTypeHelper.java +++ b/appserver/persistence/common/src/main/java/org/glassfish/persistence/common/database/DBVendorTypeHelper.java @@ -16,6 +16,8 @@ package org.glassfish.persistence.common.database; +import com.sun.logging.LogDomains; + import java.io.IOException; import java.sql.DatabaseMetaData; import java.sql.SQLException; @@ -30,7 +32,6 @@ import java.util.regex.PatternSyntaxException; import org.glassfish.persistence.common.I18NHelper; -import com.sun.logging.LogDomains; /** * @author Mitesh Meswani diff --git a/appserver/persistence/common/src/main/java/org/glassfish/persistence/common/database/PropertyHelper.java b/appserver/persistence/common/src/main/java/org/glassfish/persistence/common/database/PropertyHelper.java index fe11948c7af..452da046d74 100644 --- a/appserver/persistence/common/src/main/java/org/glassfish/persistence/common/database/PropertyHelper.java +++ b/appserver/persistence/common/src/main/java/org/glassfish/persistence/common/database/PropertyHelper.java @@ -16,25 +16,23 @@ package org.glassfish.persistence.common.database; -import org.glassfish.persistence.common.I18NHelper; - -import java.util.Properties; -import java.util.ResourceBundle; -import java.util.logging.Level; -import java.util.logging.Logger; +import com.sun.logging.LogDomains; import java.io.BufferedInputStream; import java.io.FileInputStream; -import java.io.InputStream; import java.io.FileNotFoundException; import java.io.IOException; - +import java.io.InputStream; import java.security.AccessController; import java.security.PrivilegedAction; -import java.security.PrivilegedExceptionAction; import java.security.PrivilegedActionException; +import java.security.PrivilegedExceptionAction; +import java.util.Properties; +import java.util.ResourceBundle; +import java.util.logging.Level; +import java.util.logging.Logger; -import com.sun.logging.LogDomains; +import org.glassfish.persistence.common.I18NHelper; /** * @author Mitesh Meswani diff --git a/appserver/persistence/entitybean-container/src/main/java/com/sun/appserv/ejb/ReadOnlyBeanHelper.java b/appserver/persistence/entitybean-container/src/main/java/com/sun/appserv/ejb/ReadOnlyBeanHelper.java index 276892f1df9..41409332b8c 100644 --- a/appserver/persistence/entitybean-container/src/main/java/com/sun/appserv/ejb/ReadOnlyBeanHelper.java +++ b/appserver/persistence/entitybean-container/src/main/java/com/sun/appserv/ejb/ReadOnlyBeanHelper.java @@ -16,18 +16,18 @@ package com.sun.appserv.ejb; +import com.sun.logging.LogDomains; + +import java.util.logging.Level; +import java.util.logging.Logger; + import javax.naming.Context; import javax.naming.InitialContext; import javax.rmi.PortableRemoteObject; -import org.glassfish.persistence.ejb.entitybean.container.spi.ReadOnlyEJBLocalHome; -import org.glassfish.persistence.ejb.entitybean.container.spi.ReadOnlyEJBHome; - import org.glassfish.persistence.ejb.entitybean.container.ReadOnlyBeanNotifierImpl; - -import java.util.logging.*; - -import com.sun.logging.*; +import org.glassfish.persistence.ejb.entitybean.container.spi.ReadOnlyEJBHome; +import org.glassfish.persistence.ejb.entitybean.container.spi.ReadOnlyEJBLocalHome; /** * Class that is used to obtain ReadOnlyBeanNotifier diff --git a/appserver/persistence/entitybean-container/src/main/java/com/sun/appserv/ejb/ReadOnlyBeanNotifier.java b/appserver/persistence/entitybean-container/src/main/java/com/sun/appserv/ejb/ReadOnlyBeanNotifier.java index 04fdcd9582c..58a2fc47f70 100644 --- a/appserver/persistence/entitybean-container/src/main/java/com/sun/appserv/ejb/ReadOnlyBeanNotifier.java +++ b/appserver/persistence/entitybean-container/src/main/java/com/sun/appserv/ejb/ReadOnlyBeanNotifier.java @@ -17,9 +17,9 @@ package com.sun.appserv.ejb; import java.rmi.RemoteException; -import org.jvnet.hk2.annotations.Contract; import org.glassfish.persistence.ejb.entitybean.container.spi.ReadOnlyEJBHome; +import org.jvnet.hk2.annotations.Contract; /** * ReadOnlyBeanNotifier is used to force refresh of ReadOnly beans diff --git a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/CommitCEntityContainer.java b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/CommitCEntityContainer.java index 1a779ae36f3..3d4786a5250 100644 --- a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/CommitCEntityContainer.java +++ b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/CommitCEntityContainer.java @@ -18,6 +18,7 @@ import com.sun.ejb.EjbInvocation; import com.sun.enterprise.security.SecurityManager; + import org.glassfish.ejb.deployment.descriptor.EjbDescriptor; /* diff --git a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/EntityContainer.java b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/EntityContainer.java index 5f5965d5806..ccc02d92308 100644 --- a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/EntityContainer.java +++ b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/EntityContainer.java @@ -17,35 +17,6 @@ package org.glassfish.persistence.ejb.entitybean.container; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.rmi.RemoteException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Enumeration; -import java.util.Iterator; -import java.util.Set; -import java.util.Stack; -import java.util.Vector; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.glassfish.api.invocation.ComponentInvocation; -import org.glassfish.ejb.config.EjbContainer; -import org.glassfish.ejb.deployment.descriptor.EjbCMPEntityDescriptor; -import org.glassfish.ejb.deployment.descriptor.EjbDescriptor; -import org.glassfish.ejb.deployment.descriptor.EjbEntityDescriptor; -import org.glassfish.ejb.deployment.descriptor.runtime.BeanCacheDescriptor; -import org.glassfish.ejb.deployment.descriptor.runtime.IASEjbExtraDescriptors; -import org.glassfish.flashlight.provider.ProbeProviderFactory; -import org.glassfish.persistence.ejb.entitybean.container.cache.EJBObjectCache; -import org.glassfish.persistence.ejb.entitybean.container.cache.EJBObjectCacheListener; -import org.glassfish.persistence.ejb.entitybean.container.cache.FIFOEJBObjectCache; -import org.glassfish.persistence.ejb.entitybean.container.cache.UnboundedEJBObjectCache; -import org.glassfish.persistence.ejb.entitybean.container.spi.ReadOnlyEJBHome; -import org.glassfish.persistence.ejb.entitybean.container.spi.ReadOnlyEJBLocalHome; -import org.glassfish.persistence.ejb.entitybean.container.stats.EntityBeanStatsProvider; - import com.sun.appserv.util.cache.BaseCache; import com.sun.appserv.util.cache.Cache; import com.sun.appserv.util.cache.CacheListener; @@ -98,6 +69,35 @@ import jakarta.transaction.SystemException; import jakarta.transaction.Transaction; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.rmi.RemoteException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.Set; +import java.util.Stack; +import java.util.Vector; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.glassfish.api.invocation.ComponentInvocation; +import org.glassfish.ejb.config.EjbContainer; +import org.glassfish.ejb.deployment.descriptor.EjbCMPEntityDescriptor; +import org.glassfish.ejb.deployment.descriptor.EjbDescriptor; +import org.glassfish.ejb.deployment.descriptor.EjbEntityDescriptor; +import org.glassfish.ejb.deployment.descriptor.runtime.BeanCacheDescriptor; +import org.glassfish.ejb.deployment.descriptor.runtime.IASEjbExtraDescriptors; +import org.glassfish.flashlight.provider.ProbeProviderFactory; +import org.glassfish.persistence.ejb.entitybean.container.cache.EJBObjectCache; +import org.glassfish.persistence.ejb.entitybean.container.cache.EJBObjectCacheListener; +import org.glassfish.persistence.ejb.entitybean.container.cache.FIFOEJBObjectCache; +import org.glassfish.persistence.ejb.entitybean.container.cache.UnboundedEJBObjectCache; +import org.glassfish.persistence.ejb.entitybean.container.spi.ReadOnlyEJBHome; +import org.glassfish.persistence.ejb.entitybean.container.spi.ReadOnlyEJBLocalHome; +import org.glassfish.persistence.ejb.entitybean.container.stats.EntityBeanStatsProvider; + /** * This class implements the Container interface for EntityBeans. * It is responsible for instance & lifecycle management for BMP & CMP diff --git a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/EntityContainerFactory.java b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/EntityContainerFactory.java index c2ffc26bc34..cb2da664111 100644 --- a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/EntityContainerFactory.java +++ b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/EntityContainerFactory.java @@ -16,18 +16,19 @@ package org.glassfish.persistence.ejb.entitybean.container; -import com.sun.ejb.containers.BaseContainerFactory; -import java.util.logging.Level; -import java.util.logging.Logger; - -import jakarta.inject.Inject; -import jakarta.inject.Named; - import com.sun.ejb.Container; import com.sun.ejb.ContainerFactory; +import com.sun.ejb.containers.BaseContainerFactory; import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.security.SecurityManager; import com.sun.logging.LogDomains; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.api.deployment.DeploymentContext; import org.glassfish.ejb.config.EjbContainer; diff --git a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/ReadOnlyBeanContainer.java b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/ReadOnlyBeanContainer.java index 5c00fdc902f..e1443c96813 100644 --- a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/ReadOnlyBeanContainer.java +++ b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/ReadOnlyBeanContainer.java @@ -16,6 +16,27 @@ package org.glassfish.persistence.ejb.entitybean.container; +import com.sun.ejb.ComponentContext; +import com.sun.ejb.EjbInvocation; +import com.sun.ejb.InvocationInfo; +import com.sun.ejb.containers.EJBContextImpl; +import com.sun.ejb.containers.EJBContextImpl.BeanState; +import com.sun.ejb.containers.EJBHomeInvocationHandler; +import com.sun.ejb.containers.EJBLocalHomeInvocationHandler; +import com.sun.ejb.containers.EJBLocalRemoteObject; +import com.sun.ejb.spi.container.BeanStateSynchronization; +import com.sun.enterprise.security.SecurityManager; + +import jakarta.ejb.CreateException; +import jakarta.ejb.EJBException; +import jakarta.ejb.EJBLocalObject; +import jakarta.ejb.EJBObject; +import jakarta.ejb.EntityBean; +import jakarta.ejb.FinderException; +import jakarta.ejb.NoSuchEntityException; +import jakarta.ejb.NoSuchObjectLocalException; +import jakarta.ejb.RemoveException; + import java.lang.reflect.Method; import java.rmi.RemoteException; import java.util.Collection; @@ -25,38 +46,18 @@ import java.util.Map; import java.util.Timer; import java.util.TimerTask; -import jakarta.ejb.EJBException; -import jakarta.ejb.EJBLocalObject; -import jakarta.ejb.EJBObject; -import jakarta.ejb.EntityBean; -import jakarta.ejb.FinderException; -import jakarta.ejb.RemoveException; +import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; -import com.sun.ejb.ComponentContext; -import com.sun.ejb.EjbInvocation; -import com.sun.ejb.InvocationInfo; -import com.sun.ejb.containers.EJBContextImpl; -import com.sun.ejb.containers.EJBHomeInvocationHandler; -import com.sun.ejb.containers.EJBLocalHomeInvocationHandler; -import com.sun.ejb.containers.EJBLocalRemoteObject; -import com.sun.enterprise.security.SecurityManager; +import org.glassfish.ejb.deployment.descriptor.EjbDescriptor; +import org.glassfish.ejb.deployment.descriptor.EjbEntityDescriptor; import org.glassfish.persistence.ejb.entitybean.container.cache.EJBObjectCache; import org.glassfish.persistence.ejb.entitybean.container.cache.FIFOEJBObjectCache; import org.glassfish.persistence.ejb.entitybean.container.cache.UnboundedEJBObjectCache; -import com.sun.ejb.spi.container.BeanStateSynchronization; -import org.glassfish.ejb.deployment.descriptor.EjbDescriptor; -import org.glassfish.ejb.deployment.descriptor.EjbEntityDescriptor; import org.glassfish.persistence.ejb.entitybean.container.distributed.DistributedEJBServiceFactory; import org.glassfish.persistence.ejb.entitybean.container.distributed.DistributedReadOnlyBeanService; import org.glassfish.persistence.ejb.entitybean.container.distributed.ReadOnlyBeanRefreshEventHandler; -import static com.sun.ejb.containers.EJBContextImpl.BeanState; -import jakarta.ejb.CreateException; -import jakarta.ejb.NoSuchEntityException; -import jakarta.ejb.NoSuchObjectLocalException; -import java.util.concurrent.ConcurrentHashMap; -import java.util.logging.Level; - /** * The Container that manages instances of ReadOnly Beans. This container * blocks all calls to ejbStore() and selectively performs ejbLoad() diff --git a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/ReadOnlyBeanNotifierImpl.java b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/ReadOnlyBeanNotifierImpl.java index 95a97fec917..38a7bd6f1d5 100644 --- a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/ReadOnlyBeanNotifierImpl.java +++ b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/ReadOnlyBeanNotifierImpl.java @@ -17,8 +17,8 @@ package org.glassfish.persistence.ejb.entitybean.container; -import org.jvnet.hk2.annotations.Service; import org.glassfish.persistence.ejb.entitybean.container.spi.ReadOnlyEJBHome; +import org.jvnet.hk2.annotations.Service; /** * An instance of ReadOnlyBeanNotifier is used to refresh ReadOnlyBeans diff --git a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/ReadOnlyContextImpl.java b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/ReadOnlyContextImpl.java index 07aa5fac2fb..b027341e544 100644 --- a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/ReadOnlyContextImpl.java +++ b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/ReadOnlyContextImpl.java @@ -16,9 +16,10 @@ package org.glassfish.persistence.ejb.entitybean.container; -import jakarta.ejb.EnterpriseBean; import com.sun.ejb.containers.BaseContainer; +import jakarta.ejb.EnterpriseBean; + /** * Implementation of EJBContext for ReadOnlyBeans. Contains extra * attributes that allows selective ejbLoad() diff --git a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/ReadOnlyEJBLocalHomeImpl.java b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/ReadOnlyEJBLocalHomeImpl.java index 4a323571a7c..c7e5bf6a227 100644 --- a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/ReadOnlyEJBLocalHomeImpl.java +++ b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/ReadOnlyEJBLocalHomeImpl.java @@ -16,10 +16,11 @@ package org.glassfish.persistence.ejb.entitybean.container; -import java.lang.reflect.Method; - import com.sun.appserv.ejb.ReadOnlyBeanLocalNotifier; import com.sun.enterprise.deployment.EjbDescriptor; + +import java.lang.reflect.Method; + import org.glassfish.persistence.ejb.entitybean.container.spi.ReadOnlyEJBLocalHome; /** diff --git a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/cache/FIFOEJBObjectCache.java b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/cache/FIFOEJBObjectCache.java index 39064d443c9..44c2af81701 100644 --- a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/cache/FIFOEJBObjectCache.java +++ b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/cache/FIFOEJBObjectCache.java @@ -18,14 +18,14 @@ package org.glassfish.persistence.ejb.entitybean.container.cache; import com.sun.ejb.containers.util.cache.LruEJBCache; +import com.sun.logging.LogDomains; -import java.util.Map; -import java.util.HashMap; import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; import java.util.Properties; - -import java.util.logging.*; -import com.sun.logging.*; +import java.util.logging.Level; +import java.util.logging.Logger; /** * A FIFO EJB(Local)Object cache that maintains reference count diff --git a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/cache/UnboundedEJBObjectCache.java b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/cache/UnboundedEJBObjectCache.java index 6cd24ae2c18..9c4d255112c 100644 --- a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/cache/UnboundedEJBObjectCache.java +++ b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/cache/UnboundedEJBObjectCache.java @@ -17,8 +17,9 @@ package org.glassfish.persistence.ejb.entitybean.container.cache; import com.sun.appserv.util.cache.BaseCache; -import java.util.Map; + import java.util.HashMap; +import java.util.Map; import java.util.Properties; /** diff --git a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/distributed/DistributedReadOnlyBeanServiceImpl.java b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/distributed/DistributedReadOnlyBeanServiceImpl.java index a2641526dc7..c5eba6f3cd9 100644 --- a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/distributed/DistributedReadOnlyBeanServiceImpl.java +++ b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/distributed/DistributedReadOnlyBeanServiceImpl.java @@ -16,6 +16,8 @@ package org.glassfish.persistence.ejb.entitybean.container.distributed; +import com.sun.logging.LogDomains; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -26,8 +28,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.logging.LogDomains; - class DistributedReadOnlyBeanServiceImpl implements DistributedReadOnlyBeanService { diff --git a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/distributed/ReadOnlyBeanMessageCallBack.java b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/distributed/ReadOnlyBeanMessageCallBack.java index 217172da506..61bf2a2d069 100755 --- a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/distributed/ReadOnlyBeanMessageCallBack.java +++ b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/distributed/ReadOnlyBeanMessageCallBack.java @@ -17,20 +17,20 @@ package org.glassfish.persistence.ejb.entitybean.container.distributed; import com.sun.ejb.containers.EjbContainerUtil; - -import org.glassfish.gms.bootstrap.GMSAdapter; -import org.glassfish.gms.bootstrap.GMSAdapterService; import com.sun.enterprise.ee.cms.core.CallBack; import com.sun.enterprise.ee.cms.core.GroupManagementService; import com.sun.enterprise.ee.cms.core.MessageSignal; import com.sun.enterprise.ee.cms.core.Signal; +import com.sun.logging.LogDomains; -import org.jvnet.hk2.annotations.Service; import jakarta.inject.Inject; -import java.util.logging.Logger; import java.util.logging.Level; -import com.sun.logging.LogDomains; +import java.util.logging.Logger; + +import org.glassfish.gms.bootstrap.GMSAdapter; +import org.glassfish.gms.bootstrap.GMSAdapterService; +import org.jvnet.hk2.annotations.Service; @Service public class ReadOnlyBeanMessageCallBack implements CallBack, DistributedReadOnlyBeanNotifier { diff --git a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/stats/EntityBeanStatsProvider.java b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/stats/EntityBeanStatsProvider.java index 595df13b7e6..ed5e0131490 100644 --- a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/stats/EntityBeanStatsProvider.java +++ b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/stats/EntityBeanStatsProvider.java @@ -16,12 +16,15 @@ package org.glassfish.persistence.ejb.entitybean.container.stats; -import org.glassfish.persistence.ejb.entitybean.container.EntityContainer; - import com.sun.ejb.monitoring.stats.EjbMonitoringStatsProvider; -import org.glassfish.external.statistics.*; -import org.glassfish.external.statistics.impl.*; -import org.glassfish.gmbal.*; + +import org.glassfish.external.statistics.RangeStatistic; +import org.glassfish.external.statistics.impl.BoundedRangeStatisticImpl; +import org.glassfish.gmbal.AMXMetadata; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedObject; +import org.glassfish.persistence.ejb.entitybean.container.EntityContainer; /** * Probe listener for the Entity Beans part of the EJB monitoring events. diff --git a/appserver/persistence/gf-jpa-connector/src/main/java/org/glassfish/persistence/jpaconnector/JPACompositeSniffer.java b/appserver/persistence/gf-jpa-connector/src/main/java/org/glassfish/persistence/jpaconnector/JPACompositeSniffer.java index d9ee086e6fb..73a2bf3ee5d 100644 --- a/appserver/persistence/gf-jpa-connector/src/main/java/org/glassfish/persistence/jpaconnector/JPACompositeSniffer.java +++ b/appserver/persistence/gf-jpa-connector/src/main/java/org/glassfish/persistence/jpaconnector/JPACompositeSniffer.java @@ -20,17 +20,19 @@ import com.sun.enterprise.deployment.BundleDescriptor; import com.sun.enterprise.deployment.archivist.EARBasedPersistenceHelper; import com.sun.enterprise.deployment.archivist.PersistenceArchivist; -import org.glassfish.deployment.common.ModuleDescriptor; + +import jakarta.inject.Singleton; + +import java.util.Enumeration; +import java.util.Set; + import org.glassfish.api.deployment.DeploymentContext; -import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.api.deployment.archive.ArchiveType; +import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.deployment.common.DeploymentUtils; +import org.glassfish.deployment.common.ModuleDescriptor; import org.glassfish.javaee.core.deployment.ApplicationHolder; - import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Singleton; -import java.util.Enumeration; -import java.util.Set; /** * Sniffer handling ears diff --git a/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/EmbeddedProviderContainerContractInfo.java b/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/EmbeddedProviderContainerContractInfo.java index d4417f616e1..f99a1d5596c 100644 --- a/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/EmbeddedProviderContainerContractInfo.java +++ b/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/EmbeddedProviderContainerContractInfo.java @@ -16,10 +16,10 @@ package org.glassfish.persistence.jpa; -import org.glassfish.api.deployment.DeploymentContext; - import com.sun.appserv.connectors.internal.api.ConnectorRuntime; +import org.glassfish.api.deployment.DeploymentContext; + /** * Implementation of ProviderContainerContractInfo while running inside embedded * server diff --git a/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/PersistenceUnitLoader.java b/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/PersistenceUnitLoader.java index 2898ffa3709..ecb0f99ba8f 100644 --- a/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/PersistenceUnitLoader.java +++ b/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/PersistenceUnitLoader.java @@ -17,9 +17,16 @@ package org.glassfish.persistence.jpa; -import static java.util.Collections.unmodifiableMap; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.INFO; +import com.sun.enterprise.deployment.PersistenceUnitDescriptor; +import com.sun.enterprise.deployment.PersistenceUnitsDescriptor; +import com.sun.enterprise.util.i18n.StringManager; +import com.sun.logging.LogDomains; + +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.PersistenceProvider; +import jakarta.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import java.util.HashMap; import java.util.Map; @@ -32,16 +39,9 @@ import org.glassfish.persistence.jpa.schemageneration.SchemaGenerationProcessor; import org.glassfish.persistence.jpa.schemageneration.SchemaGenerationProcessorFactory; -import com.sun.enterprise.deployment.PersistenceUnitDescriptor; -import com.sun.enterprise.deployment.PersistenceUnitsDescriptor; -import com.sun.enterprise.util.i18n.StringManager; -import com.sun.logging.LogDomains; - -import jakarta.persistence.EntityManagerFactory; -import jakarta.persistence.ValidationMode; -import jakarta.persistence.spi.PersistenceProvider; -import jakarta.persistence.spi.PersistenceUnitInfo; -import jakarta.persistence.spi.PersistenceUnitTransactionType; +import static java.util.Collections.unmodifiableMap; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.INFO; /** * Loads emf corresponding to a PersistenceUnit. Executes java2db if required. diff --git a/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/schemageneration/JPAStandardSchemaGenerationProcessor.java b/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/schemageneration/JPAStandardSchemaGenerationProcessor.java index 28bf26fe49c..ca4cd3f0664 100644 --- a/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/schemageneration/JPAStandardSchemaGenerationProcessor.java +++ b/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/schemageneration/JPAStandardSchemaGenerationProcessor.java @@ -16,14 +16,14 @@ package org.glassfish.persistence.jpa.schemageneration; +import com.sun.enterprise.deployment.PersistenceUnitDescriptor; + import java.io.CharArrayReader; import java.util.HashMap; import java.util.Map; import org.glassfish.api.deployment.DeploymentContext; -import com.sun.enterprise.deployment.PersistenceUnitDescriptor; - /** * Schema generation processor while using standard JPA based schema generation * diff --git a/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/schemageneration/SchemaGenerationProcessor.java b/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/schemageneration/SchemaGenerationProcessor.java index 1db4f9d5fd7..805af644eae 100644 --- a/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/schemageneration/SchemaGenerationProcessor.java +++ b/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/schemageneration/SchemaGenerationProcessor.java @@ -16,12 +16,12 @@ package org.glassfish.persistence.jpa.schemageneration; +import com.sun.enterprise.deployment.PersistenceUnitDescriptor; + import java.util.Map; import org.glassfish.api.deployment.DeploymentContext; -import com.sun.enterprise.deployment.PersistenceUnitDescriptor; - /** * Processor for schema generation * diff --git a/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/schemageneration/SchemaGenerationProcessorFactory.java b/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/schemageneration/SchemaGenerationProcessorFactory.java index 1bc2e65d16b..8a5bcd391b8 100644 --- a/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/schemageneration/SchemaGenerationProcessorFactory.java +++ b/appserver/persistence/jpa-container/src/main/java/org/glassfish/persistence/jpa/schemageneration/SchemaGenerationProcessorFactory.java @@ -16,11 +16,11 @@ package org.glassfish.persistence.jpa.schemageneration; -import static org.glassfish.persistence.jpa.schemageneration.EclipseLinkSchemaGenerationProcessor.isSupportedPersistenceProvider; +import com.sun.enterprise.deployment.PersistenceUnitDescriptor; import org.glassfish.persistence.jpa.PersistenceUnitInfoImpl; -import com.sun.enterprise.deployment.PersistenceUnitDescriptor; +import static org.glassfish.persistence.jpa.schemageneration.EclipseLinkSchemaGenerationProcessor.isSupportedPersistenceProvider; /** * Factory for creating SchemaGenerationProcessor From aa90fc235216f8e9a11cf41c3ceafba4df5b13c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 01:00:25 +0200 Subject: [PATCH 17/40] Imports: ORB modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../iiop/api/GlassFishORBFactory.java | 4 +- .../api/GlassFishORBLifeCycleListener.java | 4 +- .../iiop/api/HandleDelegateFacade.java | 4 +- .../enterprise/iiop/api/IIOPSSLUtil.java | 4 +- .../iiop/spi/EjbContainerFacade.java | 4 +- .../enterprise/iiop/spi/EjbService.java | 4 +- .../iiop/util/GenericStatsImpl.java | 7 ++-- .../enterprise/iiop/util/IIOPUtils.java | 20 +++++---- .../enterprise/iiop/util/ThreadPoolStats.java | 2 +- .../iiop/util/ThreadPoolStatsImpl.java | 15 +++---- .../orb/admin/cli/CreateIiopListener.java | 42 +++++++++---------- .../orb/admin/cli/DeleteIiopListener.java | 39 ++++++++--------- .../orb/admin/cli/ListIiopListeners.java | 33 ++++++++------- .../handler/IiopServiceSslConfigHandler.java | 7 ++-- .../config/handler/IiopSslConfigHandler.java | 11 ++--- .../orb/admin/cli/CreateIiopListenerTest.java | 4 +- .../orb/admin/cli/DeleteIiopListenerTest.java | 4 +- .../orb/admin/cli/ListIiopListenersTest.java | 4 +- .../orb/admin/test/GlassFishTestDocument.java | 9 ++-- .../api/enabler/ORBConnectorStartup.java | 10 ++--- .../orb/admin/config/IiopService.java | 9 ++-- .../org/glassfish/orb/admin/config/Orb.java | 18 ++++---- .../CSIv2SSLTaggedComponentHandlerImpl.java | 2 - .../iiop/impl/GlassFishORBFactoryImpl.java | 9 ++-- .../iiop/impl/GlassFishORBInitializer.java | 9 ++-- .../iiop/impl/HandleDelegateClassLoader.java | 4 +- .../iiop/impl/HandleDelegateFacadeImpl.java | 3 +- .../iiop/impl/IORAddrAnyInitializer.java | 4 +- .../iiop/impl/NamingClusterInfoImpl.java | 19 +++++---- .../enterprise/iiop/impl/POAProtocolMgr.java | 14 +++---- 30 files changed, 165 insertions(+), 157 deletions(-) diff --git a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/GlassFishORBFactory.java b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/GlassFishORBFactory.java index 89bb4e5e3fb..b8c2a5333e0 100644 --- a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/GlassFishORBFactory.java +++ b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/GlassFishORBFactory.java @@ -16,12 +16,12 @@ package org.glassfish.enterprise.iiop.api; +import java.util.Properties; + import org.jvnet.hk2.annotations.Contract; import org.omg.CORBA.ORB; import org.omg.PortableInterceptor.ServerRequestInfo; -import java.util.Properties; - /** * @author Mahesh Kannan Date: Jan 17, 2009 */ diff --git a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/GlassFishORBLifeCycleListener.java b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/GlassFishORBLifeCycleListener.java index f5834d94e51..766d6719f1f 100644 --- a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/GlassFishORBLifeCycleListener.java +++ b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/GlassFishORBLifeCycleListener.java @@ -16,11 +16,11 @@ package org.glassfish.enterprise.iiop.api; -import org.jvnet.hk2.annotations.Contract; - import java.util.List; import java.util.Properties; +import org.jvnet.hk2.annotations.Contract; + /** * @author Mahesh Kannan * Date: Jan 16, 2009 diff --git a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/HandleDelegateFacade.java b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/HandleDelegateFacade.java index aa04ff45dbb..6df28e67e99 100644 --- a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/HandleDelegateFacade.java +++ b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/HandleDelegateFacade.java @@ -16,10 +16,10 @@ package org.glassfish.enterprise.iiop.api; -import org.jvnet.hk2.annotations.Contract; - import jakarta.ejb.spi.HandleDelegate; +import org.jvnet.hk2.annotations.Contract; + @Contract public interface HandleDelegateFacade { diff --git a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/IIOPSSLUtil.java b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/IIOPSSLUtil.java index 3f14ee6fd10..7af507a0252 100644 --- a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/IIOPSSLUtil.java +++ b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/api/IIOPSSLUtil.java @@ -17,9 +17,11 @@ package org.glassfish.enterprise.iiop.api; import java.security.SecureRandom; -import org.jvnet.hk2.annotations.Contract; + import javax.net.ssl.KeyManager; import javax.net.ssl.TrustManager; + +import org.jvnet.hk2.annotations.Contract; import org.omg.IOP.TaggedComponent; import org.omg.PortableInterceptor.IORInfo; /** diff --git a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/spi/EjbContainerFacade.java b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/spi/EjbContainerFacade.java index 96430737588..75227785039 100644 --- a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/spi/EjbContainerFacade.java +++ b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/spi/EjbContainerFacade.java @@ -16,10 +16,10 @@ package org.glassfish.enterprise.iiop.spi; -import java.rmi.Remote; - import com.sun.enterprise.deployment.EjbDescriptor; +import java.rmi.Remote; + /** * Provides ejb-specific services to iiop glue code. */ diff --git a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/spi/EjbService.java b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/spi/EjbService.java index a5b2190fff9..102d9153b41 100644 --- a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/spi/EjbService.java +++ b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/spi/EjbService.java @@ -16,10 +16,10 @@ package org.glassfish.enterprise.iiop.spi; -import org.jvnet.hk2.annotations.Contract; - import com.sun.enterprise.deployment.EjbDescriptor; +import org.jvnet.hk2.annotations.Contract; + /** * Provides general EJB container services needed by iiop glue code. */ diff --git a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/util/GenericStatsImpl.java b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/util/GenericStatsImpl.java index e1ef0d517c7..ab0291cf4c4 100644 --- a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/util/GenericStatsImpl.java +++ b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/util/GenericStatsImpl.java @@ -17,12 +17,13 @@ package org.glassfish.enterprise.iiop.util; import java.lang.reflect.Method; -import java.util.Iterator; -import java.util.Map; import java.util.ArrayList; import java.util.HashMap; -import org.glassfish.external.statistics.Stats; +import java.util.Iterator; +import java.util.Map; + import org.glassfish.external.statistics.Statistic; +import org.glassfish.external.statistics.Stats; /** Provides for generic implementation of any Stats interface. This class facilitates * composition over inheritance for all the classes that implement their diff --git a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/util/IIOPUtils.java b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/util/IIOPUtils.java index 5b4a27db579..ed817510485 100644 --- a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/util/IIOPUtils.java +++ b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/util/IIOPUtils.java @@ -16,28 +16,30 @@ package org.glassfish.enterprise.iiop.util; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.ServerRef; + +import jakarta.inject.Inject; + import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Set; import java.util.TreeSet; -import com.sun.enterprise.config.serverbeans.Config; -import org.glassfish.orb.admin.config.IiopListener; -import org.glassfish.orb.admin.config.IiopService; -import com.sun.enterprise.config.serverbeans.ServerRef; -import org.glassfish.grizzly.config.dom.NetworkListener; -import org.glassfish.grizzly.config.dom.ThreadPool; import org.glassfish.api.admin.ProcessEnvironment; import org.glassfish.api.admin.ProcessEnvironment.ProcessType; import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.enterprise.iiop.api.GlassFishORBLifeCycleListener; import org.glassfish.enterprise.iiop.api.IIOPInterceptorFactory; -import org.glassfish.internal.api.ClassLoaderHierarchy; -import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; +import org.glassfish.grizzly.config.dom.NetworkListener; +import org.glassfish.grizzly.config.dom.ThreadPool; import org.glassfish.hk2.api.PostConstruct; import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.ClassLoaderHierarchy; +import org.glassfish.orb.admin.config.IiopListener; +import org.glassfish.orb.admin.config.IiopService; +import org.jvnet.hk2.annotations.Service; import org.omg.CORBA.ORB; /** diff --git a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/util/ThreadPoolStats.java b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/util/ThreadPoolStats.java index 5e8c569a265..4cf7e948101 100755 --- a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/util/ThreadPoolStats.java +++ b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/util/ThreadPoolStats.java @@ -16,8 +16,8 @@ package org.glassfish.enterprise.iiop.util; -import org.glassfish.external.statistics.CountStatistic; import org.glassfish.external.statistics.BoundedRangeStatistic; +import org.glassfish.external.statistics.CountStatistic; import org.glassfish.external.statistics.RangeStatistic; import org.glassfish.external.statistics.Stats; diff --git a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/util/ThreadPoolStatsImpl.java b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/util/ThreadPoolStatsImpl.java index bb217a62be2..f993fa9f821 100644 --- a/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/util/ThreadPoolStatsImpl.java +++ b/appserver/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/util/ThreadPoolStatsImpl.java @@ -17,19 +17,20 @@ package org.glassfish.enterprise.iiop.util; import com.sun.corba.ee.spi.threadpool.NoSuchWorkQueueException; -import org.glassfish.external.statistics.CountStatistic; -import org.glassfish.external.statistics.BoundedRangeStatistic; -import org.glassfish.external.statistics.RangeStatistic; - -import org.glassfish.external.statistics.impl.BoundedRangeStatisticImpl; -import org.glassfish.external.statistics.impl.CountStatisticImpl; import com.sun.corba.ee.spi.threadpool.ThreadPool; import com.sun.corba.ee.spi.threadpool.WorkQueue; + import java.util.logging.Level; import java.util.logging.Logger; + +import org.glassfish.external.statistics.BoundedRangeStatistic; +import org.glassfish.external.statistics.CountStatistic; +import org.glassfish.external.statistics.RangeStatistic; +import org.glassfish.external.statistics.impl.BoundedRangeStatisticImpl; +import org.glassfish.external.statistics.impl.CountStatisticImpl; +import org.glassfish.gmbal.Description; import org.glassfish.gmbal.ManagedAttribute; import org.glassfish.gmbal.ManagedObject; -import org.glassfish.gmbal.Description; /** * This is the implementation for the ThreadPoolStats diff --git a/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/cli/CreateIiopListener.java b/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/cli/CreateIiopListener.java index 67e6dd81568..1126d289240 100644 --- a/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/cli/CreateIiopListener.java +++ b/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/cli/CreateIiopListener.java @@ -16,38 +16,36 @@ package org.glassfish.orb.admin.cli; -import java.beans.PropertyVetoException; -import java.util.Properties; - -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.I18n; -import org.glassfish.api.Param; -import org.glassfish.api.ActionReport; - -import org.jvnet.hk2.annotations.Service; - -import jakarta.inject.Inject; -import org.glassfish.hk2.api.PerLookup; -import org.jvnet.hk2.config.ConfigSupport; -import org.jvnet.hk2.config.SingleConfigCode; -import org.jvnet.hk2.config.TransactionFailure; -import org.jvnet.hk2.config.types.Property; - import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Configs; -import org.glassfish.orb.admin.config.IiopListener; -import org.glassfish.orb.admin.config.IiopService; - import com.sun.enterprise.config.serverbeans.Servers; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + +import java.beans.PropertyVetoException; +import java.util.Properties; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.I18n; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.ExecuteOn; import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; -import org.glassfish.internal.api.Target; +import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Target; +import org.glassfish.orb.admin.config.IiopListener; +import org.glassfish.orb.admin.config.IiopService; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.ConfigSupport; +import org.jvnet.hk2.config.SingleConfigCode; +import org.jvnet.hk2.config.TransactionFailure; +import org.jvnet.hk2.config.types.Property; /** * Create IioP Listener Command diff --git a/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/cli/DeleteIiopListener.java b/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/cli/DeleteIiopListener.java index 129c99059ff..683f457a6a2 100644 --- a/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/cli/DeleteIiopListener.java +++ b/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/cli/DeleteIiopListener.java @@ -21,37 +21,34 @@ package org.glassfish.orb.admin.cli; -import java.beans.PropertyVetoException; - -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.I18n; -import org.glassfish.api.Param; -import org.glassfish.api.ActionReport; -import org.glassfish.api.ActionReport.ExitCode; - -import org.jvnet.hk2.annotations.Service; - -import jakarta.inject.Inject; -import org.glassfish.hk2.api.PerLookup; -import org.jvnet.hk2.config.ConfigSupport; -import org.jvnet.hk2.config.SingleConfigCode; -import org.jvnet.hk2.config.TransactionFailure; - import com.sun.enterprise.config.serverbeans.Config; -import org.glassfish.orb.admin.config.IiopListener; -import org.glassfish.orb.admin.config.IiopService; - import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; +import jakarta.inject.Inject; + +import java.beans.PropertyVetoException; import java.util.List; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.ActionReport.ExitCode; +import org.glassfish.api.I18n; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.ExecuteOn; import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; -import org.glassfish.internal.api.Target; +import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Target; +import org.glassfish.orb.admin.config.IiopListener; +import org.glassfish.orb.admin.config.IiopService; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.ConfigSupport; +import org.jvnet.hk2.config.SingleConfigCode; +import org.jvnet.hk2.config.TransactionFailure; @Service(name="delete-iiop-listener") diff --git a/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/cli/ListIiopListeners.java b/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/cli/ListIiopListeners.java index 83cf04a652e..e9c20f3ff54 100644 --- a/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/cli/ListIiopListeners.java +++ b/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/cli/ListIiopListeners.java @@ -18,30 +18,31 @@ import com.sun.enterprise.config.serverbeans.Config; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.admin.CommandLock; - -import org.glassfish.api.I18n; -import org.glassfish.api.ActionReport; - -import org.jvnet.hk2.annotations.Service; - -import jakarta.inject.Inject; -import org.glassfish.hk2.api.PerLookup; - -import org.glassfish.orb.admin.config.IiopListener; -import org.glassfish.orb.admin.config.IiopService; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; +import jakarta.inject.Inject; + import java.util.List; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; -import org.glassfish.internal.api.Target; +import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Target; +import org.glassfish.orb.admin.config.IiopListener; +import org.glassfish.orb.admin.config.IiopService; +import org.jvnet.hk2.annotations.Service; /** diff --git a/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/config/handler/IiopServiceSslConfigHandler.java b/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/config/handler/IiopServiceSslConfigHandler.java index c457b50de1b..c24646091ca 100644 --- a/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/config/handler/IiopServiceSslConfigHandler.java +++ b/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/config/handler/IiopServiceSslConfigHandler.java @@ -19,18 +19,19 @@ import com.sun.enterprise.admin.commands.CreateSsl; import com.sun.enterprise.admin.commands.DeleteSsl; import com.sun.enterprise.admin.commands.SslConfigHandler; -import org.glassfish.orb.admin.config.IiopService; import com.sun.enterprise.config.serverbeans.SslClientConfig; import com.sun.enterprise.util.LocalStringManagerImpl; + +import java.beans.PropertyVetoException; + import org.glassfish.api.ActionReport; import org.glassfish.grizzly.config.dom.Ssl; +import org.glassfish.orb.admin.config.IiopService; import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import java.beans.PropertyVetoException; - /** * SSL configuration handler for iiop-service. * @author Jerome Dochez diff --git a/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/config/handler/IiopSslConfigHandler.java b/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/config/handler/IiopSslConfigHandler.java index a0990e49d67..d1d4b22b582 100644 --- a/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/config/handler/IiopSslConfigHandler.java +++ b/appserver/orb/orb-connector/src/main/java/org/glassfish/orb/admin/config/handler/IiopSslConfigHandler.java @@ -18,19 +18,20 @@ import com.sun.enterprise.admin.commands.CreateSsl; import com.sun.enterprise.admin.commands.DeleteSsl; -import org.glassfish.orb.admin.config.IiopListener; -import org.glassfish.orb.admin.config.IiopService; +import com.sun.enterprise.admin.commands.SslConfigHandler; import com.sun.enterprise.util.LocalStringManagerImpl; + +import java.beans.PropertyVetoException; + import org.glassfish.api.ActionReport; import org.glassfish.grizzly.config.dom.Ssl; +import org.glassfish.orb.admin.config.IiopListener; +import org.glassfish.orb.admin.config.IiopService; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.admin.commands.SslConfigHandler; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import java.beans.PropertyVetoException; - /** * SSL configuration handler for iiop-listener configuration * @author Jerome Dochez diff --git a/appserver/orb/orb-connector/src/test/java/org/glassfish/orb/admin/cli/CreateIiopListenerTest.java b/appserver/orb/orb-connector/src/test/java/org/glassfish/orb/admin/cli/CreateIiopListenerTest.java index 81127ff58d8..be2d57ebc16 100644 --- a/appserver/orb/orb-connector/src/test/java/org/glassfish/orb/admin/cli/CreateIiopListenerTest.java +++ b/appserver/orb/orb-connector/src/test/java/org/glassfish/orb/admin/cli/CreateIiopListenerTest.java @@ -20,6 +20,8 @@ import com.sun.enterprise.v3.common.PropsFileActionReporter; import com.sun.logging.LogDomains; +import jakarta.inject.Inject; + import java.util.List; import java.util.logging.Logger; @@ -43,8 +45,6 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/appserver/orb/orb-connector/src/test/java/org/glassfish/orb/admin/cli/DeleteIiopListenerTest.java b/appserver/orb/orb-connector/src/test/java/org/glassfish/orb/admin/cli/DeleteIiopListenerTest.java index 74d4f5a5327..20743d4c261 100644 --- a/appserver/orb/orb-connector/src/test/java/org/glassfish/orb/admin/cli/DeleteIiopListenerTest.java +++ b/appserver/orb/orb-connector/src/test/java/org/glassfish/orb/admin/cli/DeleteIiopListenerTest.java @@ -20,6 +20,8 @@ import com.sun.enterprise.v3.common.PropsFileActionReporter; import com.sun.logging.LogDomains; +import jakarta.inject.Inject; + import java.util.List; import java.util.logging.Logger; @@ -43,8 +45,6 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/appserver/orb/orb-connector/src/test/java/org/glassfish/orb/admin/cli/ListIiopListenersTest.java b/appserver/orb/orb-connector/src/test/java/org/glassfish/orb/admin/cli/ListIiopListenersTest.java index 12d22b4bd80..0af54748ed1 100644 --- a/appserver/orb/orb-connector/src/test/java/org/glassfish/orb/admin/cli/ListIiopListenersTest.java +++ b/appserver/orb/orb-connector/src/test/java/org/glassfish/orb/admin/cli/ListIiopListenersTest.java @@ -20,6 +20,8 @@ import com.sun.enterprise.v3.common.PropsFileActionReporter; import com.sun.logging.LogDomains; +import jakarta.inject.Inject; + import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; @@ -40,8 +42,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/appserver/orb/orb-connector/src/test/java/org/glassfish/orb/admin/test/GlassFishTestDocument.java b/appserver/orb/orb-connector/src/test/java/org/glassfish/orb/admin/test/GlassFishTestDocument.java index 43be9690bdb..b5798078777 100644 --- a/appserver/orb/orb-connector/src/test/java/org/glassfish/orb/admin/test/GlassFishTestDocument.java +++ b/appserver/orb/orb-connector/src/test/java/org/glassfish/orb/admin/test/GlassFishTestDocument.java @@ -17,12 +17,13 @@ package org.glassfish.orb.admin.test; -import org.jvnet.hk2.config.DomDocument; -import org.jvnet.hk2.config.Dom; -import org.jvnet.hk2.config.ConfigModel; +import javax.xml.stream.XMLStreamReader; + import org.glassfish.config.support.GlassFishConfigBean; import org.glassfish.hk2.api.ServiceLocator; -import javax.xml.stream.XMLStreamReader; +import org.jvnet.hk2.config.ConfigModel; +import org.jvnet.hk2.config.Dom; +import org.jvnet.hk2.config.DomDocument; /** * diff --git a/appserver/orb/orb-enabler/src/main/java/org/glassfish/enterprise/api/enabler/ORBConnectorStartup.java b/appserver/orb/orb-enabler/src/main/java/org/glassfish/enterprise/api/enabler/ORBConnectorStartup.java index 4846c6db54d..7af1845dec1 100644 --- a/appserver/orb/orb-enabler/src/main/java/org/glassfish/enterprise/api/enabler/ORBConnectorStartup.java +++ b/appserver/orb/orb-enabler/src/main/java/org/glassfish/enterprise/api/enabler/ORBConnectorStartup.java @@ -16,11 +16,15 @@ package org.glassfish.enterprise.api.enabler; -import java.util.List; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.v3.services.impl.DummyNetworkListener; +import com.sun.enterprise.v3.services.impl.GrizzlyService; import jakarta.inject.Inject; import jakarta.inject.Named; +import java.util.List; + import org.glassfish.api.StartupRunLevel; import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.grizzly.config.dom.NetworkListener; @@ -30,10 +34,6 @@ import org.glassfish.orb.admin.config.IiopService; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.v3.services.impl.DummyNetworkListener; -import com.sun.enterprise.v3.services.impl.GrizzlyService; - /** */ @Service diff --git a/appserver/orb/orb-enabler/src/main/java/org/glassfish/orb/admin/config/IiopService.java b/appserver/orb/orb-enabler/src/main/java/org/glassfish/orb/admin/config/IiopService.java index 1f508a40f1e..7c9a5462ff4 100644 --- a/appserver/orb/orb-enabler/src/main/java/org/glassfish/orb/admin/config/IiopService.java +++ b/appserver/orb/orb-enabler/src/main/java/org/glassfish/orb/admin/config/IiopService.java @@ -17,14 +17,15 @@ package org.glassfish.orb.admin.config; import com.sun.enterprise.config.serverbeans.SslClientConfig; + +import java.beans.PropertyVetoException; +import java.util.List; + import org.glassfish.api.admin.config.ConfigExtension; import org.jvnet.hk2.config.Attribute; +import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.Element; -import org.jvnet.hk2.config.ConfigBeanProxy; - -import java.beans.PropertyVetoException; -import java.util.List; /* @XmlType(name = "", propOrder = { diff --git a/appserver/orb/orb-enabler/src/main/java/org/glassfish/orb/admin/config/Orb.java b/appserver/orb/orb-enabler/src/main/java/org/glassfish/orb/admin/config/Orb.java index 90dfc4a5899..5dea99fbbb0 100644 --- a/appserver/orb/orb-enabler/src/main/java/org/glassfish/orb/admin/config/Orb.java +++ b/appserver/orb/orb-enabler/src/main/java/org/glassfish/orb/admin/config/Orb.java @@ -16,22 +16,20 @@ package org.glassfish.orb.admin.config; -import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.ConfigBeanProxy; -import org.jvnet.hk2.config.Configured; -import org.jvnet.hk2.config.Element; -import org.jvnet.hk2.config.types.Property; -import org.jvnet.hk2.config.types.PropertyBag; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import java.beans.PropertyVetoException; import java.util.List; import org.glassfish.api.admin.config.PropertiesDesc; - import org.glassfish.quality.ToDo; - -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Min; +import org.jvnet.hk2.config.Attribute; +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Configured; +import org.jvnet.hk2.config.Element; +import org.jvnet.hk2.config.types.Property; +import org.jvnet.hk2.config.types.PropertyBag; /** * Orb Configuration properties diff --git a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/CSIv2SSLTaggedComponentHandlerImpl.java b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/CSIv2SSLTaggedComponentHandlerImpl.java index f4a407f8532..2a655209b6f 100644 --- a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/CSIv2SSLTaggedComponentHandlerImpl.java +++ b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/CSIv2SSLTaggedComponentHandlerImpl.java @@ -24,7 +24,6 @@ import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.spi.orb.ORBConfigurator; import com.sun.corba.ee.spi.transport.SocketInfo; - import com.sun.logging.LogDomains; import java.util.ArrayList; @@ -32,7 +31,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -// import org.glassfish.enterprise.iiop.api.IIOPSSLUtil; import org.glassfish.internal.api.Globals; import org.omg.CORBA.ORBPackage.InvalidName; diff --git a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBFactoryImpl.java b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBFactoryImpl.java index d17c0ad565e..6fd1da2c992 100644 --- a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBFactoryImpl.java +++ b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBFactoryImpl.java @@ -16,17 +16,18 @@ package org.glassfish.enterprise.iiop.impl; +import jakarta.inject.Inject; + +import java.util.Properties; + import org.glassfish.enterprise.iiop.api.GlassFishORBFactory; import org.glassfish.enterprise.iiop.util.IIOPUtils; -import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PostConstruct; import org.glassfish.hk2.api.ServiceLocator; +import org.jvnet.hk2.annotations.Service; import org.omg.CORBA.ORB; import org.omg.PortableInterceptor.ServerRequestInfo; -import java.util.Properties; - /** * @author Mahesh Kannan * Date: Jan 15, 2009 diff --git a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBInitializer.java b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBInitializer.java index 70cc2453f45..8044377b2ba 100644 --- a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBInitializer.java +++ b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBInitializer.java @@ -17,6 +17,11 @@ package org.glassfish.enterprise.iiop.impl; import com.sun.logging.LogDomains; + +import java.util.Collection; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.enterprise.iiop.api.IIOPInterceptorFactory; import org.glassfish.enterprise.iiop.util.IIOPUtils; import org.omg.IOP.Codec; @@ -27,10 +32,6 @@ import org.omg.PortableInterceptor.ORBInitializer; import org.omg.PortableInterceptor.ServerRequestInterceptor; -import java.util.Collection; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * This file implements an initializer class for all portable interceptors * used in the J2EE RI (currently security and transactions). diff --git a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/HandleDelegateClassLoader.java b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/HandleDelegateClassLoader.java index c71ab6e1b16..42fe157dbe5 100644 --- a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/HandleDelegateClassLoader.java +++ b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/HandleDelegateClassLoader.java @@ -16,7 +16,9 @@ package org.glassfish.enterprise.iiop.impl; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; public class HandleDelegateClassLoader extends ClassLoader diff --git a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/HandleDelegateFacadeImpl.java b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/HandleDelegateFacadeImpl.java index 53f2ae8593c..898e493a39f 100644 --- a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/HandleDelegateFacadeImpl.java +++ b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/HandleDelegateFacadeImpl.java @@ -16,9 +16,10 @@ package org.glassfish.enterprise.iiop.impl; +import jakarta.ejb.spi.HandleDelegate; + import org.glassfish.enterprise.iiop.api.HandleDelegateFacade; import org.jvnet.hk2.annotations.Service; -import jakarta.ejb.spi.HandleDelegate; @Service public class HandleDelegateFacadeImpl implements HandleDelegateFacade { diff --git a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/IORAddrAnyInitializer.java b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/IORAddrAnyInitializer.java index fbf3caf28d9..7374f641b48 100755 --- a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/IORAddrAnyInitializer.java +++ b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/IORAddrAnyInitializer.java @@ -18,12 +18,14 @@ import com.sun.logging.LogDomains; + import java.util.logging.Level; import java.util.logging.Logger; + import org.omg.IOP.Codec; import org.omg.IOP.CodecFactory; -import org.omg.IOP.Encoding; import org.omg.IOP.ENCODING_CDR_ENCAPS; +import org.omg.IOP.Encoding; import org.omg.PortableInterceptor.ORBInitializer; import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName; diff --git a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/NamingClusterInfoImpl.java b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/NamingClusterInfoImpl.java index f09518c0d02..9245ca5e86e 100644 --- a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/NamingClusterInfoImpl.java +++ b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/NamingClusterInfoImpl.java @@ -18,26 +18,27 @@ package org.glassfish.enterprise.iiop.impl; import com.sun.corba.ee.spi.folb.GroupInfoService; + +import jakarta.inject.Singleton; + +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.api.naming.NamingClusterInfo; import org.glassfish.api.naming.NamingObjectsProvider; import org.glassfish.hk2.api.ServiceHandle; +import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.api.ORBLocator; import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; import org.omg.CORBA.ORB; import org.omg.CORBA.ORBPackage.InvalidName; import static org.glassfish.enterprise.iiop.impl.IIOPImplLogFacade.FAILED_TO_RESOLVE_GROUPINFOSERVICE; import static org.glassfish.enterprise.iiop.impl.IIOPImplLogFacade.NO_ENDPOINT_SELECTED; -import java.util.ArrayList; -import java.util.Hashtable; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import jakarta.inject.Singleton; - /** * This class is responsible for setting up naming load-balancing including RoundRobinPolicy. */ diff --git a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/POAProtocolMgr.java b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/POAProtocolMgr.java index bf1e7c348a9..2ff3e7614db 100644 --- a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/POAProtocolMgr.java +++ b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/POAProtocolMgr.java @@ -28,6 +28,12 @@ import com.sun.enterprise.util.Utility; import com.sun.logging.LogDomains; +import jakarta.ejb.NoSuchObjectLocalException; +import jakarta.ejb.TransactionRequiredLocalException; +import jakarta.ejb.TransactionRolledbackLocalException; +import jakarta.inject.Inject; +import jakarta.inject.Provider; + import java.rmi.Remote; import java.rmi.RemoteException; import java.util.ArrayList; @@ -42,9 +48,7 @@ import org.glassfish.enterprise.iiop.spi.EjbContainerFacade; import org.glassfish.enterprise.iiop.spi.EjbService; import org.glassfish.hk2.api.ServiceLocator; - import org.jvnet.hk2.annotations.Service; - import org.omg.CORBA.CompletionStatus; import org.omg.CORBA.INVALID_TRANSACTION; import org.omg.CORBA.LocalObject; @@ -63,12 +67,6 @@ import org.omg.PortableServer.ServantLocator; import org.omg.PortableServer.ServantLocatorPackage.CookieHolder; -import jakarta.ejb.NoSuchObjectLocalException; -import jakarta.ejb.TransactionRequiredLocalException; -import jakarta.ejb.TransactionRolledbackLocalException; -import jakarta.inject.Inject; -import jakarta.inject.Provider; - /** * This class implements the ProtocolManager interface for the * RMI/IIOP ORB with POA (Portable Object Adapter). From f8d1e18308af58389d1a198a9801605181ca2f9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 01:26:31 +0200 Subject: [PATCH 18/40] Imports: web modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../org/glassfish/web/admin/LogFacade.java | 5 +- .../glassfish/web/admin/cli/CreateHttp.java | 36 +++-- .../web/admin/cli/CreateHttpListener.java | 21 +-- .../web/admin/cli/CreateHttpRedirect.java | 31 ++-- .../web/admin/cli/CreateNetworkListener.java | 32 ++-- .../web/admin/cli/CreateProtocol.java | 23 +-- .../web/admin/cli/CreateProtocolFilter.java | 38 +++-- .../web/admin/cli/CreateProtocolFinder.java | 36 +++-- .../web/admin/cli/CreateTransport.java | 31 ++-- .../web/admin/cli/CreateVirtualServer.java | 27 ++-- .../glassfish/web/admin/cli/DeleteHttp.java | 35 +++-- .../web/admin/cli/DeleteHttpListener.java | 31 ++-- .../web/admin/cli/DeleteHttpRedirect.java | 34 +++-- .../web/admin/cli/DeleteNetworkListener.java | 27 ++-- .../web/admin/cli/DeleteProtocol.java | 27 ++-- .../web/admin/cli/DeleteProtocolFilter.java | 37 +++-- .../web/admin/cli/DeleteProtocolFinder.java | 35 +++-- .../web/admin/cli/DeleteTransport.java | 27 ++-- .../web/admin/cli/DeleteVirtualServer.java | 31 ++-- .../web/admin/cli/ListHttpListeners.java | 26 ++-- .../web/admin/cli/ListNetworkListeners.java | 26 ++-- .../web/admin/cli/ListProtocolFilters.java | 27 ++-- .../web/admin/cli/ListProtocolFinders.java | 27 ++-- .../web/admin/cli/ListProtocols.java | 26 ++-- .../web/admin/cli/ListTransports.java | 28 ++-- .../web/admin/cli/ListVirtualServers.java | 24 ++- .../monitor/HttpServiceStatsProvider.java | 11 +- .../HttpServiceStatsProviderBootstrap.java | 18 ++- .../web/admin/monitor/JspStatsProvider.java | 3 +- .../admin/monitor/RequestProbeProvider.java | 4 +- .../admin/monitor/RequestStatsProvider.java | 6 +- .../monitor/ServletInstanceStatsProvider.java | 4 +- .../admin/monitor/ServletStatsProvider.java | 4 +- .../admin/monitor/SessionStatsProvider.java | 4 +- .../VirtualServerInfoStatsProvider.java | 1 + .../monitor/WebStatsProviderBootstrap.java | 14 +- .../statistics/AltServletStatsImpl.java | 15 +- .../statistics/HTTPListenerStatsImpl.java | 19 +-- .../WebModuleVirtualServerStatsImpl.java | 17 ++- .../config/serverbeans/ManagerProperties.java | 8 +- .../web/config/serverbeans/SessionConfig.java | 9 +- .../config/serverbeans/SessionManager.java | 9 +- .../config/serverbeans/SessionProperties.java | 4 +- .../config/serverbeans/StoreProperties.java | 11 +- .../web/config/serverbeans/WebContainer.java | 18 +-- .../serverbeans/WebContainerAvailability.java | 13 +- .../org/glassfish/web/sniffer/WebSniffer.java | 16 +- .../glassfish/weld/connector/WeldSniffer.java | 26 ++-- .../glassfish/weld/connector/WeldUtils.java | 32 ++-- .../common/ListWebContextParamCommand.java | 15 +- .../plugin/common/ListWebEnvEntryCommand.java | 15 +- .../common/SetWebContextParamCommand.java | 3 +- .../plugin/common/SetWebEnvEntryCommand.java | 1 - .../common/UnsetWebContextParamCommand.java | 6 +- .../common/UnsetWebEnvEntryCommand.java | 6 +- .../plugin/common/WebModuleConfigCommand.java | 4 +- .../gf/ejb/internal/EjbExceptionMapper.java | 7 +- .../jsp/integration/JerseyMvcTldProvider.java | 20 ++- .../integration/GlassFishTldProvider.java | 26 ++-- .../integration/GlassFishTldProvider.java | 22 ++- .../integration/GlassFishTldProvider.java | 24 +-- .../web/loader/ReferenceCleaner.java | 3 +- .../ServletContainerInitializerUtil.java | 16 +- .../glassfish/web/loader/StringManager.java | 6 +- .../web/loader/WebappClassLoader.java | 3 +- .../java/org/apache/catalina/CometEvent.java | 1 + .../java/org/apache/catalina/Connector.java | 3 +- .../java/org/apache/catalina/Container.java | 4 +- .../java/org/apache/catalina/Context.java | 23 ++- .../java/org/apache/catalina/HttpRequest.java | 3 +- .../org/apache/catalina/HttpResponse.java | 1 + .../org/apache/catalina/InstanceEvent.java | 1 + .../java/org/apache/catalina/LogFacade.java | 5 +- .../java/org/apache/catalina/Manager.java | 5 +- .../java/org/apache/catalina/Pipeline.java | 5 +- .../java/org/apache/catalina/Request.java | 1 + .../java/org/apache/catalina/Response.java | 1 + .../java/org/apache/catalina/Session.java | 4 +- .../main/java/org/apache/catalina/Valve.java | 7 +- .../authenticator/AuthenticatorBase.java | 40 ++--- .../authenticator/BasicAuthenticator.java | 12 +- .../authenticator/DigestAuthenticator.java | 6 +- .../authenticator/FormAuthenticator.java | 32 ++-- .../authenticator/NonLoginAuthenticator.java | 4 +- .../authenticator/SSLAuthenticator.java | 24 +-- .../catalina/authenticator/SavedRequest.java | 4 +- .../catalina/authenticator/SingleSignOn.java | 16 +- .../apache/catalina/connector/Connector.java | 24 +-- .../catalina/connector/CoyoteAdapter.java | 30 ++-- .../catalina/connector/CoyoteInputStream.java | 7 +- .../connector/CoyoteOutputStream.java | 5 +- .../catalina/connector/CoyoteReader.java | 5 +- .../catalina/connector/CoyoteWriter.java | 4 +- .../catalina/connector/InputBuffer.java | 8 +- .../catalina/connector/MappingImpl.java | 9 +- .../catalina/connector/OutputBuffer.java | 7 +- .../apache/catalina/connector/Request.java | 138 +++++++++--------- .../catalina/connector/RequestFacade.java | 36 ++--- .../apache/catalina/connector/Response.java | 40 ++--- .../catalina/connector/ResponseFacade.java | 8 +- .../catalina/connector/SessionTracker.java | 4 +- .../catalina/connector/WebConnectionImpl.java | 6 +- .../catalina/core/ApplicationDispatcher.java | 40 +++-- .../core/ApplicationDispatcherForward.java | 29 ++-- .../catalina/core/ApplicationFilterChain.java | 17 ++- .../core/ApplicationFilterConfig.java | 13 +- .../core/ApplicationFilterFactory.java | 11 +- .../catalina/core/ApplicationHttpRequest.java | 29 ++-- .../core/ApplicationHttpResponse.java | 1 + .../catalina/core/ApplicationPushBuilder.java | 17 +-- .../catalina/core/ApplicationRequest.java | 10 +- .../catalina/core/ApplicationResponse.java | 1 + .../core/DummyFilterRegistrationDynamic.java | 1 + .../apache/catalina/core/DummyRequest.java | 25 ++-- .../apache/catalina/core/DummyResponse.java | 11 +- .../core/DynamicFilterRegistrationImpl.java | 7 +- .../core/DynamicServletRegistrationImpl.java | 5 +- .../catalina/core/FilterRegistrationImpl.java | 13 +- .../catalina/core/NamingContextListener.java | 42 ++++-- .../catalina/core/RequestFacadeHelper.java | 7 +- .../core/ServletRegistrationImpl.java | 4 +- .../core/SessionCookieConfigImpl.java | 18 +-- .../apache/catalina/core/StandardContext.java | 42 +++++- .../catalina/core/StandardContextValve.java | 15 +- .../apache/catalina/core/StandardEngine.java | 16 +- .../catalina/core/StandardEngineValve.java | 13 +- .../apache/catalina/core/StandardHost.java | 31 ++-- .../catalina/core/StandardHostDeployer.java | 20 ++- .../catalina/core/StandardHostValve.java | 40 ++--- .../catalina/core/StandardPipeline.java | 32 ++-- .../apache/catalina/core/StandardServer.java | 22 ++- .../apache/catalina/core/StandardService.java | 16 +- .../catalina/core/StandardWrapperFacade.java | 1 + .../catalina/core/StandardWrapperValve.java | 48 +++--- .../catalina/core/WebSocketFilterWrapper.java | 2 + .../org/apache/catalina/deploy/ErrorPage.java | 4 +- .../org/apache/catalina/deploy/FilterDef.java | 12 +- .../org/apache/catalina/deploy/FilterMap.java | 5 +- .../apache/catalina/deploy/FilterMaps.java | 1 + .../apache/catalina/deploy/LoginConfig.java | 4 +- .../catalina/deploy/SecurityCollection.java | 4 +- .../fileupload/DeferredFileOutputStream.java | 6 +- .../apache/catalina/fileupload/Multipart.java | 1 + .../catalina/fileupload/MultipartStream.java | 6 +- .../catalina/fileupload/PartHeaders.java | 9 +- .../apache/catalina/fileupload/PartItem.java | 29 +++- .../fileupload/RequestItemIterator.java | 1 + .../filters/CsrfPreventionFilter.java | 22 +-- .../apache/catalina/filters/FilterBase.java | 8 +- .../catalina/loader/StandardClassLoader.java | 29 +++- .../apache/catalina/logger/FileLogger.java | 6 +- .../apache/catalina/logger/LoggerBase.java | 26 ++-- .../apache/catalina/servlets/CGIServlet.java | 16 +- .../catalina/servlets/InvokerServlet.java | 12 +- .../catalina/servlets/WebdavServlet.java | 12 +- .../catalina/session/BaseSessionLocker.java | 6 +- .../session/CookiePersistentManager.java | 14 +- .../apache/catalina/session/FileStore.java | 15 +- .../apache/catalina/session/JDBCStore.java | 23 ++- .../apache/catalina/session/ManagerBase.java | 34 ++++- .../session/PersistentManagerBase.java | 17 ++- .../catalina/session/StandardManager.java | 29 +++- .../catalina/session/StandardSession.java | 46 ++++-- .../session/StandardSessionFacade.java | 1 + .../apache/catalina/session/StoreBase.java | 16 +- .../ssi/ByteArrayServletOutputStream.java | 1 + .../catalina/ssi/ResponseIncludeWrapper.java | 1 + .../org/apache/catalina/ssi/SSIConfig.java | 4 +- .../java/org/apache/catalina/ssi/SSIEcho.java | 4 +- .../java/org/apache/catalina/ssi/SSIExec.java | 6 +- .../org/apache/catalina/ssi/SSIFilter.java | 21 ++- .../org/apache/catalina/ssi/SSIFlastmod.java | 6 +- .../org/apache/catalina/ssi/SSIFsize.java | 4 +- .../org/apache/catalina/ssi/SSIInclude.java | 4 +- .../org/apache/catalina/ssi/SSIMediator.java | 6 +- .../org/apache/catalina/ssi/SSIPrintenv.java | 4 +- .../org/apache/catalina/ssi/SSIProcessor.java | 6 +- .../org/apache/catalina/ssi/SSIServlet.java | 7 +- .../ssi/SSIServletExternalResolver.java | 5 +- .../catalina/ssi/SSIServletRequestUtil.java | 4 +- .../java/org/apache/catalina/ssi/SSISet.java | 4 +- .../apache/catalina/startup/Bootstrap.java | 6 +- .../org/apache/catalina/startup/Catalina.java | 14 +- .../catalina/startup/CatalinaProperties.java | 4 +- .../catalina/startup/ClassLoaderFactory.java | 6 +- .../catalina/startup/ContextConfig.java | 50 +++++-- .../catalina/startup/ContextRuleSet.java | 4 +- .../startup/CopyParentClassLoaderRule.java | 4 +- .../catalina/startup/DigesterFactory.java | 14 +- .../org/apache/catalina/startup/Embedded.java | 34 +++-- .../apache/catalina/startup/EngineConfig.java | 12 +- .../apache/catalina/startup/ExpandWar.java | 13 +- .../apache/catalina/startup/HostConfig.java | 36 ++++- .../startup/SetAllPropertiesRule.java | 2 +- .../startup/SetContextPropertiesRule.java | 2 +- .../catalina/startup/SetDocBaseRule.java | 10 +- .../org/apache/catalina/startup/Tool.java | 4 +- .../apache/catalina/startup/UserConfig.java | 14 +- .../apache/catalina/startup/WebRuleSet.java | 4 +- .../org/apache/catalina/util/DOMWriter.java | 8 +- .../catalina/util/ExtensionValidator.java | 17 ++- .../org/apache/catalina/util/HexUtils.java | 4 +- .../org/apache/catalina/util/IOTools.java | 6 +- .../apache/catalina/util/InstanceSupport.java | 9 +- .../catalina/util/LifecycleSupport.java | 6 +- .../apache/catalina/util/ParameterMap.java | 8 +- .../catalina/util/ProcessEnvironment.java | 5 +- .../org/apache/catalina/util/RequestUtil.java | 3 +- .../apache/catalina/util/ResponseUtil.java | 1 + .../apache/catalina/util/SchemaResolver.java | 10 +- .../org/apache/catalina/util/URLEncoder.java | 4 +- .../catalina/valves/AccessLogValve.java | 10 +- .../catalina/valves/ErrorReportValve.java | 19 +-- .../valves/ExtendedAccessLogValve.java | 15 +- .../catalina/valves/JDBCAccessLogValve.java | 17 ++- .../catalina/valves/PersistentValve.java | 14 +- .../catalina/valves/RemoteAddrValve.java | 7 +- .../catalina/valves/RemoteHostValve.java | 7 +- .../catalina/valves/RequestDumperValve.java | 12 +- .../catalina/valves/RequestFilterValve.java | 17 ++- .../org/apache/catalina/valves/ValveBase.java | 30 +++- .../catalina/valves/WebdavFixValve.java | 7 +- .../tomcat/util/digester/CallMethodRule.java | 4 +- .../tomcat/util/digester/CallParamRule.java | 4 +- .../apache/tomcat/util/digester/Digester.java | 43 ++++-- .../util/digester/FactoryCreateRule.java | 4 +- .../tomcat/util/digester/GenericParser.java | 11 +- .../tomcat/util/digester/NodeCreateRule.java | 14 +- .../util/digester/ObjectCreateRule.java | 4 +- .../digester/ParserFeatureSetterFactory.java | 9 +- .../tomcat/util/digester/SetNextRule.java | 4 +- .../util/digester/SetPropertiesRule.java | 4 +- .../tomcat/util/digester/SetPropertyRule.java | 4 +- .../tomcat/util/digester/SetRootRule.java | 4 +- .../tomcat/util/digester/SetTopRule.java | 4 +- .../tomcat/util/digester/XercesParser.java | 15 +- .../glassfish/web/valve/GlassFishValve.java | 7 +- .../web/valve/GlassFishValveAdapter.java | 9 +- .../web/valve/TomcatValveAdapter.java | 7 +- .../catalina/core/StandardContextTest.java | 4 +- .../core/StandardContextValveTest.java | 2 +- .../org/glassfish/embeddable/web/Context.java | 6 +- .../embeddable/web/VirtualServer.java | 3 +- .../embeddable/web/WebContainer.java | 2 +- .../embeddable/web/WebListenerBase.java | 2 +- .../web/config/WebResourceCollection.java | 1 + .../sun/appserv/web/cache/CacheHelper.java | 1 + .../sun/appserv/web/cache/CacheManager.java | 15 +- .../appserv/web/cache/DefaultCacheHelper.java | 1 + .../web/cache/filter/CachingFilter.java | 10 +- .../filter/CachingOutputStreamWrapper.java | 1 + .../cache/filter/CachingResponseWrapper.java | 1 + .../web/cache/filter/HttpCacheEntry.java | 3 +- .../web/cache/mapping/ConstraintField.java | 4 +- .../sun/appserv/web/cache/mapping/Field.java | 1 + .../appserv/web/taglibs/cache/CacheTag.java | 1 + .../appserv/web/taglibs/cache/CacheUtil.java | 2 + .../appserv/web/taglibs/cache/FlushTag.java | 1 + .../security/web/GlassFishSingleSignOn.java | 23 ++- .../sun/enterprise/web/AdHocContextValve.java | 13 +- .../web/BasePersistenceStrategyBuilder.java | 14 +- .../com/sun/enterprise/web/CacheModule.java | 14 +- .../enterprise/web/EmbeddedWebContainer.java | 17 ++- .../enterprise/web/FileStrategyBuilder.java | 4 +- .../enterprise/web/MemoryStrategyBuilder.java | 7 +- .../sun/enterprise/web/PESessionLocker.java | 6 +- .../web/PEWebContainerFeatureFactoryImpl.java | 1 + .../PersistenceStrategyBuilderFactory.java | 7 +- .../sun/enterprise/web/ProxyHandlerImpl.java | 2 + .../enterprise/web/ServerConfigLookup.java | 27 ++-- .../SessionManagerConfigurationHelper.java | 9 +- .../com/sun/enterprise/web/VirtualServer.java | 34 ++++- .../enterprise/web/VirtualServerFacade.java | 7 +- .../enterprise/web/VirtualServerPipeline.java | 11 +- .../web/WebComponentInvocation.java | 6 +- .../com/sun/enterprise/web/WebConnector.java | 1 + .../com/sun/enterprise/web/WebDeployer.java | 18 ++- .../com/sun/enterprise/web/WebModule.java | 130 ++++++++--------- .../sun/enterprise/web/WebModuleConfig.java | 5 +- .../sun/enterprise/web/WebModuleListener.java | 13 +- .../com/sun/enterprise/web/WebPipeline.java | 6 +- .../CombinedAccessLogFormatterImpl.java | 7 +- .../web/connector/MapperListener.java | 18 ++- .../connector/extension/CatalinaListener.java | 6 +- .../connector/extension/GrizzlyConfig.java | 12 +- .../web/deploy/ContextEjbDecorator.java | 1 + .../deploy/ContextEnvironmentDecorator.java | 1 + .../web/deploy/ContextLocalEjbDecorator.java | 1 + .../web/deploy/ContextResourceDecorator.java | 1 + .../web/deploy/FilterDefDecorator.java | 3 +- .../web/deploy/LoginConfigDecorator.java | 1 + .../deploy/MessageDestinationDecorator.java | 1 + .../MessageDestinationRefDecorator.java | 1 + .../deploy/SecurityCollectionDecorator.java | 1 + .../web/jsp/JspProbeEmitterImpl.java | 1 + .../web/jsp/ResourceInjectorImpl.java | 8 +- .../web/logger/FileLoggerHandlerFactory.java | 5 +- .../sun/enterprise/web/logger/LoggerBase.java | 9 +- .../web/pwc/PwcWebContainerLifecycle.java | 2 + .../sun/enterprise/web/pwc/PwcWebModule.java | 6 +- .../connector/coyote/PwcCoyoteRequest.java | 12 +- .../web/reconfig/WebConfigListener.java | 23 ++- .../DecoratorForEEInstanceListener.java | 4 +- .../sun/web/server/EEInstanceListener.java | 60 ++++---- .../sun/web/server/WebContainerListener.java | 32 ++-- .../glassfish/web/LibrariesTldProvider.java | 11 +- .../java/org/glassfish/web/LogFacade.java | 5 +- .../org/glassfish/web/WebEntityResolver.java | 14 +- .../web/config/WebSslConfigHandler.java | 6 +- .../handlers/AbstractWebHandler.java | 1 + .../handlers/MultipartConfigHandler.java | 12 +- .../handlers/WebListenerHandler.java | 18 ++- .../handlers/WebServletHandler.java | 13 +- .../descriptor/AppListenerDescriptorImpl.java | 1 + .../AuthorizationConstraintImpl.java | 8 +- .../descriptor/CookieConfigDescriptor.java | 1 + .../descriptor/JspGroupDescriptor.java | 6 +- .../descriptor/LoginConfigurationImpl.java | 5 +- .../descriptor/MultipartConfigDescriptor.java | 1 + .../descriptor/OrderingDescriptor.java | 5 +- .../OrderingOrderingDescriptor.java | 3 +- .../descriptor/SecurityConstraintImpl.java | 3 +- .../descriptor/ServletFilterDescriptor.java | 3 +- .../ServletFilterMappingDescriptor.java | 4 +- .../descriptor/SessionConfigDescriptor.java | 8 +- .../descriptor/UserDataConstraintImpl.java | 1 + .../descriptor/WebBundleDescriptorImpl.java | 2 +- .../descriptor/WebFragmentDescriptor.java | 4 +- .../descriptor/WebResourceCollectionImpl.java | 3 +- .../deployment/node/AbsoluteOrderingNode.java | 5 +- .../deployment/node/AuthConstraintNode.java | 7 +- .../web/deployment/node/CookieConfigNode.java | 6 +- .../deployment/node/FilterMappingNode.java | 11 +- .../web/deployment/node/FilterNode.java | 7 +- .../web/deployment/node/ListenerNode.java | 7 +- .../node/LocaleEncodingMappingNode.java | 5 +- .../web/deployment/node/LoginConfigNode.java | 5 +- .../deployment/node/MultipartConfigNode.java | 5 +- .../web/deployment/node/OrderingNode.java | 1 + .../deployment/node/OrderingOrderingNode.java | 5 +- .../deployment/node/SessionConfigNode.java | 2 +- .../node/UserDataConstraintNode.java | 5 +- .../node/WebResourceCollectionNode.java | 9 +- .../node/runtime/gf/CacheMappingNode.java | 5 +- .../deployment/node/runtime/gf/CacheNode.java | 1 + .../node/runtime/gf/ClassLoaderNode.java | 1 + .../runtime/gf/IdempotentUrlPatternNode.java | 1 + .../node/runtime/gf/JspConfigRuntimeNode.java | 1 + .../runtime/gf/LocaleCharsetInfoNode.java | 1 + .../node/runtime/gf/LocaleCharsetMapNode.java | 2 +- .../runtime/gf/ManagerPropertiesNode.java | 1 + .../node/runtime/gf/ServletNode.java | 1 + .../node/runtime/gf/SessionConfigNode.java | 1 + .../node/runtime/gf/SessionManagerNode.java | 1 + .../runtime/gf/SessionPropertiesNode.java | 1 + .../node/runtime/gf/StorePropertiesNode.java | 1 + .../deployment/node/runtime/gf/ValveNode.java | 1 + .../runtime/gf/WebPropertyContainerNode.java | 1 + .../org/glassfish/web/jsp/JSPCompiler.java | 10 +- .../web/upgrade/WebConfigurationUpgrade.java | 6 +- .../glassfish/web/ha/HACNonceCacheImpl.java | 16 +- .../java/org/glassfish/web/ha/HAUtilImpl.java | 9 +- .../ha/HAWebContainerFeatureFactoryImpl.java | 9 +- .../java/org/glassfish/web/ha/LogFacade.java | 5 +- .../web/ha/authenticator/HASSOFactory.java | 11 +- .../web/ha/authenticator/HASingleSignOn.java | 8 +- .../ha/authenticator/HASingleSignOnEntry.java | 21 ++- .../HASingleSignOnEntryMetadata.java | 2 +- .../ha/session/management/BaseHASession.java | 4 +- .../session/management/CompositeMetadata.java | 15 +- .../management/HASessionStoreValve.java | 10 +- .../ha/session/management/HAStoreBase.java | 12 +- .../ModifiedAttributeHASession.java | 12 +- .../management/ReplicationAttributeStore.java | 19 ++- .../management/ReplicationManagerBase.java | 10 +- .../session/management/ReplicationStore.java | 15 +- .../ReplicationWebEventPersistentManager.java | 18 +-- ...icatedWebMethodSessionStrategyBuilder.java | 27 ++-- .../org/apache/naming/ContextBindings.java | 3 +- .../main/java/org/apache/naming/EjbRef.java | 2 +- .../java/org/apache/naming/LogFacade.java | 5 +- .../org/apache/naming/NameParserImpl.java | 4 +- .../java/org/apache/naming/NamingContext.java | 20 ++- .../NamingContextBindingsEnumeration.java | 2 +- .../naming/NamingContextEnumeration.java | 4 +- .../java/org/apache/naming/NamingService.java | 13 +- .../org/apache/naming/ResourceEnvRef.java | 2 +- .../org/apache/naming/ResourceLinkRef.java | 2 +- .../java/org/apache/naming/ResourceRef.java | 2 +- .../src/main/java/org/apache/naming/Util.java | 1 + .../apache/naming/factory/BeanFactory.java | 18 +-- .../org/apache/naming/factory/EjbFactory.java | 6 +- .../naming/factory/MailSessionFactory.java | 6 +- .../apache/naming/factory/OpenEjbFactory.java | 9 +- .../naming/factory/ResourceEnvFactory.java | 6 +- .../naming/factory/ResourceFactory.java | 6 +- .../naming/factory/ResourceLinkFactory.java | 6 +- .../naming/factory/SendMailFactory.java | 16 +- .../naming/factory/TransactionFactory.java | 6 +- .../naming/java/javaURLContextFactory.java | 10 +- .../naming/resources/BaseDirContext.java | 3 +- .../resources/DirContextURLConnection.java | 10 +- .../resources/DirContextURLStreamHandler.java | 3 +- .../DirContextURLStreamHandlerService.java | 12 +- .../RecyclableNamingEnumeration.java | 5 +- .../org/apache/naming/resources/Resource.java | 2 +- .../naming/resources/ResourceCache.java | 2 +- .../naming/resources/WARDirContext.java | 30 ++-- .../naming/resources/WebNamingStartup.java | 2 +- .../glassfish/sse/api/ServerSentEvent.java | 6 +- .../sse/api/ServerSentEventConnection.java | 1 + .../sse/api/ServerSentEventContext.java | 4 +- .../sse/impl/ServerSentEventApplication.java | 5 +- .../sse/impl/ServerSentEventCdiExtension.java | 26 ++-- .../impl/ServerSentEventConnectionImpl.java | 8 +- .../ServerSentEventHandlerContextImpl.java | 4 +- .../sse/impl/ServerSentEventServlet.java | 5 +- ...rSentEventServletContainerInitializer.java | 9 +- .../glassfish/cdi/hk2/CDIContextBridge.java | 4 +- .../glassfish/cdi/hk2/CDIHK2Descriptor.java | 14 +- .../java/org/glassfish/cdi/hk2/CDIScope.java | 10 +- .../org/glassfish/cdi/hk2/HK2CDIBean.java | 12 +- .../glassfish/cdi/hk2/HK2ContextBridge.java | 8 +- .../cdi/hk2/HK2IntegrationExtension.java | 18 +-- .../transaction/TransactionScopedBean.java | 14 +- .../transaction/TransactionScopedCDIUtil.java | 22 +-- .../TransactionalInterceptorBase.java | 24 +-- .../TransactionalInterceptorMandatory.java | 12 +- .../TransactionalInterceptorNever.java | 12 +- .../TransactionalInterceptorNotSupported.java | 12 +- .../TransactionalInterceptorRequired.java | 14 +- .../TransactionalInterceptorRequiresNew.java | 14 +- .../TransactionalInterceptorSupports.java | 12 +- .../glassfish/weld/GlassFishWeldProvider.java | 6 +- .../weld/RootBeanDeploymentArchive.java | 4 +- .../weld/WebComponentInjectionManager.java | 16 +- .../glassfish/weld/WeldContextListener.java | 14 +- .../weld/jsf/WeldFacesConfigProvider.java | 16 +- .../services/CDIAroundConstructCallback.java | 12 +- .../services/NonModuleInjectionServices.java | 10 +- .../weld/services/ProxyServicesImpl.java | 4 +- .../weld/services/SecurityServicesImpl.java | 4 +- ...BeanSpecExampleOfRollbackDontRollback.java | 1 + .../transaction/MyInitialContextFactory.java | 3 +- .../cdi/transaction/Transaction.java | 7 +- .../cdi/transaction/TransactionManager.java | 7 +- .../TransactionScopedBeanTest.java | 6 +- ...TransactionScopedContextExtensionTest.java | 6 +- .../TransactionalAnnotationTest.java | 10 +- .../weld/RootBeanDeploymentArchiveTest.java | 16 +- .../weld/WeldContextListenerTest.java | 26 ++-- 451 files changed, 3155 insertions(+), 2074 deletions(-) diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/LogFacade.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/LogFacade.java index 0447d2acf0b..b1dc116c755 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/LogFacade.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/LogFacade.java @@ -16,10 +16,11 @@ package org.glassfish.web.admin; +import java.util.logging.Logger; + import org.glassfish.logging.annotation.LogMessageInfo; -import org.glassfish.logging.annotation.LoggerInfo; import org.glassfish.logging.annotation.LogMessagesResourceBundle; -import java.util.logging.Logger; +import org.glassfish.logging.annotation.LoggerInfo; /** * Provides the logging facilities. diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateHttp.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateHttp.java index f2c39efba70..485aa67a7d8 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateHttp.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateHttp.java @@ -16,34 +16,42 @@ package org.glassfish.web.admin.cli; -import org.glassfish.internal.api.Target; import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.grizzly.config.dom.FileCache; -import org.glassfish.grizzly.config.dom.Http; -import org.glassfish.grizzly.config.dom.Protocol; -import org.glassfish.grizzly.config.dom.Protocols; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import java.text.MessageFormat; +import java.util.ResourceBundle; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; +import org.glassfish.grizzly.config.dom.FileCache; +import org.glassfish.grizzly.config.dom.Http; +import org.glassfish.grizzly.config.dom.Protocol; +import org.glassfish.grizzly.config.dom.Protocols; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Target; import org.glassfish.web.admin.LogFacade; -import jakarta.inject.Inject; -import jakarta.inject.Named; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import java.text.MessageFormat; -import java.util.ResourceBundle; - /** * Command to create http element within a protocol element * diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateHttpListener.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateHttpListener.java index ef68c867dfa..d14fde42be9 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateHttpListener.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateHttpListener.java @@ -16,19 +16,22 @@ package org.glassfish.web.admin.cli; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.HttpService; +import com.sun.enterprise.config.serverbeans.VirtualServer; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.beans.PropertyVetoException; import java.text.MessageFormat; import java.util.List; import java.util.ResourceBundle; import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.inject.Inject; -import jakarta.inject.Named; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.HttpService; -import com.sun.enterprise.config.serverbeans.VirtualServer; -import com.sun.enterprise.util.SystemPropertyConstants; + import org.glassfish.api.ActionReport; import org.glassfish.api.ActionReport.ExitCode; import org.glassfish.api.I18n; @@ -46,9 +49,9 @@ import org.glassfish.grizzly.config.dom.NetworkListeners; import org.glassfish.grizzly.config.dom.ThreadPool; import org.glassfish.grizzly.config.dom.Transport; -import org.glassfish.internal.api.Target; -import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Target; import org.glassfish.web.admin.LogFacade; import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigSupport; diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateHttpRedirect.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateHttpRedirect.java index 126db99a113..1687382ca7b 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateHttpRedirect.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateHttpRedirect.java @@ -21,30 +21,37 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.grizzly.config.dom.HttpRedirect; -import org.glassfish.grizzly.config.dom.Protocol; -import org.glassfish.grizzly.config.dom.Protocols; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import java.text.MessageFormat; +import java.util.ResourceBundle; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; +import org.glassfish.grizzly.config.dom.HttpRedirect; +import org.glassfish.grizzly.config.dom.Protocol; +import org.glassfish.grizzly.config.dom.Protocols; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.api.Target; import org.glassfish.web.admin.LogFacade; -import jakarta.inject.Inject; -import jakarta.inject.Named; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import java.text.MessageFormat; -import java.util.ResourceBundle; - /** *

      diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateNetworkListener.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateNetworkListener.java index 0173f2b31a7..cda4c21a30b 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateNetworkListener.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateNetworkListener.java @@ -16,20 +16,19 @@ package org.glassfish.web.admin.cli; -import java.beans.PropertyVetoException; -import java.text.MessageFormat; -import java.util.List; -import java.util.ResourceBundle; import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.VirtualServer; import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.grizzly.config.dom.Http; -import org.glassfish.grizzly.config.dom.NetworkConfig; -import org.glassfish.grizzly.config.dom.NetworkListener; -import org.glassfish.grizzly.config.dom.NetworkListeners; -import org.glassfish.grizzly.config.dom.Protocol; -import org.glassfish.grizzly.config.dom.ProtocolFinder; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import java.beans.PropertyVetoException; +import java.text.MessageFormat; +import java.util.List; +import java.util.ResourceBundle; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -40,14 +39,17 @@ import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; +import org.glassfish.grizzly.config.dom.Http; +import org.glassfish.grizzly.config.dom.NetworkConfig; +import org.glassfish.grizzly.config.dom.NetworkListener; +import org.glassfish.grizzly.config.dom.NetworkListeners; +import org.glassfish.grizzly.config.dom.Protocol; +import org.glassfish.grizzly.config.dom.ProtocolFinder; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.api.Target; import org.glassfish.web.admin.LogFacade; -import jakarta.inject.Inject; -import jakarta.inject.Named; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.ConfigCode; import org.jvnet.hk2.config.ConfigSupport; diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateProtocol.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateProtocol.java index b0fd99a2b19..35e9a962c11 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateProtocol.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateProtocol.java @@ -19,9 +19,13 @@ import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.grizzly.config.dom.NetworkConfig; -import org.glassfish.grizzly.config.dom.Protocol; -import org.glassfish.grizzly.config.dom.Protocols; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import java.text.MessageFormat; +import java.util.ResourceBundle; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -32,21 +36,18 @@ import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; +import org.glassfish.grizzly.config.dom.NetworkConfig; +import org.glassfish.grizzly.config.dom.Protocol; +import org.glassfish.grizzly.config.dom.Protocols; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.api.Target; import org.glassfish.web.admin.LogFacade; -import jakarta.inject.Inject; -import jakarta.inject.Named; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import java.text.MessageFormat; -import java.util.ResourceBundle; - /** * Command to create protocol element within network-config * diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateProtocolFilter.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateProtocolFilter.java index c6b7aaa5b6d..df7a0a4d88e 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateProtocolFilter.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateProtocolFilter.java @@ -16,33 +16,41 @@ package org.glassfish.web.admin.cli; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.beans.PropertyVetoException; import java.text.MessageFormat; import java.util.List; import java.util.ResourceBundle; -import org.glassfish.internal.api.Target; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.grizzly.config.dom.Protocol; -import org.glassfish.grizzly.config.dom.ProtocolChain; -import org.glassfish.grizzly.config.dom.ProtocolChainInstanceHandler; -import org.glassfish.grizzly.config.dom.ProtocolFilter; -import org.glassfish.grizzly.config.dom.Protocols; import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; +import org.glassfish.grizzly.config.dom.Protocol; +import org.glassfish.grizzly.config.dom.ProtocolChain; +import org.glassfish.grizzly.config.dom.ProtocolChainInstanceHandler; +import org.glassfish.grizzly.config.dom.ProtocolFilter; +import org.glassfish.grizzly.config.dom.Protocols; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Target; import org.glassfish.web.admin.LogFacade; -import jakarta.inject.Inject; -import jakarta.inject.Named; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateProtocolFinder.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateProtocolFinder.java index 2683a76317a..f02907cd24c 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateProtocolFinder.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateProtocolFinder.java @@ -16,32 +16,40 @@ package org.glassfish.web.admin.cli; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.beans.PropertyVetoException; import java.text.MessageFormat; import java.util.List; import java.util.ResourceBundle; -import org.glassfish.internal.api.Target; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.grizzly.config.dom.PortUnification; -import org.glassfish.grizzly.config.dom.Protocol; -import org.glassfish.grizzly.config.dom.ProtocolFinder; -import org.glassfish.grizzly.config.dom.Protocols; import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; +import org.glassfish.grizzly.config.dom.PortUnification; +import org.glassfish.grizzly.config.dom.Protocol; +import org.glassfish.grizzly.config.dom.ProtocolFinder; +import org.glassfish.grizzly.config.dom.Protocols; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Target; import org.glassfish.web.admin.LogFacade; -import jakarta.inject.Inject; -import jakarta.inject.Named; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateTransport.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateTransport.java index eb0e8bdbc4f..856ef7cac58 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateTransport.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateTransport.java @@ -16,30 +16,35 @@ package org.glassfish.web.admin.cli; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.beans.PropertyVetoException; import java.text.MessageFormat; import java.util.ResourceBundle; -import org.glassfish.internal.api.Target; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.grizzly.config.dom.NetworkConfig; -import org.glassfish.grizzly.config.dom.Transport; -import org.glassfish.grizzly.config.dom.Transports; import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; +import org.glassfish.grizzly.config.dom.NetworkConfig; +import org.glassfish.grizzly.config.dom.Transport; +import org.glassfish.grizzly.config.dom.Transports; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Target; import org.glassfish.web.admin.LogFacade; -import jakarta.inject.Inject; -import jakarta.inject.Named; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateVirtualServer.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateVirtualServer.java index ec1410a3a4f..fa208ac7e88 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateVirtualServer.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateVirtualServer.java @@ -16,19 +16,21 @@ package org.glassfish.web.admin.cli; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.HttpService; +import com.sun.enterprise.config.serverbeans.VirtualServer; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.beans.PropertyVetoException; import java.text.MessageFormat; import java.util.Map; import java.util.Properties; import java.util.ResourceBundle; -import org.glassfish.api.admin.config.ModelBinding; -import org.glassfish.internal.api.Target; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.HttpService; -import com.sun.enterprise.config.serverbeans.VirtualServer; -import com.sun.enterprise.util.SystemPropertyConstants; import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -37,15 +39,14 @@ import org.glassfish.api.admin.ExecuteOn; import org.glassfish.api.admin.RuntimeType; import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.config.support.TargetType; +import org.glassfish.api.admin.config.ModelBinding; import org.glassfish.config.support.CommandTarget; +import org.glassfish.config.support.TargetType; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Target; import org.glassfish.web.admin.LogFacade; -import jakarta.inject.Inject; -import jakarta.inject.Named; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteHttp.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteHttp.java index d07775c2307..6cdd93331a8 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteHttp.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteHttp.java @@ -16,31 +16,38 @@ package org.glassfish.web.admin.cli; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.text.MessageFormat; import java.util.List; import java.util.ResourceBundle; -import org.glassfish.internal.api.Target; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.grizzly.config.dom.NetworkConfig; -import org.glassfish.grizzly.config.dom.NetworkListener; -import org.glassfish.grizzly.config.dom.Protocol; -import org.glassfish.grizzly.config.dom.Protocols; import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; +import org.glassfish.grizzly.config.dom.NetworkConfig; +import org.glassfish.grizzly.config.dom.NetworkListener; +import org.glassfish.grizzly.config.dom.Protocol; +import org.glassfish.grizzly.config.dom.Protocols; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Target; import org.glassfish.web.admin.LogFacade; -import jakarta.inject.Inject; -import jakarta.inject.Named; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteHttpListener.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteHttpListener.java index 335742a9a2f..da4e8e92c3b 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteHttpListener.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteHttpListener.java @@ -16,6 +16,14 @@ package org.glassfish.web.admin.cli; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.VirtualServer; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.beans.PropertyVetoException; import java.text.MessageFormat; import java.util.ArrayList; @@ -23,16 +31,6 @@ import java.util.ResourceBundle; import java.util.regex.Pattern; -import org.glassfish.internal.api.Target; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.VirtualServer; -import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.grizzly.config.dom.NetworkConfig; -import org.glassfish.grizzly.config.dom.NetworkListener; -import org.glassfish.grizzly.config.dom.NetworkListeners; -import org.glassfish.grizzly.config.dom.Protocol; -import org.glassfish.grizzly.config.dom.Protocols; import org.glassfish.api.ActionReport; import org.glassfish.api.ActionReport.ExitCode; import org.glassfish.api.I18n; @@ -44,13 +42,16 @@ import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; +import org.glassfish.grizzly.config.dom.NetworkConfig; +import org.glassfish.grizzly.config.dom.NetworkListener; +import org.glassfish.grizzly.config.dom.NetworkListeners; +import org.glassfish.grizzly.config.dom.Protocol; +import org.glassfish.grizzly.config.dom.Protocols; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Target; import org.glassfish.web.admin.LogFacade; -import jakarta.inject.Inject; -import jakarta.inject.Named; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteHttpRedirect.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteHttpRedirect.java index 9ea607baad4..4be9d2747a6 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteHttpRedirect.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteHttpRedirect.java @@ -21,32 +21,38 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.grizzly.config.dom.NetworkConfig; -import org.glassfish.grizzly.config.dom.NetworkListener; -import org.glassfish.grizzly.config.dom.Protocol; -import org.glassfish.grizzly.config.dom.Protocols; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import java.text.MessageFormat; +import java.util.List; +import java.util.ResourceBundle; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; +import org.glassfish.grizzly.config.dom.NetworkConfig; +import org.glassfish.grizzly.config.dom.NetworkListener; +import org.glassfish.grizzly.config.dom.Protocol; +import org.glassfish.grizzly.config.dom.Protocols; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.api.Target; import org.glassfish.web.admin.LogFacade; -import jakarta.inject.Inject; -import jakarta.inject.Named; import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import java.text.MessageFormat; -import java.util.List; -import java.util.ResourceBundle; - -import org.glassfish.api.admin.*; - /** * Command to delete <http-redirect> elements within a specific * protocol. diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteNetworkListener.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteNetworkListener.java index 695b9cf1fce..695a7b88980 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteNetworkListener.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteNetworkListener.java @@ -16,18 +16,18 @@ package org.glassfish.web.admin.cli; -import java.beans.PropertyVetoException; -import java.text.MessageFormat; -import java.util.ResourceBundle; - -import org.glassfish.grizzly.config.dom.Protocol; -import org.glassfish.internal.api.Target; import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.VirtualServer; import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.grizzly.config.dom.NetworkListener; -import org.glassfish.grizzly.config.dom.NetworkListeners; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import java.beans.PropertyVetoException; +import java.text.MessageFormat; +import java.util.ResourceBundle; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -38,13 +38,14 @@ import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; +import org.glassfish.grizzly.config.dom.NetworkListener; +import org.glassfish.grizzly.config.dom.NetworkListeners; +import org.glassfish.grizzly.config.dom.Protocol; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Target; import org.glassfish.web.admin.LogFacade; -import jakarta.inject.Inject; -import jakarta.inject.Named; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.ConfigCode; import org.jvnet.hk2.config.ConfigSupport; diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteProtocol.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteProtocol.java index 6a91cd79b12..3ed5b1e54e1 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteProtocol.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteProtocol.java @@ -16,18 +16,17 @@ package org.glassfish.web.admin.cli; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.text.MessageFormat; import java.util.List; import java.util.ResourceBundle; -import org.glassfish.internal.api.Target; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.grizzly.config.dom.NetworkConfig; -import org.glassfish.grizzly.config.dom.NetworkListener; -import org.glassfish.grizzly.config.dom.Protocol; -import org.glassfish.grizzly.config.dom.Protocols; import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -37,13 +36,15 @@ import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; +import org.glassfish.grizzly.config.dom.NetworkConfig; +import org.glassfish.grizzly.config.dom.NetworkListener; +import org.glassfish.grizzly.config.dom.Protocol; +import org.glassfish.grizzly.config.dom.Protocols; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Target; import org.glassfish.web.admin.LogFacade; -import jakarta.inject.Inject; -import jakarta.inject.Named; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteProtocolFilter.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteProtocolFilter.java index 6b65bb6eeff..ecace0055c2 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteProtocolFilter.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteProtocolFilter.java @@ -16,34 +16,41 @@ package org.glassfish.web.admin.cli; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.beans.PropertyVetoException; import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; import java.util.ResourceBundle; -import org.glassfish.internal.api.Target; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.grizzly.config.dom.Protocol; -import org.glassfish.grizzly.config.dom.ProtocolChain; -import org.glassfish.grizzly.config.dom.ProtocolChainInstanceHandler; -import org.glassfish.grizzly.config.dom.ProtocolFilter; -import org.glassfish.grizzly.config.dom.Protocols; import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; +import org.glassfish.grizzly.config.dom.Protocol; +import org.glassfish.grizzly.config.dom.ProtocolChain; +import org.glassfish.grizzly.config.dom.ProtocolChainInstanceHandler; +import org.glassfish.grizzly.config.dom.ProtocolFilter; +import org.glassfish.grizzly.config.dom.Protocols; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Target; import org.glassfish.web.admin.LogFacade; -import jakarta.inject.Inject; -import jakarta.inject.Named; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteProtocolFinder.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteProtocolFinder.java index 842a37f6120..a22320d72ce 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteProtocolFinder.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteProtocolFinder.java @@ -16,32 +16,39 @@ package org.glassfish.web.admin.cli; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; import java.util.ResourceBundle; -import org.glassfish.internal.api.Target; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.grizzly.config.dom.PortUnification; -import org.glassfish.grizzly.config.dom.Protocol; -import org.glassfish.grizzly.config.dom.ProtocolFinder; -import org.glassfish.grizzly.config.dom.Protocols; import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; +import org.glassfish.grizzly.config.dom.PortUnification; +import org.glassfish.grizzly.config.dom.Protocol; +import org.glassfish.grizzly.config.dom.ProtocolFinder; +import org.glassfish.grizzly.config.dom.Protocols; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Target; import org.glassfish.web.admin.LogFacade; -import jakarta.inject.Inject; -import jakarta.inject.Named; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.ConfigCode; import org.jvnet.hk2.config.ConfigSupport; diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteTransport.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteTransport.java index f381a250c92..6bd6ae81504 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteTransport.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteTransport.java @@ -16,18 +16,17 @@ package org.glassfish.web.admin.cli; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import java.text.MessageFormat; import java.util.List; import java.util.ResourceBundle; -import org.glassfish.internal.api.Target; -import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.grizzly.config.dom.NetworkConfig; -import org.glassfish.grizzly.config.dom.NetworkListener; -import org.glassfish.grizzly.config.dom.Transport; -import org.glassfish.grizzly.config.dom.Transports; import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -37,13 +36,15 @@ import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; +import org.glassfish.grizzly.config.dom.NetworkConfig; +import org.glassfish.grizzly.config.dom.NetworkListener; +import org.glassfish.grizzly.config.dom.Transport; +import org.glassfish.grizzly.config.dom.Transports; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Target; import org.glassfish.web.admin.LogFacade; -import jakarta.inject.Inject; -import jakarta.inject.Named; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteVirtualServer.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteVirtualServer.java index 55256df8460..48ef2f197ac 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteVirtualServer.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/DeleteVirtualServer.java @@ -16,14 +16,6 @@ package org.glassfish.web.admin.cli; -import java.beans.PropertyVetoException; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.List; -import java.util.ResourceBundle; -import java.util.StringTokenizer; - -import org.glassfish.internal.api.Target; import com.sun.enterprise.config.serverbeans.ApplicationRef; import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; @@ -31,8 +23,17 @@ import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.config.serverbeans.VirtualServer; import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.grizzly.config.dom.NetworkConfig; -import org.glassfish.grizzly.config.dom.NetworkListener; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import java.beans.PropertyVetoException; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.List; +import java.util.ResourceBundle; +import java.util.StringTokenizer; + import org.glassfish.api.ActionReport; import org.glassfish.api.ActionReport.ExitCode; import org.glassfish.api.I18n; @@ -44,13 +45,13 @@ import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; +import org.glassfish.grizzly.config.dom.NetworkConfig; +import org.glassfish.grizzly.config.dom.NetworkListener; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Target; import org.glassfish.web.admin.LogFacade; -import jakarta.inject.Inject; -import jakarta.inject.Named; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.ConfigCode; import org.jvnet.hk2.config.ConfigSupport; diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListHttpListeners.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListHttpListeners.java index 91aed0fe3b8..6665a3a8c92 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListHttpListeners.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListHttpListeners.java @@ -16,26 +16,34 @@ package org.glassfish.web.admin.cli; -import java.util.List; - import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.HttpService; import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.grizzly.config.dom.NetworkListener; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import java.util.List; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; +import org.glassfish.grizzly.config.dom.NetworkListener; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.api.Target; -import jakarta.inject.Inject; -import jakarta.inject.Named; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.hk2.api.PerLookup; /** * List http listeners command diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListNetworkListeners.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListNetworkListeners.java index 2b5fc70e58f..bb9957f54db 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListNetworkListeners.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListNetworkListeners.java @@ -16,26 +16,34 @@ package org.glassfish.web.admin.cli; -import java.util.List; - import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.HttpService; import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.grizzly.config.dom.NetworkListener; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import java.util.List; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; +import org.glassfish.grizzly.config.dom.NetworkListener; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.api.Target; -import jakarta.inject.Inject; -import jakarta.inject.Named; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.hk2.api.PerLookup; /** * List network listeners command diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListProtocolFilters.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListProtocolFilters.java index 23d2107b9fb..5ae2aaf8dd6 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListProtocolFilters.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListProtocolFilters.java @@ -16,26 +16,33 @@ package org.glassfish.web.admin.cli; -import org.glassfish.internal.api.Target; import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.HttpService; import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.grizzly.config.dom.Protocol; -import org.glassfish.grizzly.config.dom.ProtocolChain; -import org.glassfish.grizzly.config.dom.ProtocolFilter; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; -import jakarta.inject.Inject; -import jakarta.inject.Named; - -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.grizzly.config.dom.Protocol; +import org.glassfish.grizzly.config.dom.ProtocolChain; +import org.glassfish.grizzly.config.dom.ProtocolFilter; import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Target; +import org.jvnet.hk2.annotations.Service; /** * List protocol filters command diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListProtocolFinders.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListProtocolFinders.java index 0dc508b0062..4d174531185 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListProtocolFinders.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListProtocolFinders.java @@ -16,26 +16,33 @@ package org.glassfish.web.admin.cli; -import org.glassfish.internal.api.Target; import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.HttpService; import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.grizzly.config.dom.PortUnification; -import org.glassfish.grizzly.config.dom.Protocol; -import org.glassfish.grizzly.config.dom.ProtocolFinder; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; -import jakarta.inject.Inject; -import jakarta.inject.Named; - -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.grizzly.config.dom.PortUnification; +import org.glassfish.grizzly.config.dom.Protocol; +import org.glassfish.grizzly.config.dom.ProtocolFinder; import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Target; +import org.jvnet.hk2.annotations.Service; /** * List protocol finders command diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListProtocols.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListProtocols.java index 9d06dad0fe1..9b1ead270e3 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListProtocols.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListProtocols.java @@ -16,26 +16,34 @@ package org.glassfish.web.admin.cli; -import java.util.List; - import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.HttpService; import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.grizzly.config.dom.Protocol; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import java.util.List; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; +import org.glassfish.grizzly.config.dom.Protocol; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.api.Target; -import jakarta.inject.Inject; -import jakarta.inject.Named; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.hk2.api.PerLookup; /** * List protocols command diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListTransports.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListTransports.java index 25eb0f08507..c9ffce25f10 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListTransports.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListTransports.java @@ -16,25 +16,33 @@ package org.glassfish.web.admin.cli; -import java.util.List; - -import org.glassfish.internal.api.Target; import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.grizzly.config.dom.Transport; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import java.util.List; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; -import jakarta.inject.Inject; -import jakarta.inject.Named; - -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.grizzly.config.dom.Transport; import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Target; +import org.jvnet.hk2.annotations.Service; /** * List transports command diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListVirtualServers.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListVirtualServers.java index 481749c928f..e4d4eb0189d 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListVirtualServers.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/ListVirtualServers.java @@ -16,27 +16,35 @@ package org.glassfish.web.admin.cli; -import java.util.List; - import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.HttpService; import com.sun.enterprise.config.serverbeans.VirtualServer; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import java.util.List; + import org.glassfish.api.ActionReport; import org.glassfish.api.ActionReport.MessagePart; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.api.Target; -import jakarta.inject.Inject; -import jakarta.inject.Named; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.hk2.api.PerLookup; /** * List virtual server command diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProvider.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProvider.java index 9e299a2b2a3..92a7bdfac83 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProvider.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProvider.java @@ -16,11 +16,15 @@ package org.glassfish.web.admin.monitor; +import com.sun.enterprise.util.StringUtils; + import java.util.List; +import java.util.concurrent.atomic.AtomicLong; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.concurrent.atomic.AtomicLong; -import com.sun.enterprise.util.StringUtils; + +import org.glassfish.external.probe.provider.annotations.ProbeListener; +import org.glassfish.external.probe.provider.annotations.ProbeParam; import org.glassfish.external.statistics.CountStatistic; import org.glassfish.external.statistics.StringStatistic; import org.glassfish.external.statistics.annotations.Reset; @@ -28,9 +32,8 @@ import org.glassfish.external.statistics.impl.StatisticImpl; import org.glassfish.external.statistics.impl.StringStatisticImpl; import org.glassfish.external.statistics.impl.TimeStatisticImpl; -import org.glassfish.external.probe.provider.annotations.*; -import org.glassfish.gmbal.Description; import org.glassfish.gmbal.AMXMetadata; +import org.glassfish.gmbal.Description; import org.glassfish.gmbal.ManagedAttribute; import org.glassfish.gmbal.ManagedObject; import org.glassfish.grizzly.config.dom.NetworkConfig; diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProviderBootstrap.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProviderBootstrap.java index a117fb8ca87..f23ee0cb9e5 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProviderBootstrap.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProviderBootstrap.java @@ -20,22 +20,24 @@ */ package org.glassfish.web.admin.monitor; -import java.util.ResourceBundle; -import java.util.logging.Level; -import java.util.logging.Logger; import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.HttpService; import com.sun.enterprise.config.serverbeans.VirtualServer; + +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Singleton; + +import java.util.ResourceBundle; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.external.probe.provider.PluginPoint; import org.glassfish.external.probe.provider.StatsProviderManager; +import org.glassfish.hk2.api.PostConstruct; import org.glassfish.web.admin.LogFacade; -import jakarta.inject.Inject; -import jakarta.inject.Named; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PostConstruct; -import jakarta.inject.Singleton; import org.jvnet.hk2.config.ConfigurationException; /** diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/JspStatsProvider.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/JspStatsProvider.java index 10ac00d8348..cebce14be53 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/JspStatsProvider.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/JspStatsProvider.java @@ -16,12 +16,13 @@ package org.glassfish.web.admin.monitor; +import org.glassfish.external.probe.provider.annotations.ProbeListener; +import org.glassfish.external.probe.provider.annotations.ProbeParam; import org.glassfish.external.statistics.CountStatistic; import org.glassfish.external.statistics.RangeStatistic; import org.glassfish.external.statistics.impl.CountStatisticImpl; import org.glassfish.external.statistics.impl.RangeStatisticImpl; import org.glassfish.external.statistics.impl.StatisticImpl; -import org.glassfish.external.probe.provider.annotations.*; import org.glassfish.gmbal.AMXMetadata; import org.glassfish.gmbal.Description; import org.glassfish.gmbal.ManagedAttribute; diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/RequestProbeProvider.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/RequestProbeProvider.java index 49bba740dd2..a92a3e038df 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/RequestProbeProvider.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/RequestProbeProvider.java @@ -16,7 +16,9 @@ package org.glassfish.web.admin.monitor; -import org.glassfish.external.probe.provider.annotations.*; +import org.glassfish.external.probe.provider.annotations.Probe; +import org.glassfish.external.probe.provider.annotations.ProbeParam; +import org.glassfish.external.probe.provider.annotations.ProbeProvider; /** * Provider interface for HTTP request/response related probes. diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/RequestStatsProvider.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/RequestStatsProvider.java index 28cc8d18c43..11c8266be44 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/RequestStatsProvider.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/RequestStatsProvider.java @@ -18,16 +18,18 @@ import java.util.logging.Level; import java.util.logging.Logger; + +import org.glassfish.external.probe.provider.annotations.ProbeListener; +import org.glassfish.external.probe.provider.annotations.ProbeParam; import org.glassfish.external.statistics.CountStatistic; import org.glassfish.external.statistics.annotations.Reset; import org.glassfish.external.statistics.impl.CountStatisticImpl; import org.glassfish.external.statistics.impl.StatisticImpl; import org.glassfish.external.statistics.impl.TimeStatisticImpl; -import org.glassfish.external.probe.provider.annotations.*; import org.glassfish.gmbal.AMXMetadata; import org.glassfish.gmbal.Description; -import org.glassfish.gmbal.ManagedObject; import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedObject; import org.glassfish.web.admin.LogFacade; /** diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/ServletInstanceStatsProvider.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/ServletInstanceStatsProvider.java index f49589fbfda..7aca58b3ef4 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/ServletInstanceStatsProvider.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/ServletInstanceStatsProvider.java @@ -18,12 +18,14 @@ import java.util.logging.Level; import java.util.logging.Logger; + +import org.glassfish.external.probe.provider.annotations.ProbeListener; +import org.glassfish.external.probe.provider.annotations.ProbeParam; import org.glassfish.external.statistics.CountStatistic; import org.glassfish.external.statistics.annotations.Reset; import org.glassfish.external.statistics.impl.CountStatisticImpl; import org.glassfish.external.statistics.impl.StatisticImpl; import org.glassfish.external.statistics.impl.TimeStatisticImpl; -import org.glassfish.external.probe.provider.annotations.*; import org.glassfish.gmbal.AMXMetadata; import org.glassfish.gmbal.Description; import org.glassfish.gmbal.ManagedAttribute; diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/ServletStatsProvider.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/ServletStatsProvider.java index fba584e3ed1..ae5b4410dc1 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/ServletStatsProvider.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/ServletStatsProvider.java @@ -18,12 +18,14 @@ import java.util.logging.Level; import java.util.logging.Logger; + +import org.glassfish.external.probe.provider.annotations.ProbeListener; +import org.glassfish.external.probe.provider.annotations.ProbeParam; import org.glassfish.external.statistics.CountStatistic; import org.glassfish.external.statistics.RangeStatistic; import org.glassfish.external.statistics.impl.CountStatisticImpl; import org.glassfish.external.statistics.impl.RangeStatisticImpl; import org.glassfish.external.statistics.impl.StatisticImpl; -import org.glassfish.external.probe.provider.annotations.*; import org.glassfish.gmbal.AMXMetadata; import org.glassfish.gmbal.Description; import org.glassfish.gmbal.ManagedAttribute; diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/SessionStatsProvider.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/SessionStatsProvider.java index cdfd071d123..288d2dab842 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/SessionStatsProvider.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/SessionStatsProvider.java @@ -18,12 +18,14 @@ import java.util.logging.Level; import java.util.logging.Logger; + +import org.glassfish.external.probe.provider.annotations.ProbeListener; +import org.glassfish.external.probe.provider.annotations.ProbeParam; import org.glassfish.external.statistics.CountStatistic; import org.glassfish.external.statistics.RangeStatistic; import org.glassfish.external.statistics.impl.CountStatisticImpl; import org.glassfish.external.statistics.impl.RangeStatisticImpl; import org.glassfish.external.statistics.impl.StatisticImpl; -import org.glassfish.external.probe.provider.annotations.*; import org.glassfish.gmbal.AMXMetadata; import org.glassfish.gmbal.Description; import org.glassfish.gmbal.ManagedAttribute; diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/VirtualServerInfoStatsProvider.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/VirtualServerInfoStatsProvider.java index 857e34b2514..58992ad97df 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/VirtualServerInfoStatsProvider.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/VirtualServerInfoStatsProvider.java @@ -17,6 +17,7 @@ package org.glassfish.web.admin.monitor; import com.sun.enterprise.config.serverbeans.VirtualServer; + import org.glassfish.external.statistics.StringStatistic; import org.glassfish.external.statistics.impl.StringStatisticImpl; import org.glassfish.gmbal.AMXMetadata; diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/WebStatsProviderBootstrap.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/WebStatsProviderBootstrap.java index 575691347b7..5189437917d 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/WebStatsProviderBootstrap.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/WebStatsProviderBootstrap.java @@ -22,18 +22,22 @@ package org.glassfish.web.admin.monitor; import com.sun.enterprise.config.serverbeans.Domain; -import java.util.*; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + +import java.util.List; +import java.util.Map; +import java.util.Queue; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicBoolean; + import org.glassfish.external.probe.provider.PluginPoint; import org.glassfish.external.probe.provider.StatsProviderManager; -import jakarta.inject.Inject; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PostConstruct; -import jakarta.inject.Singleton; +import org.jvnet.hk2.annotations.Service; /** * diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/AltServletStatsImpl.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/AltServletStatsImpl.java index b70629d0cd3..607ec1410bd 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/AltServletStatsImpl.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/AltServletStatsImpl.java @@ -16,20 +16,21 @@ package org.glassfish.web.admin.monitor.statistics; -import org.jvnet.hk2.annotations.Service; - -import org.glassfish.hk2.api.PerLookup; import jakarta.inject.Inject; + +import java.util.List; +import java.util.ResourceBundle; + +import org.glassfish.admin.monitor.cli.MonitorContract; import org.glassfish.api.ActionReport; import org.glassfish.api.ActionReport.ExitCode; import org.glassfish.external.statistics.CountStatistic; import org.glassfish.external.statistics.RangeStatistic; -import org.glassfish.admin.monitor.cli.MonitorContract; -import org.glassfish.flashlight.datatree.TreeNode; import org.glassfish.flashlight.MonitoringRuntimeDataRegistry; +import org.glassfish.flashlight.datatree.TreeNode; +import org.glassfish.hk2.api.PerLookup; import org.glassfish.web.admin.LogFacade; -import java.util.List; -import java.util.ResourceBundle; +import org.jvnet.hk2.annotations.Service; @Service @PerLookup diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/HTTPListenerStatsImpl.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/HTTPListenerStatsImpl.java index 08a1a4eadb5..0a0196ccc53 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/HTTPListenerStatsImpl.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/HTTPListenerStatsImpl.java @@ -16,21 +16,22 @@ package org.glassfish.web.admin.monitor.statistics; -import org.jvnet.hk2.annotations.Service; - -import org.glassfish.hk2.api.PerLookup; import jakarta.inject.Inject; + +import java.util.List; +import java.util.ResourceBundle; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.glassfish.admin.monitor.cli.MonitorContract; import org.glassfish.api.ActionReport; import org.glassfish.api.ActionReport.ExitCode; import org.glassfish.external.statistics.CountStatistic; -import org.glassfish.admin.monitor.cli.MonitorContract; -import org.glassfish.flashlight.datatree.TreeNode; import org.glassfish.flashlight.MonitoringRuntimeDataRegistry; +import org.glassfish.flashlight.datatree.TreeNode; +import org.glassfish.hk2.api.PerLookup; import org.glassfish.web.admin.LogFacade; -import java.util.List; -import java.util.ResourceBundle; -import java.util.logging.Logger; -import java.util.logging.Level; +import org.jvnet.hk2.annotations.Service; /** * A Stats interface to represent the statistical data exposed by an diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/WebModuleVirtualServerStatsImpl.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/WebModuleVirtualServerStatsImpl.java index 4200899b770..8994578c0b8 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/WebModuleVirtualServerStatsImpl.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/WebModuleVirtualServerStatsImpl.java @@ -16,21 +16,22 @@ package org.glassfish.web.admin.monitor.statistics; -import org.jvnet.hk2.annotations.Service; - -import org.glassfish.hk2.api.PerLookup; import jakarta.inject.Inject; + +import java.util.List; +import java.util.ResourceBundle; + +import org.glassfish.admin.monitor.cli.MonitorContract; import org.glassfish.api.ActionReport; import org.glassfish.api.ActionReport.ExitCode; +import org.glassfish.api.Param; import org.glassfish.external.statistics.CountStatistic; import org.glassfish.external.statistics.RangeStatistic; -import org.glassfish.admin.monitor.cli.MonitorContract; -import org.glassfish.flashlight.datatree.TreeNode; import org.glassfish.flashlight.MonitoringRuntimeDataRegistry; +import org.glassfish.flashlight.datatree.TreeNode; +import org.glassfish.hk2.api.PerLookup; import org.glassfish.web.admin.LogFacade; -import org.glassfish.api.Param; -import java.util.List; -import java.util.ResourceBundle; +import org.jvnet.hk2.annotations.Service; /** * diff --git a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/ManagerProperties.java b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/ManagerProperties.java index c9485dbe1f4..0d67b1318de 100644 --- a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/ManagerProperties.java +++ b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/ManagerProperties.java @@ -16,15 +16,17 @@ package org.glassfish.web.config.serverbeans; +import jakarta.validation.constraints.Max; + import java.beans.PropertyVetoException; import java.util.List; -import jakarta.validation.constraints.Max; + import org.glassfish.api.admin.config.PropertiesDesc; import org.glassfish.quality.ToDo; import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.Element; -import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Configured; +import org.jvnet.hk2.config.Element; import org.jvnet.hk2.config.types.Property; import org.jvnet.hk2.config.types.PropertyBag; diff --git a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/SessionConfig.java b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/SessionConfig.java index 606e8a50da3..4df586de58f 100644 --- a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/SessionConfig.java +++ b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/SessionConfig.java @@ -16,12 +16,13 @@ package org.glassfish.web.config.serverbeans; -import org.jvnet.hk2.config.Configured; -import org.jvnet.hk2.config.Element; -import org.jvnet.hk2.config.ConfigBeanProxy; +import jakarta.validation.constraints.NotNull; import java.beans.PropertyVetoException; -import jakarta.validation.constraints.NotNull; + +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Configured; +import org.jvnet.hk2.config.Element; /** diff --git a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/SessionManager.java b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/SessionManager.java index 00eb4a397f7..d766b456b43 100644 --- a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/SessionManager.java +++ b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/SessionManager.java @@ -16,12 +16,13 @@ package org.glassfish.web.config.serverbeans; -import org.jvnet.hk2.config.Configured; -import org.jvnet.hk2.config.Element; -import org.jvnet.hk2.config.ConfigBeanProxy; +import jakarta.validation.constraints.NotNull; import java.beans.PropertyVetoException; -import jakarta.validation.constraints.NotNull; + +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Configured; +import org.jvnet.hk2.config.Element; /** diff --git a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/SessionProperties.java b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/SessionProperties.java index 06551ea215b..2d13642b6ac 100644 --- a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/SessionProperties.java +++ b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/SessionProperties.java @@ -16,9 +16,11 @@ package org.glassfish.web.config.serverbeans; +import jakarta.validation.constraints.Max; + import java.beans.PropertyVetoException; import java.util.List; -import jakarta.validation.constraints.Max; + import org.glassfish.api.admin.config.PropertiesDesc; import org.glassfish.quality.ToDo; import org.jvnet.hk2.config.Attribute; diff --git a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/StoreProperties.java b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/StoreProperties.java index f2b3a4c8694..e5703589358 100644 --- a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/StoreProperties.java +++ b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/StoreProperties.java @@ -16,18 +16,17 @@ package org.glassfish.web.config.serverbeans; -import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.ConfigBeanProxy; -import org.jvnet.hk2.config.Configured; -import org.jvnet.hk2.config.Element; - import java.beans.PropertyVetoException; import java.util.List; import org.glassfish.api.admin.config.PropertiesDesc; +import org.glassfish.quality.ToDo; +import org.jvnet.hk2.config.Attribute; +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Configured; +import org.jvnet.hk2.config.Element; import org.jvnet.hk2.config.types.Property; import org.jvnet.hk2.config.types.PropertyBag; -import org.glassfish.quality.ToDo; /** * diff --git a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/WebContainer.java b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/WebContainer.java index dd6f7207281..0969877fe2d 100644 --- a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/WebContainer.java +++ b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/WebContainer.java @@ -16,23 +16,21 @@ package org.glassfish.web.config.serverbeans; -import org.jvnet.hk2.config.Configured; -import org.jvnet.hk2.config.Element; -import org.jvnet.hk2.config.ConfigBeanProxy; -import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.types.Property; -import org.jvnet.hk2.config.types.PropertyBag; +import jakarta.validation.constraints.NotNull; import java.beans.PropertyVetoException; import java.util.List; -import org.glassfish.config.support.datatypes.PositiveInteger; - import org.glassfish.api.admin.config.ConfigExtension; import org.glassfish.api.admin.config.PropertiesDesc; import org.glassfish.api.admin.config.PropertyDesc; - -import jakarta.validation.constraints.NotNull; +import org.glassfish.config.support.datatypes.PositiveInteger; +import org.jvnet.hk2.config.Attribute; +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Configured; +import org.jvnet.hk2.config.Element; +import org.jvnet.hk2.config.types.Property; +import org.jvnet.hk2.config.types.PropertyBag; @Configured diff --git a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/WebContainerAvailability.java b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/WebContainerAvailability.java index d6baab2081e..99b4b32b457 100644 --- a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/WebContainerAvailability.java +++ b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/WebContainerAvailability.java @@ -17,19 +17,18 @@ package org.glassfish.web.config.serverbeans; import com.sun.enterprise.config.serverbeans.AvailabilityServiceExtension; -import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.ConfigBeanProxy; -import org.jvnet.hk2.config.Configured; -import org.jvnet.hk2.config.Element; -import org.jvnet.hk2.config.types.Property; -import org.jvnet.hk2.config.types.PropertyBag; import java.beans.PropertyVetoException; import java.util.List; import org.glassfish.api.admin.config.PropertiesDesc; - import org.glassfish.quality.ToDo; +import org.jvnet.hk2.config.Attribute; +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Configured; +import org.jvnet.hk2.config.Element; +import org.jvnet.hk2.config.types.Property; +import org.jvnet.hk2.config.types.PropertyBag; /** * web-container-availability SE/EE only diff --git a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/sniffer/WebSniffer.java b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/sniffer/WebSniffer.java index 5b1db8df97d..807e3b7e945 100644 --- a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/sniffer/WebSniffer.java +++ b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/sniffer/WebSniffer.java @@ -16,20 +16,20 @@ package org.glassfish.web.sniffer; -import org.glassfish.api.deployment.archive.ReadableArchive; -import org.glassfish.api.deployment.archive.ArchiveType; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + +import java.util.ArrayList; +import java.util.List; + import org.glassfish.api.deployment.DeploymentContext; +import org.glassfish.api.deployment.archive.ArchiveType; +import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.deployment.common.DeploymentUtils; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.deployment.GenericSniffer; import org.glassfish.web.WarType; -import jakarta.inject.Inject; - import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Singleton; - -import java.util.ArrayList; -import java.util.List; diff --git a/appserver/web/gf-weld-connector/src/main/java/org/glassfish/weld/connector/WeldSniffer.java b/appserver/web/gf-weld-connector/src/main/java/org/glassfish/weld/connector/WeldSniffer.java index 166756ba141..b5038f1af36 100644 --- a/appserver/web/gf-weld-connector/src/main/java/org/glassfish/weld/connector/WeldSniffer.java +++ b/appserver/web/gf-weld-connector/src/main/java/org/glassfish/weld/connector/WeldSniffer.java @@ -17,6 +17,19 @@ package org.glassfish.weld.connector; +import jakarta.inject.Singleton; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Enumeration; +import java.util.logging.Logger; + +import org.glassfish.api.deployment.DeploymentContext; +import org.glassfish.api.deployment.archive.ArchiveType; +import org.glassfish.api.deployment.archive.ReadableArchive; +import org.glassfish.internal.deployment.GenericSniffer; +import org.jvnet.hk2.annotations.Service; + import static java.util.logging.Level.FINE; import static org.glassfish.weld.connector.WeldUtils.EXPANDED_JAR_SUFFIX; import static org.glassfish.weld.connector.WeldUtils.EXPANDED_RAR_SUFFIX; @@ -35,19 +48,6 @@ import static org.glassfish.weld.connector.WeldUtils.isImplicitBeanDiscoveryEnabled; import static org.glassfish.weld.connector.WeldUtils.isValidBdaBasedOnExtensionAndBeansXml; -import java.io.IOException; -import java.io.InputStream; -import java.util.Enumeration; -import java.util.logging.Logger; - -import org.glassfish.api.deployment.DeploymentContext; -import org.glassfish.api.deployment.archive.ArchiveType; -import org.glassfish.api.deployment.archive.ReadableArchive; -import org.glassfish.internal.deployment.GenericSniffer; -import org.jvnet.hk2.annotations.Service; - -import jakarta.inject.Singleton; - /** * Implementation of the Sniffer for Weld. */ diff --git a/appserver/web/gf-weld-connector/src/main/java/org/glassfish/weld/connector/WeldUtils.java b/appserver/web/gf-weld-connector/src/main/java/org/glassfish/weld/connector/WeldUtils.java index dbd76525f94..93f19888d88 100644 --- a/appserver/web/gf-weld-connector/src/main/java/org/glassfish/weld/connector/WeldUtils.java +++ b/appserver/web/gf-weld-connector/src/main/java/org/glassfish/weld/connector/WeldUtils.java @@ -17,6 +17,22 @@ package org.glassfish.weld.connector; +import com.sun.enterprise.config.serverbeans.Config; + +import jakarta.decorator.Decorator; +import jakarta.ejb.MessageDriven; +import jakarta.ejb.Stateful; +import jakarta.ejb.Stateless; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.NormalScope; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.context.SessionScoped; +import jakarta.enterprise.inject.Stereotype; +import jakarta.inject.Scope; +import jakarta.inject.Singleton; +import jakarta.interceptor.Interceptor; + import java.io.IOException; import java.io.InputStream; import java.lang.annotation.Annotation; @@ -45,22 +61,6 @@ import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; -import com.sun.enterprise.config.serverbeans.Config; - -import jakarta.decorator.Decorator; -import jakarta.ejb.MessageDriven; -import jakarta.ejb.Stateful; -import jakarta.ejb.Stateless; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.context.NormalScope; -import jakarta.enterprise.context.RequestScoped; -import jakarta.enterprise.context.SessionScoped; -import jakarta.enterprise.inject.Stereotype; -import jakarta.inject.Scope; -import jakarta.inject.Singleton; -import jakarta.interceptor.Interceptor; - public class WeldUtils { private static Logger logger = Logger.getLogger(WeldUtils.class.getName()); diff --git a/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/ListWebContextParamCommand.java b/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/ListWebContextParamCommand.java index eaf5a1863d9..7e5b1ad9b09 100644 --- a/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/ListWebContextParamCommand.java +++ b/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/ListWebContextParamCommand.java @@ -16,17 +16,22 @@ package org.glassfish.web.plugin.common; -import org.glassfish.web.config.serverbeans.WebModuleConfig; -import org.glassfish.web.config.serverbeans.ContextParam; import com.sun.enterprise.config.serverbeans.Application; + import java.text.MessageFormat; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; - -import org.jvnet.hk2.annotations.Service; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; import org.glassfish.hk2.api.PerLookup; +import org.glassfish.web.config.serverbeans.ContextParam; +import org.glassfish.web.config.serverbeans.WebModuleConfig; +import org.jvnet.hk2.annotations.Service; /** * diff --git a/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/ListWebEnvEntryCommand.java b/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/ListWebEnvEntryCommand.java index 2171c263bca..625b4bc1287 100644 --- a/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/ListWebEnvEntryCommand.java +++ b/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/ListWebEnvEntryCommand.java @@ -16,17 +16,22 @@ package org.glassfish.web.plugin.common; -import org.glassfish.web.config.serverbeans.EnvEntry; -import org.glassfish.web.config.serverbeans.WebModuleConfig; import com.sun.enterprise.config.serverbeans.Application; + import java.text.MessageFormat; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; - -import org.jvnet.hk2.annotations.Service; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; import org.glassfish.hk2.api.PerLookup; +import org.glassfish.web.config.serverbeans.EnvEntry; +import org.glassfish.web.config.serverbeans.WebModuleConfig; +import org.jvnet.hk2.annotations.Service; /** * diff --git a/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/SetWebContextParamCommand.java b/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/SetWebContextParamCommand.java index 736ecff8e74..61b85f6f6f8 100644 --- a/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/SetWebContextParamCommand.java +++ b/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/SetWebContextParamCommand.java @@ -30,9 +30,8 @@ import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.RestParam; import org.glassfish.hk2.api.PerLookup; -import org.glassfish.web.config.serverbeans.WebModuleConfig; import org.glassfish.web.config.serverbeans.ContextParam; - +import org.glassfish.web.config.serverbeans.WebModuleConfig; import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; diff --git a/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/SetWebEnvEntryCommand.java b/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/SetWebEnvEntryCommand.java index 70c58e94918..4f3e874e657 100644 --- a/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/SetWebEnvEntryCommand.java +++ b/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/SetWebEnvEntryCommand.java @@ -33,7 +33,6 @@ import org.glassfish.hk2.api.PerLookup; import org.glassfish.web.config.serverbeans.EnvEntry; import org.glassfish.web.config.serverbeans.WebModuleConfig; - import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; diff --git a/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/UnsetWebContextParamCommand.java b/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/UnsetWebContextParamCommand.java index 2df98308f4d..af95e481527 100644 --- a/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/UnsetWebContextParamCommand.java +++ b/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/UnsetWebContextParamCommand.java @@ -16,8 +16,8 @@ package org.glassfish.web.plugin.common; -import org.glassfish.web.config.serverbeans.WebModuleConfig; import com.sun.enterprise.config.serverbeans.Application; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -25,9 +25,9 @@ import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.RestParam; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; +import org.glassfish.web.config.serverbeans.WebModuleConfig; +import org.jvnet.hk2.annotations.Service; /** * diff --git a/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/UnsetWebEnvEntryCommand.java b/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/UnsetWebEnvEntryCommand.java index 7dec61aef7a..b09bd10b638 100644 --- a/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/UnsetWebEnvEntryCommand.java +++ b/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/UnsetWebEnvEntryCommand.java @@ -16,8 +16,8 @@ package org.glassfish.web.plugin.common; -import org.glassfish.web.config.serverbeans.WebModuleConfig; import com.sun.enterprise.config.serverbeans.Application; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -25,9 +25,9 @@ import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.RestParam; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; +import org.glassfish.web.config.serverbeans.WebModuleConfig; +import org.jvnet.hk2.annotations.Service; /** * diff --git a/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/WebModuleConfigCommand.java b/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/WebModuleConfigCommand.java index 8ce17ae494a..59c1ef2eb26 100644 --- a/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/WebModuleConfigCommand.java +++ b/appserver/web/gui-plugin-common/src/main/java/org/glassfish/web/plugin/common/WebModuleConfigCommand.java @@ -21,11 +21,13 @@ import com.sun.enterprise.config.serverbeans.Engine; import com.sun.enterprise.config.serverbeans.Module; import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + import org.glassfish.api.ActionReport; import org.glassfish.api.Param; import org.glassfish.api.admin.AdminCommand; import org.glassfish.web.config.serverbeans.WebModuleConfig; -import jakarta.inject.Inject; /** * Superclass of all web module config-related commands. diff --git a/appserver/web/jersey-ejb-component-provider/src/main/java/org/glassfish/jersey/gf/ejb/internal/EjbExceptionMapper.java b/appserver/web/jersey-ejb-component-provider/src/main/java/org/glassfish/jersey/gf/ejb/internal/EjbExceptionMapper.java index c92281fdd35..7773787669e 100644 --- a/appserver/web/jersey-ejb-component-provider/src/main/java/org/glassfish/jersey/gf/ejb/internal/EjbExceptionMapper.java +++ b/appserver/web/jersey-ejb-component-provider/src/main/java/org/glassfish/jersey/gf/ejb/internal/EjbExceptionMapper.java @@ -17,13 +17,12 @@ package org.glassfish.jersey.gf.ejb.internal; -import jakarta.ws.rs.WebApplicationException; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.ext.ExceptionMapper; - import jakarta.ejb.EJBException; import jakarta.inject.Inject; import jakarta.inject.Provider; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; import org.glassfish.jersey.spi.ExceptionMappers; import org.glassfish.jersey.spi.ExtendedExceptionMapper; diff --git a/appserver/web/jersey-mvc-connector/src/main/java/org/glassfish/main/web/jersey/server/mvc/jsp/integration/JerseyMvcTldProvider.java b/appserver/web/jersey-mvc-connector/src/main/java/org/glassfish/main/web/jersey/server/mvc/jsp/integration/JerseyMvcTldProvider.java index 5601164fdbc..e2247013ca3 100644 --- a/appserver/web/jersey-mvc-connector/src/main/java/org/glassfish/main/web/jersey/server/mvc/jsp/integration/JerseyMvcTldProvider.java +++ b/appserver/web/jersey-mvc-connector/src/main/java/org/glassfish/main/web/jersey/server/mvc/jsp/integration/JerseyMvcTldProvider.java @@ -16,6 +16,13 @@ package org.glassfish.main.web.jersey.server.mvc.jsp.integration; +import com.sun.enterprise.module.HK2Module; +import com.sun.enterprise.module.ModulesRegistry; +import com.sun.enterprise.util.net.JarURIPattern; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import java.net.URI; import java.net.URISyntaxException; import java.net.URL; @@ -29,19 +36,10 @@ import java.util.logging.Logger; import java.util.regex.Pattern; -import jakarta.inject.Inject; -import jakarta.inject.Singleton; - -import org.glassfish.hk2.api.PostConstruct; - -import org.jvnet.hk2.annotations.Service; - import org.glassfish.api.web.TldProvider; +import org.glassfish.hk2.api.PostConstruct; import org.glassfish.web.loader.LogFacade; - -import com.sun.enterprise.module.HK2Module; -import com.sun.enterprise.module.ModulesRegistry; -import com.sun.enterprise.util.net.JarURIPattern; +import org.jvnet.hk2.annotations.Service; /** * {@link TldProvider TLD Provider} suited for Jersey MVC *.tld. diff --git a/appserver/web/jsf-connector/src/main/java/org/glassfish/faces/integration/GlassFishTldProvider.java b/appserver/web/jsf-connector/src/main/java/org/glassfish/faces/integration/GlassFishTldProvider.java index 73d62fc1839..9edde86b06e 100644 --- a/appserver/web/jsf-connector/src/main/java/org/glassfish/faces/integration/GlassFishTldProvider.java +++ b/appserver/web/jsf-connector/src/main/java/org/glassfish/faces/integration/GlassFishTldProvider.java @@ -17,14 +17,11 @@ package org.glassfish.faces.integration; -import static com.sun.enterprise.util.Utility.isEmpty; -import static com.sun.enterprise.util.net.JarURIPattern.getJarEntries; -import static java.text.MessageFormat.format; -import static java.util.Collections.unmodifiableMap; -import static java.util.logging.Level.WARNING; -import static java.util.regex.Pattern.compile; -import static org.glassfish.web.loader.LogFacade.TLD_PROVIDER_IGNORE_URL; -import static org.glassfish.web.loader.LogFacade.UNABLE_TO_DETERMINE_TLD_RESOURCES; +import com.sun.enterprise.module.HK2Module; +import com.sun.enterprise.module.ModulesRegistry; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.net.URI; import java.net.URISyntaxException; @@ -42,11 +39,14 @@ import org.glassfish.web.loader.LogFacade; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.module.HK2Module; -import com.sun.enterprise.module.ModulesRegistry; - -import jakarta.inject.Inject; -import jakarta.inject.Singleton; +import static com.sun.enterprise.util.Utility.isEmpty; +import static com.sun.enterprise.util.net.JarURIPattern.getJarEntries; +import static java.text.MessageFormat.format; +import static java.util.Collections.unmodifiableMap; +import static java.util.logging.Level.WARNING; +import static java.util.regex.Pattern.compile; +import static org.glassfish.web.loader.LogFacade.TLD_PROVIDER_IGNORE_URL; +import static org.glassfish.web.loader.LogFacade.UNABLE_TO_DETERMINE_TLD_RESOURCES; /** * Implementation of TldProvider for JSF. diff --git a/appserver/web/jspcaching-connector/src/main/java/org/glassfish/jspcaching/integration/GlassFishTldProvider.java b/appserver/web/jspcaching-connector/src/main/java/org/glassfish/jspcaching/integration/GlassFishTldProvider.java index 2d372bfd595..4acb28e33ca 100644 --- a/appserver/web/jspcaching-connector/src/main/java/org/glassfish/jspcaching/integration/GlassFishTldProvider.java +++ b/appserver/web/jspcaching-connector/src/main/java/org/glassfish/jspcaching/integration/GlassFishTldProvider.java @@ -16,18 +16,28 @@ package org.glassfish.jspcaching.integration; -import java.net.*; -import java.text.MessageFormat; -import java.util.*; -import java.util.logging.*; -import java.util.regex.Pattern; import com.sun.appserv.web.taglibs.cache.CacheTag; import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.util.net.JarURIPattern; import com.sun.enterprise.module.HK2Module; import com.sun.enterprise.module.ModulesRegistry; +import com.sun.enterprise.util.net.JarURIPattern; + import jakarta.inject.Inject; import jakarta.inject.Singleton; + +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.net.URLClassLoader; +import java.text.MessageFormat; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.ResourceBundle; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.regex.Pattern; + import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.api.web.TldProvider; import org.glassfish.hk2.api.PostConstruct; diff --git a/appserver/web/jstl-connector/src/main/java/org/glassfish/jstl/integration/GlassFishTldProvider.java b/appserver/web/jstl-connector/src/main/java/org/glassfish/jstl/integration/GlassFishTldProvider.java index b482043f860..2abd10b4dcc 100644 --- a/appserver/web/jstl-connector/src/main/java/org/glassfish/jstl/integration/GlassFishTldProvider.java +++ b/appserver/web/jstl-connector/src/main/java/org/glassfish/jstl/integration/GlassFishTldProvider.java @@ -17,13 +17,11 @@ package org.glassfish.jstl.integration; -import static com.sun.enterprise.util.Utility.isEmpty; -import static com.sun.enterprise.util.net.JarURIPattern.getJarEntries; -import static java.text.MessageFormat.format; -import static java.util.logging.Level.WARNING; -import static java.util.regex.Pattern.compile; -import static org.glassfish.web.loader.LogFacade.TLD_PROVIDER_IGNORE_URL; -import static org.glassfish.web.loader.LogFacade.UNABLE_TO_DETERMINE_TLD_RESOURCES; +import com.sun.enterprise.module.HK2Module; +import com.sun.enterprise.module.ModulesRegistry; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.net.URI; import java.net.URISyntaxException; @@ -42,11 +40,13 @@ import org.glassfish.web.loader.LogFacade; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.module.HK2Module; -import com.sun.enterprise.module.ModulesRegistry; - -import jakarta.inject.Inject; -import jakarta.inject.Singleton; +import static com.sun.enterprise.util.Utility.isEmpty; +import static com.sun.enterprise.util.net.JarURIPattern.getJarEntries; +import static java.text.MessageFormat.format; +import static java.util.logging.Level.WARNING; +import static java.util.regex.Pattern.compile; +import static org.glassfish.web.loader.LogFacade.TLD_PROVIDER_IGNORE_URL; +import static org.glassfish.web.loader.LogFacade.UNABLE_TO_DETERMINE_TLD_RESOURCES; /** diff --git a/appserver/web/war-util/src/main/java/org/glassfish/web/loader/ReferenceCleaner.java b/appserver/web/war-util/src/main/java/org/glassfish/web/loader/ReferenceCleaner.java index f4cb10339e0..b0e6cb01b08 100644 --- a/appserver/web/war-util/src/main/java/org/glassfish/web/loader/ReferenceCleaner.java +++ b/appserver/web/war-util/src/main/java/org/glassfish/web/loader/ReferenceCleaner.java @@ -23,6 +23,7 @@ import java.lang.ref.Reference; import java.lang.reflect.AccessibleObject; import java.lang.reflect.Field; +import java.lang.reflect.InaccessibleObjectException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.security.AccessController; @@ -44,8 +45,6 @@ import static org.glassfish.web.loader.LogFacade.CHECK_THREAD_LOCALS_FOR_LEAKS_KEY; import static org.glassfish.web.loader.LogFacade.getString; -import java.lang.reflect.InaccessibleObjectException; - class ReferenceCleaner { private static final Logger LOG = LogFacade.getSysLogger(ReferenceCleaner.class); diff --git a/appserver/web/war-util/src/main/java/org/glassfish/web/loader/ServletContainerInitializerUtil.java b/appserver/web/war-util/src/main/java/org/glassfish/web/loader/ServletContainerInitializerUtil.java index 41189eba37e..3723fcfee59 100644 --- a/appserver/web/war-util/src/main/java/org/glassfish/web/loader/ServletContainerInitializerUtil.java +++ b/appserver/web/war-util/src/main/java/org/glassfish/web/loader/ServletContainerInitializerUtil.java @@ -29,7 +29,16 @@ import java.security.AccessController; import java.security.PrivilegedAction; import java.text.MessageFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.ResourceBundle; +import java.util.ServiceLoader; +import java.util.Set; import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.logging.Level; @@ -51,7 +60,10 @@ import static java.util.logging.Level.SEVERE; import static java.util.logging.Level.WARNING; import static java.util.zip.ZipFile.OPEN_READ; -import static org.glassfish.web.loader.LogFacade.*; +import static org.glassfish.web.loader.LogFacade.CLASS_LOADING_ERROR; +import static org.glassfish.web.loader.LogFacade.INVALID_URL_CLASS_LOADER_PATH; +import static org.glassfish.web.loader.LogFacade.IO_ERROR; +import static org.glassfish.web.loader.LogFacade.WRONG_CLASSLOADER_TYPE; /** * Utility class - contains util methods used for implementation of diff --git a/appserver/web/war-util/src/main/java/org/glassfish/web/loader/StringManager.java b/appserver/web/war-util/src/main/java/org/glassfish/web/loader/StringManager.java index d54cdff2712..c63a94127c3 100644 --- a/appserver/web/war-util/src/main/java/org/glassfish/web/loader/StringManager.java +++ b/appserver/web/war-util/src/main/java/org/glassfish/web/loader/StringManager.java @@ -18,7 +18,11 @@ package org.glassfish.web.loader; import java.text.MessageFormat; -import java.util.*; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.Locale; +import java.util.MissingResourceException; +import java.util.ResourceBundle; /** * An internationalization / localization helper class which reduces diff --git a/appserver/web/war-util/src/main/java/org/glassfish/web/loader/WebappClassLoader.java b/appserver/web/war-util/src/main/java/org/glassfish/web/loader/WebappClassLoader.java index 5213898a328..6cdd56f23ff 100644 --- a/appserver/web/war-util/src/main/java/org/glassfish/web/loader/WebappClassLoader.java +++ b/appserver/web/war-util/src/main/java/org/glassfish/web/loader/WebappClassLoader.java @@ -65,6 +65,7 @@ import javax.naming.directory.DirContext; import org.apache.naming.JndiPermission; +import org.apache.naming.resources.BaseDirContext; import org.apache.naming.resources.DirContextURLStreamHandler; import org.apache.naming.resources.JarFileResourcesProvider; import org.apache.naming.resources.ProxyDirContext; @@ -85,8 +86,6 @@ import static org.glassfish.web.loader.LogFacade.UNSUPPORTED_VERSION; import static org.glassfish.web.loader.LogFacade.getString; -import org.apache.naming.resources.BaseDirContext; - /** * Specialized web application class loader. *

      diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/CometEvent.java b/appserver/web/web-core/src/main/java/org/apache/catalina/CometEvent.java index 7a553f47815..5a858c951eb 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/CometEvent.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/CometEvent.java @@ -20,6 +20,7 @@ import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; /** diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/Connector.java b/appserver/web/web-core/src/main/java/org/apache/catalina/Connector.java index 8588aa2f57b..1010bf1b4f0 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/Connector.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/Connector.java @@ -18,9 +18,10 @@ package org.apache.catalina; +import com.sun.appserv.ProxyHandler; + import java.security.cert.X509Certificate; -import com.sun.appserv.ProxyHandler; import org.apache.catalina.net.ServerSocketFactory; import org.glassfish.grizzly.http.server.HttpHandler; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/Container.java b/appserver/web/web-core/src/main/java/org/apache/catalina/Container.java index 24b4e65d0ae..a7f7816714a 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/Container.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/Container.java @@ -18,11 +18,13 @@ package org.apache.catalina; -import javax.naming.directory.DirContext; import jakarta.servlet.ServletException; + import java.beans.PropertyChangeListener; import java.io.IOException; +import javax.naming.directory.DirContext; + /** * A Container is an object that can execute requests received from diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/Context.java b/appserver/web/web-core/src/main/java/org/apache/catalina/Context.java index f9c1bafc6b3..09a2a3c00b7 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/Context.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/Context.java @@ -17,13 +17,30 @@ package org.apache.catalina; -import org.apache.catalina.deploy.*; -import org.apache.catalina.util.CharsetMapper; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRegistration; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.SessionCookieConfig; -import jakarta.servlet.*; import java.util.EventListener; import java.util.List; import java.util.Map; + +import org.apache.catalina.deploy.ApplicationParameter; +import org.apache.catalina.deploy.ContextEjb; +import org.apache.catalina.deploy.ContextEnvironment; +import org.apache.catalina.deploy.ContextLocalEjb; +import org.apache.catalina.deploy.ContextResource; +import org.apache.catalina.deploy.ContextResourceLink; +import org.apache.catalina.deploy.ErrorPage; +import org.apache.catalina.deploy.FilterDef; +import org.apache.catalina.deploy.FilterMap; +import org.apache.catalina.deploy.LoginConfig; +import org.apache.catalina.deploy.NamingResources; +import org.apache.catalina.deploy.SecurityConstraint; +import org.apache.catalina.util.CharsetMapper; import org.glassfish.grizzly.http.server.util.Mapper; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/HttpRequest.java b/appserver/web/web-core/src/main/java/org/apache/catalina/HttpRequest.java index 84b2e6a69f2..593d52ef3b6 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/HttpRequest.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/HttpRequest.java @@ -18,9 +18,10 @@ package org.apache.catalina; +import jakarta.servlet.http.Cookie; + import java.security.Principal; import java.util.Locale; -import jakarta.servlet.http.Cookie; import org.glassfish.grizzly.http.util.DataChunk; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/HttpResponse.java b/appserver/web/web-core/src/main/java/org/apache/catalina/HttpResponse.java index 6b729083fcc..613496f8641 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/HttpResponse.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/HttpResponse.java @@ -18,6 +18,7 @@ package org.apache.catalina; import jakarta.servlet.http.Cookie; + import java.io.IOException; import java.util.Collection; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/InstanceEvent.java b/appserver/web/web-core/src/main/java/org/apache/catalina/InstanceEvent.java index 61f8e6ec6b5..8a3ad604ca2 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/InstanceEvent.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/InstanceEvent.java @@ -22,6 +22,7 @@ import jakarta.servlet.Servlet; import jakarta.servlet.ServletRequest; import jakarta.servlet.ServletResponse; + import java.util.EventObject; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/LogFacade.java b/appserver/web/web-core/src/main/java/org/apache/catalina/LogFacade.java index 86c20b7d199..fc4c4e6af6d 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/LogFacade.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/LogFacade.java @@ -17,10 +17,11 @@ package org.apache.catalina; +import java.util.logging.Logger; + import org.glassfish.logging.annotation.LogMessageInfo; -import org.glassfish.logging.annotation.LoggerInfo; import org.glassfish.logging.annotation.LogMessagesResourceBundle; -import java.util.logging.Logger; +import org.glassfish.logging.annotation.LoggerInfo; /** * diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/Manager.java b/appserver/web/web-core/src/main/java/org/apache/catalina/Manager.java index 6c4733c516d..440725c6ec9 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/Manager.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/Manager.java @@ -21,7 +21,10 @@ import jakarta.servlet.ServletException; import jakarta.servlet.ServletRequest; import jakarta.servlet.ServletResponse; -import jakarta.servlet.http.*; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; + import java.beans.PropertyChangeListener; import java.io.IOException; //END OF 6364900 diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/Pipeline.java b/appserver/web/web-core/src/main/java/org/apache/catalina/Pipeline.java index 521b173b676..7c654cf0537 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/Pipeline.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/Pipeline.java @@ -18,11 +18,12 @@ package org.apache.catalina; -import org.glassfish.web.valve.GlassFishValve; - import jakarta.servlet.ServletException; + import java.io.IOException; +import org.glassfish.web.valve.GlassFishValve; + /** *

      Interface describing a collection of Valves that should be executed * in sequence when the invoke() method is invoked. It is diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/Request.java b/appserver/web/web-core/src/main/java/org/apache/catalina/Request.java index 259b0110148..dc96a539249 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/Request.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/Request.java @@ -21,6 +21,7 @@ import jakarta.servlet.FilterChain; import jakarta.servlet.ServletInputStream; import jakarta.servlet.ServletRequest; + import java.io.IOException; import java.io.InputStream; import java.net.Socket; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/Response.java b/appserver/web/web-core/src/main/java/org/apache/catalina/Response.java index 8d2cdf9b26e..cfe24d305aa 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/Response.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/Response.java @@ -20,6 +20,7 @@ import jakarta.servlet.ServletOutputStream; import jakarta.servlet.ServletResponse; + import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/Session.java b/appserver/web/web-core/src/main/java/org/apache/catalina/Session.java index 79dea0a1c53..4753e0a0855 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/Session.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/Session.java @@ -19,8 +19,10 @@ import jakarta.servlet.http.HttpSession; + import java.security.Principal; -import java.util.*; +import java.util.Iterator; +import java.util.Map; /** diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/Valve.java b/appserver/web/web-core/src/main/java/org/apache/catalina/Valve.java index d65c97cf5c2..fa6448e4b97 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/Valve.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/Valve.java @@ -17,12 +17,13 @@ package org.apache.catalina; -import org.apache.catalina.connector.Request; -import org.apache.catalina.connector.Response; - import jakarta.servlet.ServletException; + import java.io.IOException; +import org.apache.catalina.connector.Request; +import org.apache.catalina.connector.Response; + /** *

      A Valve is a request processing component associated with a * particular Container. A series of Valves are generally associated with diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/AuthenticatorBase.java b/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/AuthenticatorBase.java index 34c30db61f3..a4b2bb2dd7b 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/AuthenticatorBase.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/AuthenticatorBase.java @@ -18,22 +18,10 @@ package org.apache.catalina.authenticator; -import static com.sun.logging.LogCleanerUtil.neutralizeForLog; -import static jakarta.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.INFO; -import static java.util.logging.Level.SEVERE; -import static org.apache.catalina.LogFacade.CONFIG_ERROR_MUST_ATTACH_TO_CONTEXT; -import static org.apache.catalina.LogFacade.GETTING_DEBUG_VALUE_EXCEPTION; -import static org.apache.catalina.LogFacade.LOGIN_FAIL; -import static org.apache.catalina.Realm.AUTHENTICATED_NOT_AUTHORIZED; -import static org.apache.catalina.Realm.AUTHENTICATE_NEEDED; -import static org.apache.catalina.Realm.AUTHENTICATE_NOT_NEEDED; -import static org.apache.catalina.authenticator.Constants.FORM_ACTION; -import static org.apache.catalina.authenticator.Constants.REQ_SSOID_NOTE; -import static org.apache.catalina.authenticator.Constants.REQ_SSO_VERSION_NOTE; -import static org.apache.catalina.authenticator.Constants.SESS_PASSWORD_NOTE; -import static org.apache.catalina.authenticator.Constants.SESS_USERNAME_NOTE; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.lang.reflect.Method; @@ -63,10 +51,22 @@ import org.apache.catalina.valves.ValveBase; import org.glassfish.web.valve.GlassFishValve; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.Cookie; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import static com.sun.logging.LogCleanerUtil.neutralizeForLog; +import static jakarta.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.INFO; +import static java.util.logging.Level.SEVERE; +import static org.apache.catalina.LogFacade.CONFIG_ERROR_MUST_ATTACH_TO_CONTEXT; +import static org.apache.catalina.LogFacade.GETTING_DEBUG_VALUE_EXCEPTION; +import static org.apache.catalina.LogFacade.LOGIN_FAIL; +import static org.apache.catalina.Realm.AUTHENTICATED_NOT_AUTHORIZED; +import static org.apache.catalina.Realm.AUTHENTICATE_NEEDED; +import static org.apache.catalina.Realm.AUTHENTICATE_NOT_NEEDED; +import static org.apache.catalina.authenticator.Constants.FORM_ACTION; +import static org.apache.catalina.authenticator.Constants.REQ_SSOID_NOTE; +import static org.apache.catalina.authenticator.Constants.REQ_SSO_VERSION_NOTE; +import static org.apache.catalina.authenticator.Constants.SESS_PASSWORD_NOTE; +import static org.apache.catalina.authenticator.Constants.SESS_USERNAME_NOTE; /** * Basic implementation of the Valve interface that enforces the <security-constraint> diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/BasicAuthenticator.java b/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/BasicAuthenticator.java index bf54f9b4d8c..4c2e6fd64ab 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/BasicAuthenticator.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/BasicAuthenticator.java @@ -18,10 +18,8 @@ package org.apache.catalina.authenticator; -import static java.util.Locale.ENGLISH; -import static java.util.logging.Level.FINE; -import static org.apache.catalina.authenticator.Constants.BASIC_METHOD; -import static org.apache.catalina.authenticator.Constants.REQ_SSOID_NOTE; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.nio.charset.Charset; @@ -32,8 +30,10 @@ import org.apache.catalina.deploy.LoginConfig; import org.apache.catalina.util.Base64; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import static java.util.Locale.ENGLISH; +import static java.util.logging.Level.FINE; +import static org.apache.catalina.authenticator.Constants.BASIC_METHOD; +import static org.apache.catalina.authenticator.Constants.REQ_SSOID_NOTE; /** * An Authenticator and Valve implementation of HTTP BASIC Authentication, as outlined in RFC 2617: "HTTP diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java b/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java index 56fd9d5539c..9b1799419eb 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java @@ -18,6 +18,9 @@ package org.apache.catalina.authenticator; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.nio.charset.Charset; import java.security.MessageDigest; @@ -31,9 +34,6 @@ import org.apache.catalina.deploy.LoginConfig; import org.apache.catalina.util.DigestEncoder; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - /** * An Authenticator and Valve implementation of HTTP DIGEST Authentication (see RFC 2069). * diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/FormAuthenticator.java b/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/FormAuthenticator.java index 21deb189eb7..c4308a002ad 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/FormAuthenticator.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/FormAuthenticator.java @@ -18,17 +18,11 @@ package org.apache.catalina.authenticator; -import static com.sun.logging.LogCleanerUtil.neutralizeForLog; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.WARNING; -import static org.apache.catalina.LogFacade.UNEXPECTED_ERROR_FORWARDING_TO_LOGIN_PAGE; -import static org.apache.catalina.authenticator.Constants.FORM_ACTION; -import static org.apache.catalina.authenticator.Constants.FORM_METHOD; -import static org.apache.catalina.authenticator.Constants.FORM_PRINCIPAL_NOTE; -import static org.apache.catalina.authenticator.Constants.FORM_REQUEST_NOTE; -import static org.apache.catalina.authenticator.Constants.REQ_SSO_VERSION_NOTE; -import static org.apache.catalina.authenticator.Constants.SESS_PASSWORD_NOTE; -import static org.apache.catalina.authenticator.Constants.SESS_USERNAME_NOTE; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; @@ -48,11 +42,17 @@ import org.glassfish.grizzly.http.util.CharChunk; import org.glassfish.grizzly.http.util.MessageBytes; -import jakarta.servlet.RequestDispatcher; -import jakarta.servlet.ServletContext; -import jakarta.servlet.http.Cookie; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import static com.sun.logging.LogCleanerUtil.neutralizeForLog; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.WARNING; +import static org.apache.catalina.LogFacade.UNEXPECTED_ERROR_FORWARDING_TO_LOGIN_PAGE; +import static org.apache.catalina.authenticator.Constants.FORM_ACTION; +import static org.apache.catalina.authenticator.Constants.FORM_METHOD; +import static org.apache.catalina.authenticator.Constants.FORM_PRINCIPAL_NOTE; +import static org.apache.catalina.authenticator.Constants.FORM_REQUEST_NOTE; +import static org.apache.catalina.authenticator.Constants.REQ_SSO_VERSION_NOTE; +import static org.apache.catalina.authenticator.Constants.SESS_PASSWORD_NOTE; +import static org.apache.catalina.authenticator.Constants.SESS_USERNAME_NOTE; /** * An Authenticator and Valve implementation of FORM BASED Authentication, as described in the Servlet API diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java b/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java index bb2af106e3c..387f65cb3b9 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/NonLoginAuthenticator.java @@ -18,6 +18,8 @@ package org.apache.catalina.authenticator; +import jakarta.servlet.http.HttpServletRequest; + import java.io.IOException; import java.util.List; @@ -26,8 +28,6 @@ import org.apache.catalina.deploy.LoginConfig; import org.apache.catalina.realm.GenericPrincipal; -import jakarta.servlet.http.HttpServletRequest; - /** * An Authenticator and Valve implementation that checks only security constraints not involving user * authentication. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/SSLAuthenticator.java b/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/SSLAuthenticator.java index 3d243b082ff..9ca799568ea 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/SSLAuthenticator.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/SSLAuthenticator.java @@ -18,6 +18,18 @@ package org.apache.catalina.authenticator; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +import java.io.IOException; +import java.security.Principal; +import java.security.cert.X509Certificate; +import java.text.MessageFormat; + +import org.apache.catalina.HttpRequest; +import org.apache.catalina.HttpResponse; +import org.apache.catalina.deploy.LoginConfig; + import static com.sun.enterprise.util.Utility.isEmpty; import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import static jakarta.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; @@ -31,18 +43,6 @@ import static org.apache.catalina.authenticator.Constants.CERT_METHOD; import static org.apache.catalina.authenticator.Constants.REQ_SSOID_NOTE; -import java.io.IOException; -import java.security.Principal; -import java.security.cert.X509Certificate; -import java.text.MessageFormat; - -import org.apache.catalina.HttpRequest; -import org.apache.catalina.HttpResponse; -import org.apache.catalina.deploy.LoginConfig; - -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - /** * An Authenticator and Valve implementation of authentication that utilizes SSL certificates to identify * client users. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/SavedRequest.java b/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/SavedRequest.java index afff6731043..35f0d3f3d14 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/SavedRequest.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/SavedRequest.java @@ -18,6 +18,8 @@ package org.apache.catalina.authenticator; +import jakarta.servlet.http.Cookie; + import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -26,8 +28,6 @@ import org.glassfish.grizzly.http.util.ByteChunk; -import jakarta.servlet.http.Cookie; - /** * Object that saves the critical information from a request so that form-based authentication can reproduce it once the * user has been authenticated. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java b/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java index 7ca418d67e7..fd4243b892e 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/authenticator/SingleSignOn.java @@ -18,10 +18,10 @@ package org.apache.catalina.authenticator; -import static com.sun.logging.LogCleanerUtil.neutralizeForLog; -import static org.apache.catalina.LogFacade.ASSOCIATE_SSO_WITH_SESSION_INFO; -import static org.apache.catalina.LogFacade.START_COMPONENT_INFO; -import static org.apache.catalina.LogFacade.STOP_COMPONENT_INFO; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.security.Principal; @@ -42,10 +42,10 @@ import org.apache.catalina.SessionListener; import org.apache.catalina.valves.ValveBase; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.Cookie; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import static com.sun.logging.LogCleanerUtil.neutralizeForLog; +import static org.apache.catalina.LogFacade.ASSOCIATE_SSO_WITH_SESSION_INFO; +import static org.apache.catalina.LogFacade.START_COMPONENT_INFO; +import static org.apache.catalina.LogFacade.STOP_COMPONENT_INFO; /** * A Valve that supports a "single sign on" user experience, where the security identity of a user who diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/Connector.java b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/Connector.java index 667501b584d..c5a87396d8e 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/Connector.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/Connector.java @@ -18,15 +18,9 @@ package org.apache.catalina.connector; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.INFO; -import static java.util.logging.Level.WARNING; -import static org.apache.catalina.Globals.CERTIFICATES_ATTR; -import static org.apache.catalina.Globals.SSL_CERTIFICATE_ATTR; -import static org.apache.catalina.LogFacade.CONNECTOR_BEEN_STARTED; -import static org.apache.catalina.LogFacade.CONNECTOR_NOT_BEEN_STARTED; -import static org.apache.catalina.LogFacade.PROTOCOL_HANDLER_DESTROY_FAILED_EXCEPTION; -import static org.apache.catalina.LogFacade.PROTOCOL_HANDLER_START_FAILED_EXCEPTION; +import com.sun.appserv.ProxyHandler; + +import jakarta.servlet.http.HttpServletRequest; import java.lang.reflect.Constructor; import java.net.URLEncoder; @@ -59,9 +53,15 @@ import org.glassfish.grizzly.http.server.util.Mapper; import org.glassfish.web.util.IntrospectionUtils; -import com.sun.appserv.ProxyHandler; - -import jakarta.servlet.http.HttpServletRequest; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.INFO; +import static java.util.logging.Level.WARNING; +import static org.apache.catalina.Globals.CERTIFICATES_ATTR; +import static org.apache.catalina.Globals.SSL_CERTIFICATE_ATTR; +import static org.apache.catalina.LogFacade.CONNECTOR_BEEN_STARTED; +import static org.apache.catalina.LogFacade.CONNECTOR_NOT_BEEN_STARTED; +import static org.apache.catalina.LogFacade.PROTOCOL_HANDLER_DESTROY_FAILED_EXCEPTION; +import static org.apache.catalina.LogFacade.PROTOCOL_HANDLER_START_FAILED_EXCEPTION; /** * Implementation of a Coyote connector for Tomcat 5.x. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java index 102fdf9b7c3..b5d3421ccef 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java @@ -18,20 +18,7 @@ package org.apache.catalina.connector; -import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST; -import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.INFO; -import static java.util.logging.Level.SEVERE; -import static org.apache.catalina.Globals.SESSION_PARAMETER_NAME; -import static org.apache.catalina.LogFacade.FAILED_TO_INITIALIZE_THE_INTERCEPTOR; -import static org.apache.catalina.LogFacade.HTTP_LISTENER_DISABLED; -import static org.apache.catalina.LogFacade.INTERNAL_ERROR; -import static org.apache.catalina.LogFacade.NO_HOST_MATCHES_SERVER_NAME_INFO; -import static org.apache.catalina.LogFacade.PARSING_CLIENT_CERT_EXCEPTION; -import static org.apache.catalina.LogFacade.REQUEST_PROCESSING_EXCEPTION; -import static org.apache.catalina.connector.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER; -import static org.glassfish.internal.api.Globals.getDefaultHabitat; +import com.sun.appserv.ProxyHandler; import java.io.CharConversionException; import java.nio.charset.Charset; @@ -62,7 +49,20 @@ import org.glassfish.web.valve.GlassFishValve; import org.glassfish.web.valve.ServletContainerInterceptor; -import com.sun.appserv.ProxyHandler; +import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST; +import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.INFO; +import static java.util.logging.Level.SEVERE; +import static org.apache.catalina.Globals.SESSION_PARAMETER_NAME; +import static org.apache.catalina.LogFacade.FAILED_TO_INITIALIZE_THE_INTERCEPTOR; +import static org.apache.catalina.LogFacade.HTTP_LISTENER_DISABLED; +import static org.apache.catalina.LogFacade.INTERNAL_ERROR; +import static org.apache.catalina.LogFacade.NO_HOST_MATCHES_SERVER_NAME_INFO; +import static org.apache.catalina.LogFacade.PARSING_CLIENT_CERT_EXCEPTION; +import static org.apache.catalina.LogFacade.REQUEST_PROCESSING_EXCEPTION; +import static org.apache.catalina.connector.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER; +import static org.glassfish.internal.api.Globals.getDefaultHabitat; /** * Implementation of a request processor which delegates the processing to a Coyote processor. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/CoyoteInputStream.java b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/CoyoteInputStream.java index 5a9b6167519..4864b33ef95 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/CoyoteInputStream.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/CoyoteInputStream.java @@ -17,17 +17,18 @@ package org.apache.catalina.connector; -import org.apache.catalina.LogFacade; -import org.apache.catalina.security.SecurityUtil; - import jakarta.servlet.ReadListener; import jakarta.servlet.ServletInputStream; + import java.io.IOException; import java.security.AccessController; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; import java.util.ResourceBundle; +import org.apache.catalina.LogFacade; +import org.apache.catalina.security.SecurityUtil; + /** * This class handles reading bytes. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/CoyoteOutputStream.java b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/CoyoteOutputStream.java index 9dc28113919..0678971d678 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/CoyoteOutputStream.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/CoyoteOutputStream.java @@ -17,13 +17,14 @@ package org.apache.catalina.connector; -import org.apache.catalina.LogFacade; - import jakarta.servlet.ServletOutputStream; import jakarta.servlet.WriteListener; + import java.io.IOException; import java.util.ResourceBundle; +import org.apache.catalina.LogFacade; + /** * Coyote implementation of the servlet output stream. * diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/CoyoteReader.java b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/CoyoteReader.java index 6e94ae305ef..af0668e68df 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/CoyoteReader.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/CoyoteReader.java @@ -17,15 +17,14 @@ package org.apache.catalina.connector; -import org.apache.catalina.LogFacade; - import java.io.BufferedReader; import java.io.IOException; - import java.util.ResourceBundle; import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.catalina.LogFacade; + /** * Coyote implementation of the buffered reader. * diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/CoyoteWriter.java b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/CoyoteWriter.java index 43f06ee38bf..7001678b4e4 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/CoyoteWriter.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/CoyoteWriter.java @@ -18,14 +18,14 @@ package org.apache.catalina.connector; -import static org.apache.catalina.LogFacade.OBJECT_INVALID_SCOPE_EXCEPTION; - import java.io.IOException; import java.io.PrintWriter; import java.util.ResourceBundle; import org.apache.catalina.LogFacade; +import static org.apache.catalina.LogFacade.OBJECT_INVALID_SCOPE_EXCEPTION; + /** * Coyote implementation of the servlet writer. * diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/InputBuffer.java b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/InputBuffer.java index b566723500b..0845a1ea763 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/InputBuffer.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/InputBuffer.java @@ -17,6 +17,9 @@ package org.apache.catalina.connector; +import jakarta.servlet.ReadListener; +import jakarta.servlet.http.WebConnection; + import java.io.IOException; import java.io.Reader; import java.nio.channels.InterruptedByTimeoutException; @@ -26,13 +29,10 @@ import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.servlet.ReadListener; -import jakarta.servlet.http.WebConnection; - import org.apache.catalina.ContainerEvent; import org.apache.catalina.Context; -import org.apache.catalina.LogFacade; import org.apache.catalina.Globals; +import org.apache.catalina.LogFacade; import org.glassfish.grizzly.ReadHandler; import org.glassfish.grizzly.http.server.Request; import org.glassfish.grizzly.http.util.ByteChunk.ByteInputChannel; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/MappingImpl.java b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/MappingImpl.java index a4ad5ebe6c9..f67ca6cb741 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/MappingImpl.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/MappingImpl.java @@ -16,16 +16,15 @@ package org.apache.catalina.connector; +import jakarta.servlet.http.HttpServletMapping; +import jakarta.servlet.http.MappingMatch; + import java.io.Serializable; import java.util.Objects; import java.util.ResourceBundle; -import jakarta.servlet.http.MappingMatch; -import jakarta.servlet.http.HttpServletMapping; - -import org.glassfish.grizzly.http.server.util.MappingData; - import org.apache.catalina.LogFacade; +import org.glassfish.grizzly.http.server.util.MappingData; public class MappingImpl implements HttpServletMapping, Serializable { diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/OutputBuffer.java b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/OutputBuffer.java index 1d48f7147d0..5bc7fd08a34 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/OutputBuffer.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/OutputBuffer.java @@ -17,6 +17,10 @@ package org.apache.catalina.connector; +import jakarta.servlet.WriteListener; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; + import java.io.IOException; import java.io.Writer; import java.nio.channels.InterruptedByTimeoutException; @@ -26,9 +30,6 @@ import java.util.ResourceBundle; import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.servlet.WriteListener; -import jakarta.servlet.http.Cookie; -import jakarta.servlet.http.HttpServletRequest; import org.apache.catalina.ContainerEvent; import org.apache.catalina.Context; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/Request.java b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/Request.java index e7fe1d54c33..15bc2610cea 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/Request.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/Request.java @@ -18,51 +18,30 @@ package org.apache.catalina.connector; -import static com.sun.logging.LogCleanerUtil.getSafeHeaderValue; -import static jakarta.servlet.DispatcherType.REQUEST; -import static jakarta.servlet.RequestDispatcher.ERROR_EXCEPTION; -import static jakarta.servlet.RequestDispatcher.INCLUDE_SERVLET_PATH; -import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static java.util.logging.Level.FINEST; -import static java.util.logging.Level.SEVERE; -import static java.util.logging.Level.WARNING; -import static org.apache.catalina.Globals.CERTIFICATES_ATTR; -import static org.apache.catalina.Globals.CIPHER_SUITE_ATTR; -import static org.apache.catalina.Globals.DISPATCHER_TYPE_ATTR; -import static org.apache.catalina.Globals.ISO_8859_1_ENCODING; -import static org.apache.catalina.Globals.JREPLICA_PARAMETER; -import static org.apache.catalina.Globals.JREPLICA_SESSION_NOTE; -import static org.apache.catalina.Globals.KEY_SIZE_ATTR; -import static org.apache.catalina.Globals.REQUEST_FACADE_HELPER; -import static org.apache.catalina.Globals.SESSION_COOKIE_NAME; -import static org.apache.catalina.Globals.SESSION_VERSIONS_REQUEST_ATTRIBUTE; -import static org.apache.catalina.Globals.SESSION_VERSION_COOKIE_NAME; -import static org.apache.catalina.Globals.SESSION_VERSION_PARAMETER; -import static org.apache.catalina.Globals.SSL_SESSION_ID_ATTR; -import static org.apache.catalina.LogFacade.ALREADY_AUTHENTICATED; -import static org.apache.catalina.LogFacade.ASYNC_ALREADY_COMPLETE_EXCEPTION; -import static org.apache.catalina.LogFacade.ATTRIBUTE_EVENT_LISTENER_EXCEPTION; -import static org.apache.catalina.LogFacade.BREAKING_BACKGROUND_LOCK_EXCEPTION; -import static org.apache.catalina.LogFacade.GETINPUTSTREAM_BEEN_CALLED_EXCEPTION; -import static org.apache.catalina.LogFacade.INTERNAL_LOGOUT_ERROR; -import static org.apache.catalina.LogFacade.INVALID_URI_CHAR_ENCODING; -import static org.apache.catalina.LogFacade.INVALID_URI_ENCODING; -import static org.apache.catalina.LogFacade.LOGIN_WITH_AUTH_CONFIG; -import static org.apache.catalina.LogFacade.NO_AUTHENTICATOR; -import static org.apache.catalina.LogFacade.NULL_ATTRIBUTE_NAME_EXCEPTION; -import static org.apache.catalina.LogFacade.REQUEST_CALLED_WITHOUT_MULTIPART_CONFIG_EXCEPTION; -import static org.apache.catalina.LogFacade.REQUEST_NOT_PUT_INTO_ASYNC_MODE_EXCEPTION; -import static org.apache.catalina.LogFacade.REQUEST_WITHIN_SCOPE_OF_FILTER_OR_SERVLET_EXCEPTION; -import static org.apache.catalina.LogFacade.START_ASYNC_CALLED_AGAIN_EXCEPTION; -import static org.apache.catalina.LogFacade.START_ASYNC_CALLED_OUTSIDE_SCOPE_EXCEPTION; -import static org.apache.catalina.LogFacade.UNABLE_DETERMINE_CLIENT_ADDRESS; -import static org.apache.catalina.LogFacade.UNABLE_PERFORM_ERROR_DISPATCH; -import static org.apache.catalina.LogFacade.UNABLE_RESOLVE_IP_EXCEPTION; -import static org.apache.catalina.LogFacade.UNABLE_SET_REQUEST_CHARS; -import static org.apache.catalina.authenticator.Constants.REQ_SSOID_NOTE; -import static org.apache.catalina.authenticator.Constants.REQ_SSO_VERSION_NOTE; -import static org.apache.catalina.connector.Constants.AUTHORIZATION_HEADER; -import static org.apache.catalina.connector.Constants.JROUTE_COOKIE; +import com.sun.appserv.ProxyHandler; + +import jakarta.servlet.AsyncContext; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.FilterChain; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletConnection; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletRequestAttributeEvent; +import jakarta.servlet.ServletRequestAttributeListener; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.SessionCookieConfig; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletMapping; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpUpgradeHandler; +import jakarta.servlet.http.Part; +import jakarta.servlet.http.PushBuilder; +import jakarta.servlet.http.WebConnection; import java.io.BufferedReader; import java.io.CharConversionException; @@ -142,30 +121,51 @@ import org.glassfish.grizzly.utils.Charsets; import org.glassfish.web.valve.GlassFishValve; -import com.sun.appserv.ProxyHandler; - -import jakarta.servlet.AsyncContext; -import jakarta.servlet.DispatcherType; -import jakarta.servlet.FilterChain; -import jakarta.servlet.RequestDispatcher; -import jakarta.servlet.ServletConnection; -import jakarta.servlet.ServletContext; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletInputStream; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletRequestAttributeEvent; -import jakarta.servlet.ServletRequestAttributeListener; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.SessionCookieConfig; -import jakarta.servlet.http.Cookie; -import jakarta.servlet.http.HttpServletMapping; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.servlet.http.HttpSession; -import jakarta.servlet.http.HttpUpgradeHandler; -import jakarta.servlet.http.Part; -import jakarta.servlet.http.PushBuilder; -import jakarta.servlet.http.WebConnection; +import static com.sun.logging.LogCleanerUtil.getSafeHeaderValue; +import static jakarta.servlet.DispatcherType.REQUEST; +import static jakarta.servlet.RequestDispatcher.ERROR_EXCEPTION; +import static jakarta.servlet.RequestDispatcher.INCLUDE_SERVLET_PATH; +import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static java.util.logging.Level.FINEST; +import static java.util.logging.Level.SEVERE; +import static java.util.logging.Level.WARNING; +import static org.apache.catalina.Globals.CERTIFICATES_ATTR; +import static org.apache.catalina.Globals.CIPHER_SUITE_ATTR; +import static org.apache.catalina.Globals.DISPATCHER_TYPE_ATTR; +import static org.apache.catalina.Globals.ISO_8859_1_ENCODING; +import static org.apache.catalina.Globals.JREPLICA_PARAMETER; +import static org.apache.catalina.Globals.JREPLICA_SESSION_NOTE; +import static org.apache.catalina.Globals.KEY_SIZE_ATTR; +import static org.apache.catalina.Globals.REQUEST_FACADE_HELPER; +import static org.apache.catalina.Globals.SESSION_COOKIE_NAME; +import static org.apache.catalina.Globals.SESSION_VERSIONS_REQUEST_ATTRIBUTE; +import static org.apache.catalina.Globals.SESSION_VERSION_COOKIE_NAME; +import static org.apache.catalina.Globals.SESSION_VERSION_PARAMETER; +import static org.apache.catalina.Globals.SSL_SESSION_ID_ATTR; +import static org.apache.catalina.LogFacade.ALREADY_AUTHENTICATED; +import static org.apache.catalina.LogFacade.ASYNC_ALREADY_COMPLETE_EXCEPTION; +import static org.apache.catalina.LogFacade.ATTRIBUTE_EVENT_LISTENER_EXCEPTION; +import static org.apache.catalina.LogFacade.BREAKING_BACKGROUND_LOCK_EXCEPTION; +import static org.apache.catalina.LogFacade.GETINPUTSTREAM_BEEN_CALLED_EXCEPTION; +import static org.apache.catalina.LogFacade.INTERNAL_LOGOUT_ERROR; +import static org.apache.catalina.LogFacade.INVALID_URI_CHAR_ENCODING; +import static org.apache.catalina.LogFacade.INVALID_URI_ENCODING; +import static org.apache.catalina.LogFacade.LOGIN_WITH_AUTH_CONFIG; +import static org.apache.catalina.LogFacade.NO_AUTHENTICATOR; +import static org.apache.catalina.LogFacade.NULL_ATTRIBUTE_NAME_EXCEPTION; +import static org.apache.catalina.LogFacade.REQUEST_CALLED_WITHOUT_MULTIPART_CONFIG_EXCEPTION; +import static org.apache.catalina.LogFacade.REQUEST_NOT_PUT_INTO_ASYNC_MODE_EXCEPTION; +import static org.apache.catalina.LogFacade.REQUEST_WITHIN_SCOPE_OF_FILTER_OR_SERVLET_EXCEPTION; +import static org.apache.catalina.LogFacade.START_ASYNC_CALLED_AGAIN_EXCEPTION; +import static org.apache.catalina.LogFacade.START_ASYNC_CALLED_OUTSIDE_SCOPE_EXCEPTION; +import static org.apache.catalina.LogFacade.UNABLE_DETERMINE_CLIENT_ADDRESS; +import static org.apache.catalina.LogFacade.UNABLE_PERFORM_ERROR_DISPATCH; +import static org.apache.catalina.LogFacade.UNABLE_RESOLVE_IP_EXCEPTION; +import static org.apache.catalina.LogFacade.UNABLE_SET_REQUEST_CHARS; +import static org.apache.catalina.authenticator.Constants.REQ_SSOID_NOTE; +import static org.apache.catalina.authenticator.Constants.REQ_SSO_VERSION_NOTE; +import static org.apache.catalina.connector.Constants.AUTHORIZATION_HEADER; +import static org.apache.catalina.connector.Constants.JROUTE_COOKIE; /** * Wrapper object for the Coyote request. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/RequestFacade.java b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/RequestFacade.java index 02fd421fec2..705869a8669 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/RequestFacade.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/RequestFacade.java @@ -18,25 +18,8 @@ package org.apache.catalina.connector; -import static org.apache.catalina.Globals.IS_SECURITY_ENABLED; -import static org.apache.catalina.security.SecurityUtil.isPackageProtectionEnabled; - import com.sun.enterprise.security.ee.web.integration.WebPrincipal; -import java.io.BufferedReader; -import java.io.IOException; -import java.security.AccessControlException; -import java.security.AccessController; -import java.security.Principal; -import java.security.PrivilegedAction; -import java.security.SecurityPermission; -import java.util.Collection; -import java.util.Enumeration; -import java.util.Locale; -import java.util.Map; -import java.util.ResourceBundle; -import org.apache.catalina.LogFacade; -import org.apache.catalina.core.RequestFacadeHelper; import jakarta.servlet.AsyncContext; import jakarta.servlet.DispatcherType; import jakarta.servlet.RequestDispatcher; @@ -55,6 +38,25 @@ import jakarta.servlet.http.Part; import jakarta.servlet.http.PushBuilder; +import java.io.BufferedReader; +import java.io.IOException; +import java.security.AccessControlException; +import java.security.AccessController; +import java.security.Principal; +import java.security.PrivilegedAction; +import java.security.SecurityPermission; +import java.util.Collection; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Map; +import java.util.ResourceBundle; + +import org.apache.catalina.LogFacade; +import org.apache.catalina.core.RequestFacadeHelper; + +import static org.apache.catalina.Globals.IS_SECURITY_ENABLED; +import static org.apache.catalina.security.SecurityUtil.isPackageProtectionEnabled; + /** * Facade class that wraps a Catalina connector request object. All methods are delegated to the wrapped request. * diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/Response.java b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/Response.java index b0c183c8151..ff16de4af4c 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/Response.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/Response.java @@ -18,21 +18,11 @@ package org.apache.catalina.connector; -import static org.apache.catalina.Globals.JREPLICA_PARAMETER; -import static org.apache.catalina.Globals.JREPLICA_SESSION_NOTE; -import static org.apache.catalina.Globals.SESSION_PARAMETER_NAME; -import static org.apache.catalina.Globals.SESSION_VERSION_PARAMETER; -import static org.apache.catalina.LogFacade.CANNOT_CALL_SEND_ERROR_EXCEPTION; -import static org.apache.catalina.LogFacade.CANNOT_CALL_SEND_REDIRECT_EXCEPTION; -import static org.apache.catalina.LogFacade.CANNOT_CHANGE_BUFFER_SIZE_EXCEPTION; -import static org.apache.catalina.LogFacade.CANNOT_RESET_BUFFER_EXCEPTION; -import static org.apache.catalina.LogFacade.ERROR_DURING_FINISH_RESPONSE; -import static org.apache.catalina.LogFacade.GET_WRITER_BEEN_CALLED_EXCEPTION; -import static org.apache.catalina.Logger.WARNING; -import static org.apache.catalina.connector.Constants.PROXY_JROUTE; -import static org.glassfish.common.util.InputValidationUtil.getSafeHeaderName; -import static org.glassfish.common.util.InputValidationUtil.getSafeHeaderValue; -import static org.glassfish.web.util.HtmlEntityEncoder.encodeXSS; +import com.sun.appserv.ProxyHandler; + +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; @@ -69,11 +59,21 @@ import org.glassfish.grizzly.http.util.MimeHeaders; import org.glassfish.grizzly.http.util.UEncoder; -import com.sun.appserv.ProxyHandler; - -import jakarta.servlet.ServletOutputStream; -import jakarta.servlet.http.Cookie; -import jakarta.servlet.http.HttpServletResponse; +import static org.apache.catalina.Globals.JREPLICA_PARAMETER; +import static org.apache.catalina.Globals.JREPLICA_SESSION_NOTE; +import static org.apache.catalina.Globals.SESSION_PARAMETER_NAME; +import static org.apache.catalina.Globals.SESSION_VERSION_PARAMETER; +import static org.apache.catalina.LogFacade.CANNOT_CALL_SEND_ERROR_EXCEPTION; +import static org.apache.catalina.LogFacade.CANNOT_CALL_SEND_REDIRECT_EXCEPTION; +import static org.apache.catalina.LogFacade.CANNOT_CHANGE_BUFFER_SIZE_EXCEPTION; +import static org.apache.catalina.LogFacade.CANNOT_RESET_BUFFER_EXCEPTION; +import static org.apache.catalina.LogFacade.ERROR_DURING_FINISH_RESPONSE; +import static org.apache.catalina.LogFacade.GET_WRITER_BEEN_CALLED_EXCEPTION; +import static org.apache.catalina.Logger.WARNING; +import static org.apache.catalina.connector.Constants.PROXY_JROUTE; +import static org.glassfish.common.util.InputValidationUtil.getSafeHeaderName; +import static org.glassfish.common.util.InputValidationUtil.getSafeHeaderValue; +import static org.glassfish.web.util.HtmlEntityEncoder.encodeXSS; // END S1AS 6170450 diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/ResponseFacade.java b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/ResponseFacade.java index c18cbd6e124..af8eac50cb1 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/ResponseFacade.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/ResponseFacade.java @@ -18,7 +18,9 @@ package org.apache.catalina.connector; -import static org.apache.catalina.LogFacade.NULL_RESPONSE_OBJECT; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; @@ -37,9 +39,7 @@ import org.apache.catalina.LogFacade; import org.apache.catalina.security.SecurityUtil; -import jakarta.servlet.ServletOutputStream; -import jakarta.servlet.http.Cookie; -import jakarta.servlet.http.HttpServletResponse; +import static org.apache.catalina.LogFacade.NULL_RESPONSE_OBJECT; /** * Facade class that wraps a Coyote response object. All methods are delegated to the wrapped response. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/SessionTracker.java b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/SessionTracker.java index 4493bfca99a..8686bee3a7a 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/SessionTracker.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/SessionTracker.java @@ -17,12 +17,12 @@ package org.apache.catalina.connector; +import java.util.ArrayList; + import org.apache.catalina.Session; import org.apache.catalina.SessionEvent; import org.apache.catalina.SessionListener; -import java.util.ArrayList; - /** * Class responsible for keeping track of the total number of active sessions * associated with an HTTP request. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/WebConnectionImpl.java b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/WebConnectionImpl.java index 7770a32e4b1..807e7462022 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/WebConnectionImpl.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/WebConnectionImpl.java @@ -16,12 +16,14 @@ package org.apache.catalina.connector; -import java.io.IOException; -import java.util.concurrent.atomic.AtomicBoolean; import jakarta.servlet.ServletInputStream; import jakarta.servlet.ServletOutputStream; import jakarta.servlet.http.HttpUpgradeHandler; import jakarta.servlet.http.WebConnection; + +import java.io.IOException; +import java.util.concurrent.atomic.AtomicBoolean; + import org.apache.catalina.ContainerEvent; import org.apache.catalina.Context; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationDispatcher.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationDispatcher.java index cff441a383a..cc0db3e1bd6 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationDispatcher.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationDispatcher.java @@ -17,35 +17,49 @@ package org.apache.catalina.core; -import static com.sun.logging.LogCleanerUtil.neutralizeForLog; -import org.apache.catalina.*; -import org.apache.catalina.connector.ClientAbortException; -import org.apache.catalina.connector.Request; -import org.apache.catalina.connector.RequestFacade; -import org.apache.catalina.connector.ResponseFacade; -import org.apache.catalina.util.InstanceSupport; - -import jakarta.servlet.*; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletRequestWrapper; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.ServletResponseWrapper; +import jakarta.servlet.UnavailableException; +import jakarta.servlet.http.HttpServletMapping; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.security.AccessController; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; +import java.text.MessageFormat; import java.util.ResourceBundle; import java.util.logging.Level; import java.util.logging.Logger; -import java.text.MessageFormat; -import jakarta.servlet.http.HttpServletMapping; - -import static org.apache.catalina.InstanceEvent.EventType.AFTER_DISPATCH_EVENT; +import org.apache.catalina.Context; +import org.apache.catalina.Globals; +import org.apache.catalina.HttpResponse; +import org.apache.catalina.InstanceEvent; +import org.apache.catalina.LogFacade; +import org.apache.catalina.Wrapper; +import org.apache.catalina.connector.ClientAbortException; import org.apache.catalina.connector.MappingImpl; +import org.apache.catalina.connector.Request; +import org.apache.catalina.connector.RequestFacade; +import org.apache.catalina.connector.ResponseFacade; +import org.apache.catalina.util.InstanceSupport; import org.glassfish.grizzly.http.server.util.Mapper; import org.glassfish.grizzly.http.server.util.MappingData; import org.glassfish.grizzly.http.util.CharChunk; import org.glassfish.grizzly.http.util.MessageBytes; +import static com.sun.logging.LogCleanerUtil.neutralizeForLog; +import static org.apache.catalina.InstanceEvent.EventType.AFTER_DISPATCH_EVENT; + /** * Standard implementation of RequestDispatcher that allows a * request to be forwarded to a different resource to create the ultimate diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationDispatcherForward.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationDispatcherForward.java index 30f5aa0286c..e53366e8c46 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationDispatcherForward.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationDispatcherForward.java @@ -17,6 +17,26 @@ package org.apache.catalina.core; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +import java.io.BufferedInputStream; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.IOException; +import java.io.PrintWriter; +import java.text.MessageFormat; +import java.util.ResourceBundle; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.apache.catalina.Context; import org.apache.catalina.Globals; import org.apache.catalina.LogFacade; @@ -27,15 +47,6 @@ import org.apache.catalina.valves.ErrorReportValve; import org.glassfish.web.util.HtmlEntityEncoder; -import jakarta.servlet.*; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import java.io.*; -import java.text.MessageFormat; -import java.util.ResourceBundle; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * Class responsible for processing the result of a RD.forward() invocation * before committing the response. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationFilterChain.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationFilterChain.java index 471fdb074bd..a1e0b1d7103 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationFilterChain.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationFilterChain.java @@ -18,19 +18,24 @@ package org.apache.catalina.core; -import org.apache.catalina.Globals; -import org.apache.catalina.LogFacade; -import org.apache.catalina.security.SecurityUtil; -import org.apache.catalina.util.InstanceSupport; - -import jakarta.servlet.*; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import jakarta.servlet.http.HttpServletRequest; + import java.io.IOException; import java.security.Principal; import java.security.PrivilegedActionException; import java.util.ResourceBundle; import java.util.logging.Logger; +import org.apache.catalina.Globals; +import org.apache.catalina.LogFacade; +import org.apache.catalina.security.SecurityUtil; +import org.apache.catalina.util.InstanceSupport; import static org.apache.catalina.InstanceEvent.EventType.AFTER_FILTER_EVENT; import static org.apache.catalina.InstanceEvent.EventType.BEFORE_FILTER_EVENT; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationFilterConfig.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationFilterConfig.java index 840d235b2ab..16d4a82c0b0 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationFilterConfig.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationFilterConfig.java @@ -18,20 +18,21 @@ package org.apache.catalina.core; -import org.apache.catalina.ContainerEvent; -import org.apache.catalina.LogFacade; -import org.apache.catalina.deploy.FilterDef; -import org.apache.catalina.security.SecurityUtil; - import jakarta.servlet.Filter; import jakarta.servlet.FilterConfig; import jakarta.servlet.ServletContext; import jakarta.servlet.ServletException; + import java.io.Serializable; import java.util.Enumeration; +import java.util.ResourceBundle; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.ResourceBundle; + +import org.apache.catalina.ContainerEvent; +import org.apache.catalina.LogFacade; +import org.apache.catalina.deploy.FilterDef; +import org.apache.catalina.security.SecurityUtil; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationFilterFactory.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationFilterFactory.java index a0ed5bd761e..87b0de6f74d 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationFilterFactory.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationFilterFactory.java @@ -17,18 +17,19 @@ package org.apache.catalina.core; -import org.apache.catalina.Globals; -import org.apache.catalina.Request; -import org.apache.catalina.Wrapper; -import org.apache.catalina.deploy.FilterMap; - import jakarta.servlet.DispatcherType; import jakarta.servlet.Servlet; import jakarta.servlet.ServletRequest; + import java.util.Iterator; import java.util.List; import java.util.Locale; +import org.apache.catalina.Globals; +import org.apache.catalina.Request; +import org.apache.catalina.Wrapper; +import org.apache.catalina.deploy.FilterMap; + /** * Factory for the creation and caching of Filters and creation * of Filter Chains. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationHttpRequest.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationHttpRequest.java index 418abfd595c..3b490c0fb3f 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationHttpRequest.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationHttpRequest.java @@ -17,25 +17,32 @@ package org.apache.catalina.core; -import org.apache.catalina.Context; -import org.apache.catalina.Globals; -import org.apache.catalina.Manager; -import org.apache.catalina.Session; -import org.apache.catalina.connector.RequestFacade; -import org.apache.catalina.session.StandardSession; -import org.apache.catalina.util.Enumerator; -import org.apache.catalina.util.RequestUtil; - import jakarta.servlet.AsyncContext; import jakarta.servlet.DispatcherType; import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.http.HttpServletMapping; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequestWrapper; import jakarta.servlet.http.HttpSession; import jakarta.servlet.http.PushBuilder; + import java.io.IOException; -import java.util.*; -import jakarta.servlet.http.HttpServletMapping; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.NoSuchElementException; + +import org.apache.catalina.Context; +import org.apache.catalina.Globals; +import org.apache.catalina.Manager; +import org.apache.catalina.Session; +import org.apache.catalina.connector.RequestFacade; +import org.apache.catalina.session.StandardSession; +import org.apache.catalina.util.Enumerator; +import org.apache.catalina.util.RequestUtil; /** * Wrapper around a jakarta.servlet.http.HttpServletRequest diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationHttpResponse.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationHttpResponse.java index 55ecb55c1f6..5d3f5106736 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationHttpResponse.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationHttpResponse.java @@ -21,6 +21,7 @@ import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponseWrapper; + import java.io.IOException; import java.util.Locale; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationPushBuilder.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationPushBuilder.java index 0201f6f6155..72a59ecc044 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationPushBuilder.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationPushBuilder.java @@ -18,6 +18,13 @@ package org.apache.catalina.core; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletRequestWrapper; +import jakarta.servlet.SessionTrackingMode; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.PushBuilder; + import java.text.MessageFormat; import java.util.ArrayList; import java.util.HashSet; @@ -27,22 +34,14 @@ import java.util.ResourceBundle; import java.util.Set; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletRequestWrapper; -import jakarta.servlet.SessionTrackingMode; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpSession; -import jakarta.servlet.http.PushBuilder; - import org.apache.catalina.Context; import org.apache.catalina.LogFacade; import org.apache.catalina.connector.Request; - import org.glassfish.grizzly.http.Cookie; import org.glassfish.grizzly.http.server.http2.PushEvent; -import org.glassfish.grizzly.http2.Http2Stream; import org.glassfish.grizzly.http.util.Header; import org.glassfish.grizzly.http.util.MimeHeaders; +import org.glassfish.grizzly.http2.Http2Stream; /** * Implementation of jakarta.servlet.http.PushBuilder. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationRequest.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationRequest.java index 47890117d6b..38f6c49a6b0 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationRequest.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationRequest.java @@ -21,16 +21,16 @@ package org.apache.catalina.core; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.HashSet; - import jakarta.servlet.AsyncContext; import jakarta.servlet.RequestDispatcher; import jakarta.servlet.ServletRequest; import jakarta.servlet.ServletRequestWrapper; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.HashSet; + /** * Wrapper around a jakarta.servlet.ServletRequest diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationResponse.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationResponse.java index c808858f822..3d86ae02cf7 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationResponse.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationResponse.java @@ -20,6 +20,7 @@ import jakarta.servlet.ServletResponse; import jakarta.servlet.ServletResponseWrapper; + import java.util.Locale; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/DummyFilterRegistrationDynamic.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/DummyFilterRegistrationDynamic.java index 4347063047e..fed1df940d5 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/DummyFilterRegistrationDynamic.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/DummyFilterRegistrationDynamic.java @@ -17,6 +17,7 @@ import jakarta.servlet.DispatcherType; import jakarta.servlet.FilterRegistration; + import java.util.Collection; import java.util.EnumSet; import java.util.Map; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/DummyRequest.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/DummyRequest.java index a338c4ea9d0..20c4dec6c70 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/DummyRequest.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/DummyRequest.java @@ -18,17 +18,6 @@ package org.apache.catalina.core; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; -import java.net.Socket; -import java.security.Principal; -import java.util.Collection; -import java.util.Enumeration; -import java.util.Iterator; -import java.util.Locale; -import java.util.Map; import jakarta.servlet.AsyncContext; import jakarta.servlet.AsyncListener; import jakarta.servlet.DispatcherType; @@ -44,8 +33,20 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; -import jakarta.servlet.http.Part; import jakarta.servlet.http.HttpUpgradeHandler; +import jakarta.servlet.http.Part; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.net.Socket; +import java.security.Principal; +import java.util.Collection; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.Locale; +import java.util.Map; import org.apache.catalina.Connector; import org.apache.catalina.Context; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/DummyResponse.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/DummyResponse.java index 1266e064f72..b6a9c2ff5ba 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/DummyResponse.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/DummyResponse.java @@ -18,21 +18,22 @@ package org.apache.catalina.core; -import org.apache.catalina.Connector; -import org.apache.catalina.Context; -import org.apache.catalina.HttpResponse; -import org.apache.catalina.Request; - import jakarta.servlet.ServletOutputStream; import jakarta.servlet.ServletResponse; import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; import java.util.Collection; import java.util.Locale; +import org.apache.catalina.Connector; +import org.apache.catalina.Context; +import org.apache.catalina.HttpResponse; +import org.apache.catalina.Request; + /** * Dummy response object, used for JSP precompilation. * diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/DynamicFilterRegistrationImpl.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/DynamicFilterRegistrationImpl.java index 8c179f139de..df35c381a5b 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/DynamicFilterRegistrationImpl.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/DynamicFilterRegistrationImpl.java @@ -16,13 +16,14 @@ package org.apache.catalina.core; -import org.apache.catalina.LogFacade; -import org.apache.catalina.deploy.FilterDef; - import jakarta.servlet.FilterRegistration; + import java.text.MessageFormat; import java.util.ResourceBundle; +import org.apache.catalina.LogFacade; +import org.apache.catalina.deploy.FilterDef; + public class DynamicFilterRegistrationImpl extends FilterRegistrationImpl diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/DynamicServletRegistrationImpl.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/DynamicServletRegistrationImpl.java index 959c6f85a4c..1e424793ed7 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/DynamicServletRegistrationImpl.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/DynamicServletRegistrationImpl.java @@ -20,10 +20,11 @@ import jakarta.servlet.Servlet; import jakarta.servlet.ServletRegistration; import jakarta.servlet.ServletSecurityElement; + +import java.text.MessageFormat; import java.util.Collections; -import java.util.Set; import java.util.ResourceBundle; -import java.text.MessageFormat; +import java.util.Set; import org.apache.catalina.LogFacade; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/FilterRegistrationImpl.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/FilterRegistrationImpl.java index f3941ed0ad5..6dcb33a24f7 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/FilterRegistrationImpl.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/FilterRegistrationImpl.java @@ -16,18 +16,19 @@ package org.apache.catalina.core; -import org.apache.catalina.LogFacade; -import org.apache.catalina.deploy.FilterDef; -import org.apache.catalina.deploy.FilterMap; - import jakarta.servlet.DispatcherType; import jakarta.servlet.FilterRegistration; + +import java.text.MessageFormat; import java.util.Collection; import java.util.EnumSet; import java.util.Map; +import java.util.ResourceBundle; import java.util.Set; -import java.text.MessageFormat; -import java.util.*; + +import org.apache.catalina.LogFacade; +import org.apache.catalina.deploy.FilterDef; +import org.apache.catalina.deploy.FilterMap; public class FilterRegistrationImpl implements FilterRegistration { diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/NamingContextListener.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/NamingContextListener.java index 9e519a68713..b0b325d809b 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/NamingContextListener.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/NamingContextListener.java @@ -18,25 +18,47 @@ package org.apache.catalina.core; -import static com.sun.logging.LogCleanerUtil.neutralizeForLog; -import org.apache.catalina.*; -import org.apache.catalina.LogFacade; -import org.apache.catalina.deploy.*; -import org.apache.naming.*; - -import javax.naming.NamingException; -import javax.naming.Reference; -import javax.naming.StringRefAddr; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.text.MessageFormat; import java.util.Enumeration; import java.util.Hashtable; -import java.util.StringTokenizer; import java.util.ResourceBundle; +import java.util.StringTokenizer; import java.util.logging.Level; import java.util.logging.Logger; +import javax.naming.NamingException; +import javax.naming.Reference; +import javax.naming.StringRefAddr; + +import org.apache.catalina.Container; +import org.apache.catalina.ContainerEvent; +import org.apache.catalina.ContainerListener; +import org.apache.catalina.Context; +import org.apache.catalina.Lifecycle; +import org.apache.catalina.LifecycleEvent; +import org.apache.catalina.LifecycleListener; +import org.apache.catalina.LogFacade; +import org.apache.catalina.Server; +import org.apache.catalina.deploy.ContextEjb; +import org.apache.catalina.deploy.ContextEnvironment; +import org.apache.catalina.deploy.ContextLocalEjb; +import org.apache.catalina.deploy.ContextResource; +import org.apache.catalina.deploy.ContextResourceLink; +import org.apache.catalina.deploy.NamingResources; +import org.apache.catalina.deploy.ResourceParams; +import org.apache.naming.ContextAccessController; +import org.apache.naming.ContextBindings; +import org.apache.naming.EjbRef; +import org.apache.naming.NamingContext; +import org.apache.naming.ResourceEnvRef; +import org.apache.naming.ResourceLinkRef; +import org.apache.naming.ResourceRef; +import org.apache.naming.TransactionRef; + +import static com.sun.logging.LogCleanerUtil.neutralizeForLog; + /** * Helper class used to initialize and populate the JNDI context associated * with each context and server. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/RequestFacadeHelper.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/RequestFacadeHelper.java index 9e52a9f170d..e0c0b0a94f0 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/RequestFacadeHelper.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/RequestFacadeHelper.java @@ -16,6 +16,10 @@ package org.apache.catalina.core; +import jakarta.servlet.ServletRequest; + +import java.util.ResourceBundle; + import org.apache.catalina.Globals; import org.apache.catalina.LogFacade; import org.apache.catalina.Session; @@ -23,9 +27,6 @@ import org.apache.catalina.connector.Response; import org.apache.catalina.connector.SessionTracker; -import java.util.ResourceBundle; -import jakarta.servlet.ServletRequest; - /** * This class exposes some of the functionality of * org.apache.catalina.connector.Request and diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ServletRegistrationImpl.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ServletRegistrationImpl.java index 8d4437fb3f3..2e909a3943c 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ServletRegistrationImpl.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ServletRegistrationImpl.java @@ -17,11 +17,13 @@ package org.apache.catalina.core; import jakarta.servlet.ServletRegistration; + import java.text.MessageFormat; import java.util.Collection; import java.util.Map; -import java.util.Set; import java.util.ResourceBundle; +import java.util.Set; + import org.apache.catalina.LogFacade; public class ServletRegistrationImpl implements ServletRegistration { diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/SessionCookieConfigImpl.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/SessionCookieConfigImpl.java index 31c6bca2fca..e280ff9bdf4 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/SessionCookieConfigImpl.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/SessionCookieConfigImpl.java @@ -17,14 +17,7 @@ package org.apache.catalina.core; -import static java.lang.String.CASE_INSENSITIVE_ORDER; -import static java.util.Collections.unmodifiableMap; -import static org.apache.catalina.LogFacade.SESSION_COOKIE_CONFIG_ALREADY_INIT; -import static org.apache.catalina.core.Constants.COOKIE_DOMAIN_ATTR; -import static org.apache.catalina.core.Constants.COOKIE_HTTP_ONLY_ATTR; -import static org.apache.catalina.core.Constants.COOKIE_MAX_AGE_ATTR; -import static org.apache.catalina.core.Constants.COOKIE_PATH_ATTR; -import static org.apache.catalina.core.Constants.COOKIE_SECURE_ATTR; +import jakarta.servlet.SessionCookieConfig; import java.text.MessageFormat; import java.util.Map; @@ -33,7 +26,14 @@ import org.apache.catalina.LogFacade; -import jakarta.servlet.SessionCookieConfig; +import static java.lang.String.CASE_INSENSITIVE_ORDER; +import static java.util.Collections.unmodifiableMap; +import static org.apache.catalina.LogFacade.SESSION_COOKIE_CONFIG_ALREADY_INIT; +import static org.apache.catalina.core.Constants.COOKIE_DOMAIN_ATTR; +import static org.apache.catalina.core.Constants.COOKIE_HTTP_ONLY_ATTR; +import static org.apache.catalina.core.Constants.COOKIE_MAX_AGE_ATTR; +import static org.apache.catalina.core.Constants.COOKIE_PATH_ATTR; +import static org.apache.catalina.core.Constants.COOKIE_SECURE_ATTR; /** * Class that may be used to configure various properties of cookies used for session tracking purposes. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContext.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContext.java index 8340bf15ed6..293102b172a 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContext.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContext.java @@ -183,7 +183,47 @@ import static org.apache.catalina.Globals.META_INF_RESOURCES; import static org.apache.catalina.Globals.RESOURCES_ATTR; import static org.apache.catalina.Globals.WEBSOCKET_INITIALIZER; -import static org.apache.catalina.LogFacade.*; +import static org.apache.catalina.LogFacade.BIND_THREAD_EXCEPTION; +import static org.apache.catalina.LogFacade.CONTAINER_ALREADY_STARTED_EXCEPTION; +import static org.apache.catalina.LogFacade.CONTAINER_NOT_STARTED_EXCEPTION; +import static org.apache.catalina.LogFacade.DEPENDENCY_CHECK_EXCEPTION; +import static org.apache.catalina.LogFacade.DUPLICATE_SERVLET_MAPPING_EXCEPTION; +import static org.apache.catalina.LogFacade.ERROR_PAGE_LOCATION_EXCEPTION; +import static org.apache.catalina.LogFacade.ERROR_PAGE_REQUIRED_EXCEPTION; +import static org.apache.catalina.LogFacade.FILTER_MAPPING_INVALID_URL_EXCEPTION; +import static org.apache.catalina.LogFacade.FILTER_MAPPING_NAME_EXCEPTION; +import static org.apache.catalina.LogFacade.FILTER_WITHOUT_ANY_CLASS; +import static org.apache.catalina.LogFacade.INIT_RESOURCES_EXCEPTION; +import static org.apache.catalina.LogFacade.INVALID_ERROR_PAGE_CODE_EXCEPTION; +import static org.apache.catalina.LogFacade.INVOKING_SERVLET_CONTAINER_INIT_EXCEPTION; +import static org.apache.catalina.LogFacade.JSP_FILE_FINE; +import static org.apache.catalina.LogFacade.LISTENER_STOP_EXCEPTION; +import static org.apache.catalina.LogFacade.LOGIN_CONFIG_ERROR_PAGE_EXCEPTION; +import static org.apache.catalina.LogFacade.LOGIN_CONFIG_LOGIN_PAGE_EXCEPTION; +import static org.apache.catalina.LogFacade.LOGIN_CONFIG_REQUIRED_EXCEPTION; +import static org.apache.catalina.LogFacade.MISS_PATH_OR_URL_PATTERN_EXCEPTION; +import static org.apache.catalina.LogFacade.NO_WRAPPER_EXCEPTION; +import static org.apache.catalina.LogFacade.NULL_EMPTY_FILTER_NAME_EXCEPTION; +import static org.apache.catalina.LogFacade.NULL_EMPTY_SERVLET_NAME_EXCEPTION; +import static org.apache.catalina.LogFacade.NULL_FILTER_INSTANCE_EXCEPTION; +import static org.apache.catalina.LogFacade.NULL_SERVLET_INSTANCE_EXCEPTION; +import static org.apache.catalina.LogFacade.RELOADING_STARTED; +import static org.apache.catalina.LogFacade.REQUEST_DESTROY_EXCEPTION; +import static org.apache.catalina.LogFacade.REQUEST_INIT_EXCEPTION; +import static org.apache.catalina.LogFacade.RESETTING_CONTEXT_EXCEPTION; +import static org.apache.catalina.LogFacade.RESOURCES_STARTED; +import static org.apache.catalina.LogFacade.SECURITY_CONSTRAINT_PATTERN_EXCEPTION; +import static org.apache.catalina.LogFacade.SERVLET_CONTEXT_ALREADY_INIT_EXCEPTION; +import static org.apache.catalina.LogFacade.SERVLET_LOAD_EXCEPTION; +import static org.apache.catalina.LogFacade.SERVLET_MAPPING_INVALID_URL_EXCEPTION; +import static org.apache.catalina.LogFacade.SERVLET_MAPPING_UNKNOWN_NAME_EXCEPTION; +import static org.apache.catalina.LogFacade.STARTING_CONTEXT_EXCEPTION; +import static org.apache.catalina.LogFacade.STARTING_RESOURCES_EXCEPTION; +import static org.apache.catalina.LogFacade.STARTING_RESOURCE_EXCEPTION_MESSAGE; +import static org.apache.catalina.LogFacade.STARTUP_CONTEXT_FAILED_EXCEPTION; +import static org.apache.catalina.LogFacade.STOPPING_CONTEXT_EXCEPTION; +import static org.apache.catalina.LogFacade.STOPPING_RESOURCES_EXCEPTION; +import static org.apache.catalina.LogFacade.WRAPPER_ERROR_EXCEPTION; import static org.apache.catalina.core.Constants.DEFAULT_SERVLET_NAME; import static org.apache.catalina.core.Constants.JSP_SERVLET_NAME; import static org.apache.catalina.startup.Constants.WebDtdPublicId_22; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContextValve.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContextValve.java index bbd925fa5ed..6eeac5e1ce6 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContextValve.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContextValve.java @@ -18,15 +18,20 @@ package org.apache.catalina.core; -import org.apache.catalina.*; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletResponse; + +import java.io.IOException; + +import org.apache.catalina.Container; +import org.apache.catalina.HttpRequest; +import org.apache.catalina.Request; +import org.apache.catalina.Response; +import org.apache.catalina.Wrapper; import org.apache.catalina.valves.ValveBase; import org.glassfish.grizzly.utils.Charsets; import org.glassfish.web.valve.GlassFishValve; -import jakarta.servlet.*; -import jakarta.servlet.http.HttpServletResponse; -import java.io.IOException; - /** * Valve that implements the default basic behavior for the * StandardContext container implementation. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardEngine.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardEngine.java index 64214d45447..c069d824987 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardEngine.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardEngine.java @@ -17,13 +17,21 @@ package org.apache.catalina.core; -import org.apache.catalina.*; -import org.apache.catalina.realm.JAASRealm; -import static com.sun.logging.LogCleanerUtil.neutralizeForLog; +import java.util.logging.Level; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import java.util.logging.Level; + +import org.apache.catalina.Container; +import org.apache.catalina.Engine; +import org.apache.catalina.Host; +import org.apache.catalina.LifecycleException; +import org.apache.catalina.LogFacade; +import org.apache.catalina.Realm; +import org.apache.catalina.Service; +import org.apache.catalina.realm.JAASRealm; + +import static com.sun.logging.LogCleanerUtil.neutralizeForLog; /** * Standard implementation of the Engine interface. Each diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardEngineValve.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardEngineValve.java index 4781207e95e..28f2f30ae7c 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardEngineValve.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardEngineValve.java @@ -18,18 +18,19 @@ package org.apache.catalina.core; -import org.apache.catalina.Host; -import org.apache.catalina.LogFacade; -import org.apache.catalina.Request; -import org.apache.catalina.Response; -import org.apache.catalina.valves.ValveBase; - import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.text.MessageFormat; import java.util.ResourceBundle; +import org.apache.catalina.Host; +import org.apache.catalina.LogFacade; +import org.apache.catalina.Request; +import org.apache.catalina.Response; +import org.apache.catalina.valves.ValveBase; + /** * Valve that implements the default basic behavior for the diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardHost.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardHost.java index 6c97cd9bd0d..0a1f55cec02 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardHost.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardHost.java @@ -18,19 +18,9 @@ package org.apache.catalina.core; -import org.apache.catalina.*; -import org.apache.catalina.authenticator.SingleSignOn; -import org.apache.catalina.deploy.ErrorPage; -import static com.sun.logging.LogCleanerUtil.neutralizeForLog; -import org.apache.catalina.util.RequestUtil; -import org.apache.catalina.valves.ValveBase; -import org.glassfish.web.valve.GlassFishValve; - -import javax.management.Notification; -import javax.management.NotificationBroadcasterSupport; -import javax.management.ObjectName; import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; + import java.io.IOException; import java.lang.reflect.Method; import java.net.URL; @@ -40,6 +30,25 @@ import java.util.List; import java.util.logging.Level; +import javax.management.Notification; +import javax.management.NotificationBroadcasterSupport; +import javax.management.ObjectName; + +import org.apache.catalina.Container; +import org.apache.catalina.Context; +import org.apache.catalina.Deployer; +import org.apache.catalina.Host; +import org.apache.catalina.LifecycleException; +import org.apache.catalina.LogFacade; +import org.apache.catalina.Pipeline; +import org.apache.catalina.authenticator.SingleSignOn; +import org.apache.catalina.deploy.ErrorPage; +import org.apache.catalina.util.RequestUtil; +import org.apache.catalina.valves.ValveBase; +import org.glassfish.web.valve.GlassFishValve; + +import static com.sun.logging.LogCleanerUtil.neutralizeForLog; + /** * Standard implementation of the Host interface. Each * child container must be a Context implementation to process the diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardHostDeployer.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardHostDeployer.java index 53053e0b7ac..5a5e3df3fb8 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardHostDeployer.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardHostDeployer.java @@ -18,13 +18,8 @@ package org.apache.catalina.core; -import org.apache.catalina.*; -import org.apache.catalina.startup.ContextRuleSet; -import org.apache.catalina.startup.ExpandWar; -import org.apache.catalina.startup.NamingRuleSet; -import org.apache.tomcat.util.digester.Digester; - import jakarta.servlet.ServletContext; + import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -35,6 +30,19 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.catalina.Container; +import org.apache.catalina.Context; +import org.apache.catalina.Deployer; +import org.apache.catalina.Host; +import org.apache.catalina.Lifecycle; +import org.apache.catalina.LifecycleException; +import org.apache.catalina.LifecycleListener; +import org.apache.catalina.LogFacade; +import org.apache.catalina.startup.ContextRuleSet; +import org.apache.catalina.startup.ExpandWar; +import org.apache.catalina.startup.NamingRuleSet; +import org.apache.tomcat.util.digester.Digester; + /** *

      Implementation of Deployer that is delegated to by the diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardHostValve.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardHostValve.java index 414cff80751..9b57105e8fd 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardHostValve.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardHostValve.java @@ -17,18 +17,14 @@ package org.apache.catalina.core; -import static jakarta.servlet.DispatcherType.ERROR; -import static jakarta.servlet.RequestDispatcher.ERROR_MESSAGE; -import static jakarta.servlet.RequestDispatcher.ERROR_REQUEST_URI; -import static jakarta.servlet.RequestDispatcher.ERROR_SERVLET_NAME; -import static jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE; -import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static java.util.Locale.ENGLISH; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.INFO; -import static java.util.logging.Level.WARNING; -import static org.apache.catalina.Globals.DISPATCHER_REQUEST_PATH_ATTR; -import static org.apache.catalina.LogFacade.NO_CONTEXT_TO_PROCESS; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.BufferedInputStream; import java.io.File; @@ -52,14 +48,18 @@ import org.apache.catalina.valves.ValveBase; import org.glassfish.web.valve.GlassFishValve; -import jakarta.servlet.RequestDispatcher; -import jakarta.servlet.ServletContext; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletOutputStream; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import static jakarta.servlet.DispatcherType.ERROR; +import static jakarta.servlet.RequestDispatcher.ERROR_MESSAGE; +import static jakarta.servlet.RequestDispatcher.ERROR_REQUEST_URI; +import static jakarta.servlet.RequestDispatcher.ERROR_SERVLET_NAME; +import static jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE; +import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static java.util.Locale.ENGLISH; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.INFO; +import static java.util.logging.Level.WARNING; +import static org.apache.catalina.Globals.DISPATCHER_REQUEST_PATH_ATTR; +import static org.apache.catalina.LogFacade.NO_CONTEXT_TO_PROCESS; /** * Valve that implements the default basic behavior for the StandardHost container implementation. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardPipeline.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardPipeline.java index 8b8408d242b..2e998b352e3 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardPipeline.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardPipeline.java @@ -18,20 +18,8 @@ package org.apache.catalina.core; -import static java.text.MessageFormat.format; -import static java.util.logging.Level.INFO; -import static java.util.logging.Level.SEVERE; -import static java.util.logging.Level.WARNING; -import static org.apache.catalina.ContainerEvent.AFTER_UPGRADE_HANDLER_INITIALIZED; -import static org.apache.catalina.ContainerEvent.BEFORE_UPGRADE_HANDLER_INITIALIZED; -import static org.apache.catalina.Globals.WRAPPED_REQUEST; -import static org.apache.catalina.Globals.WRAPPED_RESPONSE; -import static org.apache.catalina.LogFacade.NO_VALVES_IN_PIPELINE_EXCEPTION; -import static org.apache.catalina.LogFacade.PIPLINE_NOT_STARTED; -import static org.apache.catalina.LogFacade.PIPLINE_STARTED; -import static org.apache.catalina.LogFacade.PROTOCOL_HANDLER_REQUIRED_EXCEPTION; -import static org.apache.catalina.LogFacade.REMOVE_VALVE_EXCEPTION; -import static org.apache.catalina.LogFacade.SET_BASIC_START_EXCEPTION; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpUpgradeHandler; import java.io.IOException; import java.lang.reflect.Method; @@ -60,8 +48,20 @@ import org.glassfish.web.valve.GlassFishValveAdapter; import org.glassfish.web.valve.TomcatValveAdapter; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpUpgradeHandler; +import static java.text.MessageFormat.format; +import static java.util.logging.Level.INFO; +import static java.util.logging.Level.SEVERE; +import static java.util.logging.Level.WARNING; +import static org.apache.catalina.ContainerEvent.AFTER_UPGRADE_HANDLER_INITIALIZED; +import static org.apache.catalina.ContainerEvent.BEFORE_UPGRADE_HANDLER_INITIALIZED; +import static org.apache.catalina.Globals.WRAPPED_REQUEST; +import static org.apache.catalina.Globals.WRAPPED_RESPONSE; +import static org.apache.catalina.LogFacade.NO_VALVES_IN_PIPELINE_EXCEPTION; +import static org.apache.catalina.LogFacade.PIPLINE_NOT_STARTED; +import static org.apache.catalina.LogFacade.PIPLINE_STARTED; +import static org.apache.catalina.LogFacade.PROTOCOL_HANDLER_REQUIRED_EXCEPTION; +import static org.apache.catalina.LogFacade.REMOVE_VALVE_EXCEPTION; +import static org.apache.catalina.LogFacade.SET_BASIC_START_EXCEPTION; /** CR 6411114 (Lifecycle implementation moved to ValveBase) import org.apache.tomcat.util.modeler.Registry; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardServer.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardServer.java index b39a8ceac9e..d6664ef1372 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardServer.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardServer.java @@ -18,12 +18,6 @@ package org.apache.catalina.core; -import org.apache.catalina.*; -import org.apache.catalina.deploy.NamingResources; -import org.apache.catalina.util.LifecycleSupport; -import static com.sun.logging.LogCleanerUtil.neutralizeForLog; - -import javax.management.ObjectName; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.io.IOException; @@ -33,12 +27,26 @@ import java.net.Socket; import java.security.AccessControlException; import java.security.SecureRandom; +import java.text.MessageFormat; import java.util.List; import java.util.ResourceBundle; -import java.text.MessageFormat; import java.util.logging.Level; import java.util.logging.Logger; +import javax.management.ObjectName; + +import org.apache.catalina.Lifecycle; +import org.apache.catalina.LifecycleException; +import org.apache.catalina.LifecycleListener; +import org.apache.catalina.LogFacade; +import org.apache.catalina.Server; +import org.apache.catalina.ServerFactory; +import org.apache.catalina.Service; +import org.apache.catalina.deploy.NamingResources; +import org.apache.catalina.util.LifecycleSupport; + +import static com.sun.logging.LogCleanerUtil.neutralizeForLog; + /** * Standard implementation of the Server interface, available for use diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardService.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardService.java index 2d91d52cfbb..cb06036e700 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardService.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardService.java @@ -17,14 +17,6 @@ package org.apache.catalina.core; -import static com.sun.logging.LogCleanerUtil.neutralizeForLog; -import static java.text.MessageFormat.format; -import static java.util.logging.Level.INFO; -import static java.util.logging.Level.SEVERE; -import static org.apache.catalina.LogFacade.ERROR_REGISTER_SERVICE_EXCEPTION; -import static org.apache.catalina.LogFacade.FAILED_SERVICE_INIT_EXCEPTION; -import static org.apache.catalina.LogFacade.SERVICE_STARTED; - import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.util.List; @@ -46,6 +38,14 @@ import org.apache.catalina.Service; import org.apache.catalina.util.LifecycleSupport; +import static com.sun.logging.LogCleanerUtil.neutralizeForLog; +import static java.text.MessageFormat.format; +import static java.util.logging.Level.INFO; +import static java.util.logging.Level.SEVERE; +import static org.apache.catalina.LogFacade.ERROR_REGISTER_SERVICE_EXCEPTION; +import static org.apache.catalina.LogFacade.FAILED_SERVICE_INIT_EXCEPTION; +import static org.apache.catalina.LogFacade.SERVICE_STARTED; + /** * Standard implementation of the Service interface. The associated Container is generally an instance of * Engine, but this is not required. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardWrapperFacade.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardWrapperFacade.java index d4148b60a07..534ca1e8995 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardWrapperFacade.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardWrapperFacade.java @@ -19,6 +19,7 @@ import jakarta.servlet.ServletConfig; import jakarta.servlet.ServletContext; + import java.util.Enumeration; /** diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardWrapperValve.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardWrapperValve.java index 78ce1c4ad68..b0e18a3e268 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardWrapperValve.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardWrapperValve.java @@ -17,24 +17,12 @@ package org.apache.catalina.core; -import static jakarta.servlet.RequestDispatcher.ERROR_EXCEPTION; -import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND; -import static jakarta.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE; -import static java.text.MessageFormat.format; -import static java.util.logging.Level.INFO; -import static java.util.logging.Level.WARNING; -import static org.apache.catalina.Globals.DISPATCHER_REQUEST_PATH_ATTR; -import static org.apache.catalina.Globals.JSP_FILE_ATTR; -import static org.apache.catalina.LogFacade.APP_UNAVAILABLE; -import static org.apache.catalina.LogFacade.DEALLOCATE_EXCEPTION; -import static org.apache.catalina.LogFacade.RELEASE_FILTERS_EXCEPTION; -import static org.apache.catalina.LogFacade.SEND_ACKNOWLEDGEMENT_EXCEPTION; -import static org.apache.catalina.LogFacade.SERVLET_ALLOCATE_EXCEPTION; -import static org.apache.catalina.LogFacade.SERVLET_NOT_FOUND; -import static org.apache.catalina.LogFacade.SERVLET_SERVICE_EXCEPTION; -import static org.apache.catalina.LogFacade.SERVLET_UNAVAILABLE; -import static org.apache.catalina.LogFacade.STANDARD_WRAPPER_VALVE; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.UnavailableException; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.MessageFormat; @@ -54,12 +42,24 @@ import org.apache.catalina.valves.ValveBase; import org.glassfish.grizzly.http.util.DataChunk; -import jakarta.servlet.Servlet; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.UnavailableException; -import jakarta.servlet.http.HttpServletResponse; +import static jakarta.servlet.RequestDispatcher.ERROR_EXCEPTION; +import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND; +import static jakarta.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE; +import static java.text.MessageFormat.format; +import static java.util.logging.Level.INFO; +import static java.util.logging.Level.WARNING; +import static org.apache.catalina.Globals.DISPATCHER_REQUEST_PATH_ATTR; +import static org.apache.catalina.Globals.JSP_FILE_ATTR; +import static org.apache.catalina.LogFacade.APP_UNAVAILABLE; +import static org.apache.catalina.LogFacade.DEALLOCATE_EXCEPTION; +import static org.apache.catalina.LogFacade.RELEASE_FILTERS_EXCEPTION; +import static org.apache.catalina.LogFacade.SEND_ACKNOWLEDGEMENT_EXCEPTION; +import static org.apache.catalina.LogFacade.SERVLET_ALLOCATE_EXCEPTION; +import static org.apache.catalina.LogFacade.SERVLET_NOT_FOUND; +import static org.apache.catalina.LogFacade.SERVLET_SERVICE_EXCEPTION; +import static org.apache.catalina.LogFacade.SERVLET_UNAVAILABLE; +import static org.apache.catalina.LogFacade.STANDARD_WRAPPER_VALVE; /** * Valve that implements the default basic behavior for the StandardWrapper container implementation. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/WebSocketFilterWrapper.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/WebSocketFilterWrapper.java index 9aef7985758..3281fd74bbc 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/WebSocketFilterWrapper.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/WebSocketFilterWrapper.java @@ -23,7 +23,9 @@ import jakarta.servlet.ServletResponse; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequestWrapper; + import java.io.IOException; + import org.apache.catalina.connector.RequestFacade; /** diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/ErrorPage.java b/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/ErrorPage.java index bbe836cc334..4f175dcf26a 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/ErrorPage.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/ErrorPage.java @@ -18,10 +18,10 @@ package org.apache.catalina.deploy; -import org.apache.catalina.util.RequestUtil; - import java.io.Serializable; +import org.apache.catalina.util.RequestUtil; + /** * Representation of an error page element for a web application, diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/FilterDef.java b/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/FilterDef.java index 32c196d8c75..40b839fd492 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/FilterDef.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/FilterDef.java @@ -17,11 +17,17 @@ package org.apache.catalina.deploy; -import org.apache.catalina.util.Enumerator; - import jakarta.servlet.Filter; + import java.io.Serializable; -import java.util.*; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import org.apache.catalina.util.Enumerator; /** * Representation of a filter definition for a web application, as represented diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/FilterMap.java b/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/FilterMap.java index 766b421c1b9..7557ee760dc 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/FilterMap.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/FilterMap.java @@ -17,13 +17,14 @@ package org.apache.catalina.deploy; -import org.apache.catalina.util.RequestUtil; - import jakarta.servlet.DispatcherType; + import java.io.Serializable; import java.util.EnumSet; import java.util.Set; +import org.apache.catalina.util.RequestUtil; + /** * Representation of a filter mapping for a web application, as represented * in a <filter-mapping> element in the deployment diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/FilterMaps.java b/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/FilterMaps.java index 4bcd9b3e0af..f5b7b32fddb 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/FilterMaps.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/FilterMaps.java @@ -18,6 +18,7 @@ package org.apache.catalina.deploy; import jakarta.servlet.DispatcherType; + import java.util.Set; /** diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/LoginConfig.java b/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/LoginConfig.java index 79520eed24e..4aafaf742fc 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/LoginConfig.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/LoginConfig.java @@ -18,10 +18,10 @@ package org.apache.catalina.deploy; -import org.apache.catalina.util.RequestUtil; - import java.io.Serializable; +import org.apache.catalina.util.RequestUtil; + /** * Representation of a login configuration element for a web application, diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/SecurityCollection.java b/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/SecurityCollection.java index a7c48cc1a23..9449d7a48e1 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/SecurityCollection.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/SecurityCollection.java @@ -18,10 +18,10 @@ package org.apache.catalina.deploy; -import org.apache.catalina.util.RequestUtil; - import java.io.Serializable; +import org.apache.catalina.util.RequestUtil; + /** * Representation of a web resource collection for a web application's security diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/DeferredFileOutputStream.java b/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/DeferredFileOutputStream.java index 8728dce6c13..793031736e7 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/DeferredFileOutputStream.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/DeferredFileOutputStream.java @@ -20,7 +20,11 @@ package org.apache.catalina.fileupload; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; /** * An output stream which will retain data in memory until a specified diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/Multipart.java b/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/Multipart.java index 8500127ff31..1e1f3dd178f 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/Multipart.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/Multipart.java @@ -25,6 +25,7 @@ import jakarta.servlet.ServletContext; import jakarta.servlet.ServletException; import jakarta.servlet.http.Part; + import java.io.File; import java.io.IOException; import java.util.ArrayList; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/MultipartStream.java b/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/MultipartStream.java index 5fe02f41919..6584edefbba 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/MultipartStream.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/MultipartStream.java @@ -21,8 +21,10 @@ package org.apache.catalina.fileupload; import java.io.ByteArrayOutputStream; -import java.io.*; - +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.UnsupportedEncodingException; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/PartHeaders.java b/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/PartHeaders.java index d1860fc9c8e..53baad0fea1 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/PartHeaders.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/PartHeaders.java @@ -21,7 +21,14 @@ package org.apache.catalina.fileupload; import java.io.Serializable; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; /** * @author Michael C. Macaluso diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/PartItem.java b/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/PartItem.java index cde6fb2a727..57d0f01f2ea 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/PartItem.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/PartItem.java @@ -20,18 +20,35 @@ package org.apache.catalina.fileupload; -import org.apache.catalina.Globals; -import org.apache.catalina.LogFacade; -import org.apache.catalina.util.RequestUtil; - import jakarta.servlet.http.Part; -import java.io.*; + +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.OutputStream; +import java.io.Serializable; +import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; import java.text.MessageFormat; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.ResourceBundle; import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.catalina.Globals; +import org.apache.catalina.LogFacade; +import org.apache.catalina.util.RequestUtil; + /** * This class implements java.servlet.http.Part. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/RequestItemIterator.java b/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/RequestItemIterator.java index 75975588960..9b0c4aefb3b 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/RequestItemIterator.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/RequestItemIterator.java @@ -22,6 +22,7 @@ import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; + import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/filters/CsrfPreventionFilter.java b/appserver/web/web-core/src/main/java/org/apache/catalina/filters/CsrfPreventionFilter.java index 55f51dd0302..9931795b706 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/filters/CsrfPreventionFilter.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/filters/CsrfPreventionFilter.java @@ -20,15 +20,6 @@ package org.apache.catalina.filters; -import org.apache.catalina.LogFacade; - -import java.io.IOException; -import java.io.Serializable; -import java.security.SecureRandom; -import java.text.MessageFormat; -import java.util.*; -import java.util.logging.Logger; - import jakarta.servlet.FilterChain; import jakarta.servlet.FilterConfig; import jakarta.servlet.ServletException; @@ -39,6 +30,19 @@ import jakarta.servlet.http.HttpServletResponseWrapper; import jakarta.servlet.http.HttpSession; +import java.io.IOException; +import java.io.Serializable; +import java.security.SecureRandom; +import java.text.MessageFormat; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Random; +import java.util.Set; +import java.util.logging.Logger; + +import org.apache.catalina.LogFacade; + /** * Provides basic CSRF protection for a web application. The filter assumes * that: diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/filters/FilterBase.java b/appserver/web/web-core/src/main/java/org/apache/catalina/filters/FilterBase.java index d6ce0efcc53..8f992c190f1 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/filters/FilterBase.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/filters/FilterBase.java @@ -20,16 +20,16 @@ package org.apache.catalina.filters; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; + import java.text.MessageFormat; import java.util.Enumeration; import java.util.ResourceBundle; import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.servlet.Filter; -import jakarta.servlet.FilterConfig; -import jakarta.servlet.ServletException; - import org.apache.catalina.LogFacade; import org.glassfish.web.util.IntrospectionUtils; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/loader/StandardClassLoader.java b/appserver/web/web-core/src/main/java/org/apache/catalina/loader/StandardClassLoader.java index e12b7b7920f..6465c6cfb2c 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/loader/StandardClassLoader.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/loader/StandardClassLoader.java @@ -17,23 +17,36 @@ package org.apache.catalina.loader; -import org.apache.catalina.LogFacade; -import static com.sun.logging.LogCleanerUtil.neutralizeForLog; -import org.apache.naming.JndiPermission; -import org.glassfish.web.loader.Reloader; - import java.io.File; import java.io.FilePermission; import java.io.IOException; import java.io.InputStream; -import java.net.*; -import java.security.*; -import java.util.*; +import java.net.JarURLConnection; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.net.URLConnection; +import java.net.URLStreamHandler; +import java.net.URLStreamHandlerFactory; +import java.security.AccessControlException; +import java.security.CodeSource; +import java.security.Permission; +import java.security.PermissionCollection; +import java.security.Policy; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.HashMap; import java.util.jar.JarFile; import java.util.jar.JarInputStream; import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.catalina.LogFacade; +import org.apache.naming.JndiPermission; +import org.glassfish.web.loader.Reloader; + +import static com.sun.logging.LogCleanerUtil.neutralizeForLog; + /** * Subclass implementation of java.net.URLClassLoader that knows how * to load classes from disk directories, as well as local and remote JAR diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/logger/FileLogger.java b/appserver/web/web-core/src/main/java/org/apache/catalina/logger/FileLogger.java index bb3b535bfa5..71c1c10cf5b 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/logger/FileLogger.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/logger/FileLogger.java @@ -18,15 +18,15 @@ package org.apache.catalina.logger; -import org.apache.catalina.LifecycleException; -import org.apache.catalina.LogFacade; - import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; import java.sql.Timestamp; +import org.apache.catalina.LifecycleException; +import org.apache.catalina.LogFacade; + /** * Implementation of Logger that appends log messages to a file diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/logger/LoggerBase.java b/appserver/web/web-core/src/main/java/org/apache/catalina/logger/LoggerBase.java index 8cbda41504d..e00816797e2 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/logger/LoggerBase.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/logger/LoggerBase.java @@ -18,18 +18,8 @@ package org.apache.catalina.logger; -import org.apache.catalina.Container; -import org.apache.catalina.Lifecycle; -import org.apache.catalina.LifecycleException; -import org.apache.catalina.LifecycleListener; -import org.apache.catalina.LogFacade; -import org.apache.catalina.core.StandardContext; -import org.apache.catalina.core.StandardEngine; -import org.apache.catalina.core.StandardHost; -import org.apache.catalina.util.LifecycleSupport; -import static com.sun.logging.LogCleanerUtil.neutralizeForLog; -import javax.management.ObjectName; import jakarta.servlet.ServletException; + import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.io.CharArrayWriter; @@ -41,6 +31,20 @@ import java.util.logging.Level; import java.util.logging.Logger; +import javax.management.ObjectName; + +import org.apache.catalina.Container; +import org.apache.catalina.Lifecycle; +import org.apache.catalina.LifecycleException; +import org.apache.catalina.LifecycleListener; +import org.apache.catalina.LogFacade; +import org.apache.catalina.core.StandardContext; +import org.apache.catalina.core.StandardEngine; +import org.apache.catalina.core.StandardHost; +import org.apache.catalina.util.LifecycleSupport; + +import static com.sun.logging.LogCleanerUtil.neutralizeForLog; + /** * Convenience base class for Logger implementations. The only diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/CGIServlet.java b/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/CGIServlet.java index b83104e4e88..7f38e1b86ac 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/CGIServlet.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/CGIServlet.java @@ -17,6 +17,18 @@ package org.apache.catalina.servlets; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.UnavailableException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; + import java.io.BufferedOutputStream; import java.io.BufferedReader; import java.io.File; @@ -35,12 +47,8 @@ import java.util.StringTokenizer; import java.util.Vector; -import jakarta.servlet.*; -import jakarta.servlet.http.*; - import org.apache.catalina.Globals; import org.apache.catalina.util.IOTools; - import org.glassfish.web.util.HtmlEntityEncoder; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/InvokerServlet.java b/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/InvokerServlet.java index 0a931998020..431a7f74b42 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/InvokerServlet.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/InvokerServlet.java @@ -18,11 +18,6 @@ package org.apache.catalina.servlets; -import org.apache.catalina.ContainerServlet; -import org.apache.catalina.Context; -import org.apache.catalina.Globals; -import org.apache.catalina.LogFacade; -import org.apache.catalina.Wrapper; import jakarta.servlet.RequestDispatcher; import jakarta.servlet.Servlet; import jakarta.servlet.ServletException; @@ -30,10 +25,17 @@ import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.text.MessageFormat; import java.util.ResourceBundle; +import org.apache.catalina.ContainerServlet; +import org.apache.catalina.Context; +import org.apache.catalina.Globals; +import org.apache.catalina.LogFacade; +import org.apache.catalina.Wrapper; + /** * The default servlet-invoking servlet for most web applications, diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/WebdavServlet.java b/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/WebdavServlet.java index 5d2a72a43dc..ccd813c03ad 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/WebdavServlet.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/WebdavServlet.java @@ -17,6 +17,12 @@ package org.apache.catalina.servlets; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; @@ -33,15 +39,11 @@ import java.util.Stack; import java.util.TimeZone; import java.util.Vector; + import javax.naming.NameClassPair; import javax.naming.NamingEnumeration; import javax.naming.NamingException; import javax.naming.directory.DirContext; -import jakarta.servlet.RequestDispatcher; -import jakarta.servlet.ServletContext; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/session/BaseSessionLocker.java b/appserver/web/web-core/src/main/java/org/apache/catalina/session/BaseSessionLocker.java index b8eca7910d1..0684451a541 100755 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/session/BaseSessionLocker.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/session/BaseSessionLocker.java @@ -23,12 +23,12 @@ package org.apache.catalina.session; -import org.apache.catalina.Context; -import org.apache.catalina.SessionLocker; - import jakarta.servlet.ServletException; import jakarta.servlet.ServletRequest; +import org.apache.catalina.Context; +import org.apache.catalina.SessionLocker; + /** * * @author lwhite diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/session/CookiePersistentManager.java b/appserver/web/web-core/src/main/java/org/apache/catalina/session/CookiePersistentManager.java index 950713ceade..4354c4930ab 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/session/CookiePersistentManager.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/session/CookiePersistentManager.java @@ -16,12 +16,18 @@ package org.apache.catalina.session; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; + +import java.io.IOException; +import java.text.MessageFormat; +import java.util.HashSet; +import java.util.Map; +import java.util.ResourceBundle; +import java.util.Set; + import org.apache.catalina.LogFacade; import org.apache.catalina.Session; -import java.io.*; -import java.text.MessageFormat; -import java.util.*; -import jakarta.servlet.http.*; /** * Session manager for cookie-based persistence, where cookies carry session state. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/session/FileStore.java b/appserver/web/web-core/src/main/java/org/apache/catalina/session/FileStore.java index 800759de3bf..27a3d74536f 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/session/FileStore.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/session/FileStore.java @@ -18,14 +18,8 @@ package org.apache.catalina.session; -import org.apache.catalina.Container; -import org.apache.catalina.Context; -import org.apache.catalina.Loader; -import org.apache.catalina.LogFacade; -import org.apache.catalina.Session; -import org.apache.catalina.core.StandardContext; - import jakarta.servlet.ServletContext; + import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.File; @@ -42,6 +36,13 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.catalina.Container; +import org.apache.catalina.Context; +import org.apache.catalina.Loader; +import org.apache.catalina.LogFacade; +import org.apache.catalina.Session; +import org.apache.catalina.core.StandardContext; + /** * Concrete implementation of the Store interface that utilizes * a file per saved Session in a configured directory. Sessions that are diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/session/JDBCStore.java b/appserver/web/web-core/src/main/java/org/apache/catalina/session/JDBCStore.java index 7f36e85b172..327a840ade6 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/session/JDBCStore.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/session/JDBCStore.java @@ -17,6 +17,23 @@ package org.apache.catalina.session; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.ResourceBundle; + import org.apache.catalina.Container; import org.apache.catalina.LifecycleException; import org.apache.catalina.Loader; @@ -24,12 +41,6 @@ import org.apache.catalina.Session; import org.apache.catalina.util.CustomObjectInputStream; -import java.io.*; -import java.sql.*; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.ResourceBundle; - /** * Implementation of the Store interface that stores * serialized session objects in a database. Sessions that are diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/session/ManagerBase.java b/appserver/web/web-core/src/main/java/org/apache/catalina/session/ManagerBase.java index 6ff3adfad83..ab0965e6caf 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/session/ManagerBase.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/session/ManagerBase.java @@ -19,15 +19,14 @@ import com.sun.enterprise.util.uuid.UuidGenerator; import com.sun.enterprise.util.uuid.UuidGeneratorImpl; -import org.apache.catalina.*; -import org.apache.catalina.core.StandardContext; -import org.apache.catalina.core.StandardHost; -import static com.sun.logging.LogCleanerUtil.neutralizeForLog; -import javax.management.ObjectName; + import jakarta.servlet.ServletException; import jakarta.servlet.ServletRequest; import jakarta.servlet.ServletResponse; -import jakarta.servlet.http.*; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; + import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.io.DataInputStream; @@ -37,12 +36,33 @@ import java.security.AccessController; import java.security.PrivilegedAction; import java.text.MessageFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.ResourceBundle; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; //end HERCULES:added +import javax.management.ObjectName; + +import org.apache.catalina.Container; +import org.apache.catalina.Engine; +import org.apache.catalina.Globals; +import org.apache.catalina.LogFacade; +import org.apache.catalina.Manager; +import org.apache.catalina.Session; +import org.apache.catalina.SessionLocker; +import org.apache.catalina.core.StandardContext; +import org.apache.catalina.core.StandardHost; + +import static com.sun.logging.LogCleanerUtil.neutralizeForLog; + /** * Minimal implementation of the Manager interface that supports diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/session/PersistentManagerBase.java b/appserver/web/web-core/src/main/java/org/apache/catalina/session/PersistentManagerBase.java index 286c1bf97ae..4eab724aa32 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/session/PersistentManagerBase.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/session/PersistentManagerBase.java @@ -17,11 +17,6 @@ package org.apache.catalina.session; -import org.apache.catalina.*; -import org.apache.catalina.core.StandardContext; -import org.apache.catalina.security.SecurityUtil; -import org.apache.catalina.util.LifecycleSupport; - import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.IOException; @@ -34,6 +29,18 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; +import org.apache.catalina.Container; +import org.apache.catalina.Context; +import org.apache.catalina.Lifecycle; +import org.apache.catalina.LifecycleException; +import org.apache.catalina.LifecycleListener; +import org.apache.catalina.LogFacade; +import org.apache.catalina.Session; +import org.apache.catalina.Store; +import org.apache.catalina.core.StandardContext; +import org.apache.catalina.security.SecurityUtil; +import org.apache.catalina.util.LifecycleSupport; + /** * Extends the ManagerBase class to implement most of the * functionality required by a Manager which supports any kind of diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/session/StandardManager.java b/appserver/web/web-core/src/main/java/org/apache/catalina/session/StandardManager.java index 0e019a44523..584781d12e2 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/session/StandardManager.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/session/StandardManager.java @@ -20,15 +20,21 @@ package org.apache.catalina.session; -import org.apache.catalina.*; -import org.apache.catalina.core.StandardContext; -import org.apache.catalina.security.SecurityUtil; -import org.apache.catalina.util.LifecycleSupport; - import jakarta.servlet.ServletContext; + import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.OutputStream; import java.security.AccessController; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; @@ -36,6 +42,17 @@ import java.util.List; import java.util.logging.Level; +import org.apache.catalina.Container; +import org.apache.catalina.Context; +import org.apache.catalina.Lifecycle; +import org.apache.catalina.LifecycleException; +import org.apache.catalina.LifecycleListener; +import org.apache.catalina.LogFacade; +import org.apache.catalina.Session; +import org.apache.catalina.core.StandardContext; +import org.apache.catalina.security.SecurityUtil; +import org.apache.catalina.util.LifecycleSupport; + /** * Standard implementation of the Manager interface that provides * simple session persistence across restarts of this component (such as diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/session/StandardSession.java b/appserver/web/web-core/src/main/java/org/apache/catalina/session/StandardSession.java index ddfee7fcd39..fe0551f27da 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/session/StandardSession.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/session/StandardSession.java @@ -21,28 +21,56 @@ package org.apache.catalina.session; import com.sun.enterprise.spi.io.BaseIndirectlySerializable; -import static com.sun.logging.LogCleanerUtil.neutralizeForLog; -import org.apache.catalina.*; -import org.apache.catalina.core.StandardContext; -import org.apache.catalina.security.SecurityUtil; -import org.apache.catalina.util.Enumerator; -import org.apache.tomcat.util.security.PrivilegedSetTccl; import jakarta.servlet.ServletContext; -import jakarta.servlet.http.*; -import java.io.*; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSessionActivationListener; +import jakarta.servlet.http.HttpSessionAttributeListener; +import jakarta.servlet.http.HttpSessionBindingEvent; +import jakarta.servlet.http.HttpSessionBindingListener; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionIdListener; +import jakarta.servlet.http.HttpSessionListener; + +import java.io.IOException; +import java.io.NotSerializableException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; import java.lang.reflect.Method; import java.security.AccessController; import java.security.Principal; import java.security.PrivilegedAction; import java.text.MessageFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.EventListener; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.ResourceBundle; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; import java.util.logging.Level; import java.util.logging.Logger; //end HERCULES:add +import org.apache.catalina.ContainerEvent; +import org.apache.catalina.Context; +import org.apache.catalina.Globals; +import org.apache.catalina.LogFacade; +import org.apache.catalina.Manager; +import org.apache.catalina.Session; +import org.apache.catalina.SessionEvent; +import org.apache.catalina.SessionListener; +import org.apache.catalina.core.StandardContext; +import org.apache.catalina.security.SecurityUtil; +import org.apache.catalina.util.Enumerator; +import org.apache.tomcat.util.security.PrivilegedSetTccl; + +import static com.sun.logging.LogCleanerUtil.neutralizeForLog; + /** diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/session/StandardSessionFacade.java b/appserver/web/web-core/src/main/java/org/apache/catalina/session/StandardSessionFacade.java index d5c7ced3806..36c6f534b11 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/session/StandardSessionFacade.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/session/StandardSessionFacade.java @@ -20,6 +20,7 @@ import jakarta.servlet.ServletContext; import jakarta.servlet.http.HttpSession; + import java.util.Enumeration; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/session/StoreBase.java b/appserver/web/web-core/src/main/java/org/apache/catalina/session/StoreBase.java index 3b2a3c7fcf1..48ad0291a72 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/session/StoreBase.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/session/StoreBase.java @@ -17,9 +17,6 @@ package org.apache.catalina.session; -import org.apache.catalina.*; -import org.apache.catalina.util.LifecycleSupport; -import static com.sun.logging.LogCleanerUtil.neutralizeForLog; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.io.IOException; @@ -30,6 +27,19 @@ import java.util.logging.Level; //HERCULES:end added +import org.apache.catalina.Container; +import org.apache.catalina.Lifecycle; +import org.apache.catalina.LifecycleException; +import org.apache.catalina.LifecycleListener; +import org.apache.catalina.LogFacade; +import org.apache.catalina.Logger; +import org.apache.catalina.Manager; +import org.apache.catalina.Session; +import org.apache.catalina.Store; +import org.apache.catalina.util.LifecycleSupport; + +import static com.sun.logging.LogCleanerUtil.neutralizeForLog; + /** * Abstract implementation of the Store interface to * support most of the functionality required by a Store. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java index 0d1d300e220..0d13c392679 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java @@ -19,6 +19,7 @@ import jakarta.servlet.ServletOutputStream; import jakarta.servlet.WriteListener; + import java.io.ByteArrayOutputStream; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java index 8ce2e358afc..48b96d3f01a 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java @@ -22,6 +22,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponseWrapper; + import java.io.IOException; import java.io.OutputStreamWriter; import java.io.PrintWriter; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIConfig.java b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIConfig.java index 0cd9fec1e9c..23d88bc5756 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIConfig.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIConfig.java @@ -17,9 +17,9 @@ package org.apache.catalina.ssi; -import org.glassfish.web.util.HtmlEntityEncoder; - import java.io.PrintWriter; + +import org.glassfish.web.util.HtmlEntityEncoder; /** * Implements the Server-side #exec command * diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIEcho.java b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIEcho.java index d5ab72d29bd..d521cdf1caa 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIEcho.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIEcho.java @@ -18,9 +18,9 @@ package org.apache.catalina.ssi; -import org.glassfish.web.util.HtmlEntityEncoder; - import java.io.PrintWriter; + +import org.glassfish.web.util.HtmlEntityEncoder; /** * Return the result associated with the supplied Server Variable. * diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIExec.java b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIExec.java index 7c5fb6dc696..4359d158ee9 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIExec.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIExec.java @@ -18,13 +18,13 @@ package org.apache.catalina.ssi; -import org.apache.catalina.util.IOTools; -import org.glassfish.web.util.HtmlEntityEncoder; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.io.PrintWriter; + +import org.apache.catalina.util.IOTools; +import org.glassfish.web.util.HtmlEntityEncoder; /** * Implements the Server-side #exec command * diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIFilter.java b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIFilter.java index 1ad76b003e2..ef648374113 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIFilter.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIFilter.java @@ -18,15 +18,28 @@ package org.apache.catalina.ssi; -import org.apache.catalina.Globals; - -import jakarta.servlet.*; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import java.io.*; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.io.Reader; import java.nio.charset.Charset; import java.util.regex.Matcher; import java.util.regex.Pattern; + +import org.apache.catalina.Globals; /** * Filter to process SSI requests within a webpage. Mapped to a content types * from within web.xml. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIFlastmod.java b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIFlastmod.java index e4107c8d326..23cf1b71d3d 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIFlastmod.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIFlastmod.java @@ -18,13 +18,13 @@ package org.apache.catalina.ssi; -import org.apache.catalina.util.Strftime; -import org.glassfish.web.util.HtmlEntityEncoder; - import java.io.IOException; import java.io.PrintWriter; import java.util.Date; import java.util.Locale; + +import org.apache.catalina.util.Strftime; +import org.glassfish.web.util.HtmlEntityEncoder; /** * Implements the Server-side #flastmod command * diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIFsize.java b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIFsize.java index 79871d16a1e..d3cfe7c70d9 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIFsize.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIFsize.java @@ -17,11 +17,11 @@ package org.apache.catalina.ssi; -import org.glassfish.web.util.HtmlEntityEncoder; - import java.io.IOException; import java.io.PrintWriter; import java.text.DecimalFormat; + +import org.glassfish.web.util.HtmlEntityEncoder; /** * Implements the Server-side #fsize command * diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIInclude.java b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIInclude.java index 032400100a8..2c84bc58172 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIInclude.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIInclude.java @@ -17,10 +17,10 @@ package org.apache.catalina.ssi; -import org.glassfish.web.util.HtmlEntityEncoder; - import java.io.IOException; import java.io.PrintWriter; + +import org.glassfish.web.util.HtmlEntityEncoder; /** * Implements the Server-side #include command * diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIMediator.java b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIMediator.java index 44a9e38fa6b..230a8030f48 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIMediator.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIMediator.java @@ -18,9 +18,6 @@ package org.apache.catalina.ssi; -import org.apache.catalina.util.Strftime; -import org.apache.catalina.util.URLEncoder; - import java.io.IOException; import java.util.Collection; import java.util.Date; @@ -29,6 +26,9 @@ import java.util.Locale; import java.util.Set; import java.util.TimeZone; + +import org.apache.catalina.util.Strftime; +import org.apache.catalina.util.URLEncoder; import org.glassfish.grizzly.http.util.HttpUtils; /** diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIPrintenv.java b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIPrintenv.java index 583fb61319a..630fd2bb6d4 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIPrintenv.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIPrintenv.java @@ -18,11 +18,11 @@ package org.apache.catalina.ssi; -import org.glassfish.web.util.HtmlEntityEncoder; - import java.io.PrintWriter; import java.util.Collection; import java.util.Iterator; + +import org.glassfish.web.util.HtmlEntityEncoder; /** * Implements the Server-side #printenv command * diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIProcessor.java b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIProcessor.java index dd0c4b8445d..3cffe47aff9 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIProcessor.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIProcessor.java @@ -18,9 +18,6 @@ package org.apache.catalina.ssi; -import org.apache.catalina.util.IOTools; -import org.glassfish.web.util.HtmlEntityEncoder; - import java.io.IOException; import java.io.PrintWriter; import java.io.Reader; @@ -28,6 +25,9 @@ import java.util.HashMap; import java.util.Locale; import java.util.StringTokenizer; + +import org.apache.catalina.util.IOTools; +import org.glassfish.web.util.HtmlEntityEncoder; /** * The entry point to SSI processing. This class does the actual parsing, * delegating to the SSIMediator, SSICommand, and SSIExternalResolver as diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIServlet.java b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIServlet.java index e915bcfdae4..6e89a7d0231 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIServlet.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIServlet.java @@ -18,13 +18,12 @@ package org.apache.catalina.ssi; -import org.apache.catalina.Globals; -import static com.sun.logging.LogCleanerUtil.neutralizeForLog; import jakarta.servlet.ServletContext; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -34,6 +33,10 @@ import java.net.URL; import java.net.URLConnection; import java.util.Locale; + +import org.apache.catalina.Globals; + +import static com.sun.logging.LogCleanerUtil.neutralizeForLog; /** * Servlet to process SSI requests within a webpage. Mapped to a path from * within web.xml. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIServletExternalResolver.java b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIServletExternalResolver.java index 43f9f2a5b3c..0f628def8c2 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIServletExternalResolver.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIServletExternalResolver.java @@ -18,13 +18,12 @@ package org.apache.catalina.ssi; -import org.apache.catalina.util.RequestUtil; - import jakarta.servlet.RequestDispatcher; import jakarta.servlet.ServletContext; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URL; @@ -35,6 +34,8 @@ import java.util.Date; import java.util.Enumeration; import java.util.Locale; + +import org.apache.catalina.util.RequestUtil; import org.glassfish.grizzly.utils.Charsets; /** diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIServletRequestUtil.java b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIServletRequestUtil.java index ff8f126cb5e..b7fb01fc3ef 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIServletRequestUtil.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIServletRequestUtil.java @@ -18,9 +18,9 @@ package org.apache.catalina.ssi; -import org.apache.catalina.util.RequestUtil; - import jakarta.servlet.http.HttpServletRequest; + +import org.apache.catalina.util.RequestUtil; public class SSIServletRequestUtil { /** * Return the relative path associated with this servlet. Taken from diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSISet.java b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSISet.java index 31a84888679..558c4f5ec53 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSISet.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSISet.java @@ -17,9 +17,9 @@ package org.apache.catalina.ssi; -import org.glassfish.web.util.HtmlEntityEncoder; - import java.io.PrintWriter; + +import org.glassfish.web.util.HtmlEntityEncoder; /** * Implements the Server-side #set command * diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/Bootstrap.java b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/Bootstrap.java index 346b98a94e7..56c874333e4 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/Bootstrap.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/Bootstrap.java @@ -17,9 +17,6 @@ package org.apache.catalina.startup; -import org.apache.catalina.LogFacade; -import org.apache.catalina.security.SecurityClassLoad; - import java.io.File; import java.lang.reflect.Method; import java.net.MalformedURLException; @@ -29,6 +26,9 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.catalina.LogFacade; +import org.apache.catalina.security.SecurityClassLoad; + /** * Boostrap loader for Catalina. This application constructs a class loader diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/Catalina.java b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/Catalina.java index be15a24db5f..d55c9ab2c02 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/Catalina.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/Catalina.java @@ -17,6 +17,15 @@ package org.apache.catalina.startup; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.Socket; +import java.text.MessageFormat; +import java.util.logging.Level; + import org.apache.catalina.Container; import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleException; @@ -28,11 +37,6 @@ import org.xml.sax.Attributes; import org.xml.sax.InputSource; -import java.io.*; -import java.net.Socket; -import java.text.MessageFormat; -import java.util.logging.Level; - /** * Startup/Shutdown shell program for Catalina. The following command line * options are recognized: diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/CatalinaProperties.java b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/CatalinaProperties.java index 011293c6a9f..9125182fde7 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/CatalinaProperties.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/CatalinaProperties.java @@ -17,8 +17,6 @@ package org.apache.catalina.startup; -import org.apache.catalina.LogFacade; - import java.io.File; import java.io.FileInputStream; import java.io.InputStream; @@ -28,6 +26,8 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.catalina.LogFacade; + /** * Utility class to read the bootstrap Catalina configuration. * diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/ClassLoaderFactory.java b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/ClassLoaderFactory.java index 6221d08c039..aeddb2582e2 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/ClassLoaderFactory.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/ClassLoaderFactory.java @@ -17,9 +17,6 @@ package org.apache.catalina.startup; -import org.apache.catalina.LogFacade; -import org.apache.catalina.loader.StandardClassLoader; - import java.io.File; import java.net.URL; import java.security.AccessController; @@ -30,6 +27,9 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.catalina.LogFacade; +import org.apache.catalina.loader.StandardClassLoader; + /** *

      Utility class for building class loaders for Catalina. The factory diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/ContextConfig.java b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/ContextConfig.java index 24637f63f04..b59ba98f30a 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/ContextConfig.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/ContextConfig.java @@ -17,9 +17,45 @@ package org.apache.catalina.startup; -import org.apache.catalina.*; -import org.apache.catalina.authenticator.*; -import org.apache.catalina.core.*; +import jakarta.servlet.ServletContext; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.text.MessageFormat; +import java.util.Iterator; +import java.util.Locale; +import java.util.Map; +import java.util.Properties; +import java.util.ResourceBundle; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.apache.catalina.Authenticator; +import org.apache.catalina.Container; +import org.apache.catalina.Context; +import org.apache.catalina.Globals; +import org.apache.catalina.Host; +import org.apache.catalina.Lifecycle; +import org.apache.catalina.LifecycleEvent; +import org.apache.catalina.LifecycleException; +import org.apache.catalina.LifecycleListener; +import org.apache.catalina.LogFacade; +import org.apache.catalina.Pipeline; +import org.apache.catalina.Realm; +import org.apache.catalina.Wrapper; +import org.apache.catalina.authenticator.BasicAuthenticator; +import org.apache.catalina.authenticator.DigestAuthenticator; +import org.apache.catalina.authenticator.FormAuthenticator; +import org.apache.catalina.authenticator.NonLoginAuthenticator; +import org.apache.catalina.authenticator.SSLAuthenticator; +import org.apache.catalina.core.ContainerBase; +import org.apache.catalina.core.StandardContext; +import org.apache.catalina.core.StandardEngine; +import org.apache.catalina.core.StandardHost; import org.apache.catalina.deploy.FilterDef; import org.apache.catalina.deploy.LoginConfig; import org.apache.catalina.deploy.SecurityConstraint; @@ -31,14 +67,6 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXParseException; -import jakarta.servlet.ServletContext; -import java.io.*; -import java.net.URL; -import java.text.MessageFormat; -import java.util.*; -import java.util.logging.*; -import java.util.logging.Logger; - /** * Startup event listener for a Context that configures the properties * of that Context, and the associated defined servlets. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/ContextRuleSet.java b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/ContextRuleSet.java index a776965db75..02b80ecb09f 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/ContextRuleSet.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/ContextRuleSet.java @@ -18,6 +18,8 @@ package org.apache.catalina.startup; +import java.lang.reflect.Constructor; + import org.apache.catalina.Container; import org.apache.catalina.Loader; import org.apache.tomcat.util.digester.Digester; @@ -25,8 +27,6 @@ import org.apache.tomcat.util.digester.RuleSetBase; import org.xml.sax.Attributes; -import java.lang.reflect.Constructor; - /** *

      RuleSet for processing the contents of a diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java index 8e3f48a0dd7..fe7633002d3 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java @@ -18,13 +18,13 @@ package org.apache.catalina.startup; +import java.lang.reflect.Method; + import org.apache.catalina.Container; import org.apache.tomcat.util.digester.Digester; import org.apache.tomcat.util.digester.Rule; import org.xml.sax.Attributes; -import java.lang.reflect.Method; - /** *

      Rule that copies the parentClassLoader property from the diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/DigesterFactory.java b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/DigesterFactory.java index d6e44ca1fbb..72498c9632b 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/DigesterFactory.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/DigesterFactory.java @@ -17,21 +17,23 @@ package org.apache.catalina.startup; +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import java.net.URL; +import java.util.logging.Logger; + +import javax.xml.parsers.ParserConfigurationException; + import org.apache.catalina.LogFacade; import org.apache.tomcat.util.digester.Digester; import org.apache.tomcat.util.digester.RuleSet; -import jakarta.inject.Inject; -import jakarta.inject.Named; import org.jvnet.hk2.annotations.Optional; import org.jvnet.hk2.annotations.Service; import org.xml.sax.EntityResolver; import org.xml.sax.SAXNotRecognizedException; import org.xml.sax.SAXNotSupportedException; -import javax.xml.parsers.ParserConfigurationException; -import java.net.URL; -import java.util.logging.Logger; - /** * Wrapper class around the Digester that hide Digester's initialization details * diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/Embedded.java b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/Embedded.java index 2e8226d874d..332c149616f 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/Embedded.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/Embedded.java @@ -18,16 +18,6 @@ package org.apache.catalina.startup; -import org.apache.catalina.core.*; -import org.glassfish.web.util.IntrospectionUtils; -import org.apache.catalina.*; -import org.apache.catalina.loader.WebappLoader; -import org.apache.catalina.net.ServerSocketFactory; -import org.apache.catalina.security.SecurityConfig; -import org.apache.catalina.util.LifecycleSupport; -import org.apache.catalina.util.ServerInfo; -import org.glassfish.web.valve.GlassFishValve; - import java.io.File; import java.io.IOException; import java.net.InetAddress; @@ -39,6 +29,30 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.catalina.Authenticator; +import org.apache.catalina.Connector; +import org.apache.catalina.Container; +import org.apache.catalina.Context; +import org.apache.catalina.Engine; +import org.apache.catalina.Host; +import org.apache.catalina.Lifecycle; +import org.apache.catalina.LifecycleException; +import org.apache.catalina.LifecycleListener; +import org.apache.catalina.Loader; +import org.apache.catalina.LogFacade; +import org.apache.catalina.Realm; +import org.apache.catalina.core.StandardContext; +import org.apache.catalina.core.StandardEngine; +import org.apache.catalina.core.StandardHost; +import org.apache.catalina.core.StandardService; +import org.apache.catalina.loader.WebappLoader; +import org.apache.catalina.net.ServerSocketFactory; +import org.apache.catalina.security.SecurityConfig; +import org.apache.catalina.util.LifecycleSupport; +import org.apache.catalina.util.ServerInfo; +import org.glassfish.web.util.IntrospectionUtils; +import org.glassfish.web.valve.GlassFishValve; + /** * Convenience class to embed a Catalina servlet container environment * inside another application. You must call the methods of this class in the diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/EngineConfig.java b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/EngineConfig.java index 167328f735d..112adccf84f 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/EngineConfig.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/EngineConfig.java @@ -18,14 +18,18 @@ package org.apache.catalina.startup; -import org.apache.catalina.*; -import org.apache.catalina.Logger; -import org.apache.catalina.core.StandardEngine; - import java.text.MessageFormat; import java.util.ResourceBundle; import java.util.logging.Level; +import org.apache.catalina.Engine; +import org.apache.catalina.Lifecycle; +import org.apache.catalina.LifecycleEvent; +import org.apache.catalina.LifecycleListener; +import org.apache.catalina.LogFacade; +import org.apache.catalina.Logger; +import org.apache.catalina.core.StandardEngine; + /** * Startup event listener for a Engine that configures the properties diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/ExpandWar.java b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/ExpandWar.java index a6b41b8854c..dfb1fb18073 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/ExpandWar.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/ExpandWar.java @@ -17,10 +17,12 @@ package org.apache.catalina.startup; -import org.apache.catalina.Host; -import org.apache.catalina.LogFacade; - -import java.io.*; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; import java.net.JarURLConnection; import java.net.URL; import java.nio.channels.FileChannel; @@ -32,6 +34,9 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.catalina.Host; +import org.apache.catalina.LogFacade; + /** * Expand out a WAR in a Host's appBase. * diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/HostConfig.java b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/HostConfig.java index 2d8de7fa20a..5df833a32bd 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/HostConfig.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/HostConfig.java @@ -18,21 +18,41 @@ package org.apache.catalina.startup; -import org.apache.catalina.*; -import org.apache.catalina.core.StandardHost; -import org.apache.naming.resources.ResourceAttributes; - -import javax.naming.NamingException; -import javax.naming.directory.DirContext; -import java.io.*; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; import java.net.URL; import java.text.MessageFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.ResourceBundle; +import java.util.Set; import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.logging.Level; import java.util.logging.Logger; +import javax.naming.NamingException; +import javax.naming.directory.DirContext; + +import org.apache.catalina.Container; +import org.apache.catalina.Context; +import org.apache.catalina.Deployer; +import org.apache.catalina.Engine; +import org.apache.catalina.Host; +import org.apache.catalina.Lifecycle; +import org.apache.catalina.LifecycleEvent; +import org.apache.catalina.LifecycleListener; +import org.apache.catalina.LogFacade; +import org.apache.catalina.core.StandardHost; +import org.apache.naming.resources.ResourceAttributes; + /** * Startup event listener for a Host that configures the properties diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/SetAllPropertiesRule.java b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/SetAllPropertiesRule.java index c1ea26206b8..a3b49e461ff 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/SetAllPropertiesRule.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/SetAllPropertiesRule.java @@ -17,8 +17,8 @@ package org.apache.catalina.startup; -import org.glassfish.web.util.IntrospectionUtils; import org.apache.tomcat.util.digester.Rule; +import org.glassfish.web.util.IntrospectionUtils; import org.xml.sax.Attributes; /** diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/SetContextPropertiesRule.java b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/SetContextPropertiesRule.java index 9d6e8077236..79ad7eef048 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/SetContextPropertiesRule.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/SetContextPropertiesRule.java @@ -17,8 +17,8 @@ package org.apache.catalina.startup; -import org.glassfish.web.util.IntrospectionUtils; import org.apache.tomcat.util.digester.Rule; +import org.glassfish.web.util.IntrospectionUtils; import org.xml.sax.Attributes; /** diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/SetDocBaseRule.java b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/SetDocBaseRule.java index db3fe06d7d9..a06e922d65b 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/SetDocBaseRule.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/SetDocBaseRule.java @@ -17,6 +17,11 @@ package org.apache.catalina.startup; +import java.io.File; +import java.lang.reflect.Method; +import java.net.URL; +import java.util.Locale; + import org.apache.catalina.Context; import org.apache.catalina.Deployer; import org.apache.catalina.Host; @@ -25,11 +30,6 @@ import org.apache.tomcat.util.digester.Rule; import org.xml.sax.Attributes; -import java.io.File; -import java.lang.reflect.Method; -import java.net.URL; -import java.util.Locale; - /** *

      Rule that modifies the docBase of the host, setting it appropriately, * before adding the Context to the parent Host.

      diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/Tool.java b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/Tool.java index 097f57f7594..f0b20b427fe 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/Tool.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/Tool.java @@ -18,8 +18,6 @@ package org.apache.catalina.startup; -import org.apache.catalina.LogFacade; - import java.io.File; import java.lang.reflect.Method; import java.text.MessageFormat; @@ -28,6 +26,8 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.catalina.LogFacade; + /** *

      General purpose wrapper for command line tools that should execute in an diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/UserConfig.java b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/UserConfig.java index b8377196d62..356672f673f 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/UserConfig.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/UserConfig.java @@ -17,14 +17,20 @@ package org.apache.catalina.startup; -import org.apache.catalina.*; -import org.apache.catalina.Logger; -import org.apache.catalina.core.StandardContext; import java.io.File; import java.text.MessageFormat; import java.util.Enumeration; import java.util.ResourceBundle; -import java.util.logging.*; +import java.util.logging.Level; + +import org.apache.catalina.Context; +import org.apache.catalina.Host; +import org.apache.catalina.Lifecycle; +import org.apache.catalina.LifecycleEvent; +import org.apache.catalina.LifecycleListener; +import org.apache.catalina.LogFacade; +import org.apache.catalina.Logger; +import org.apache.catalina.core.StandardContext; /** * Startup event listener for a Host that configures Contexts (web diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/WebRuleSet.java b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/WebRuleSet.java index 50988f1ab29..0ab5d67a309 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/WebRuleSet.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/WebRuleSet.java @@ -18,6 +18,8 @@ package org.apache.catalina.startup; +import java.lang.reflect.Method; + import org.apache.catalina.Context; import org.apache.catalina.Wrapper; import org.apache.catalina.deploy.SecurityConstraint; @@ -26,8 +28,6 @@ import org.apache.tomcat.util.digester.RuleSetBase; import org.xml.sax.Attributes; -import java.lang.reflect.Method; - /** *

      RuleSet for processing the contents of a web application diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/util/DOMWriter.java b/appserver/web/web-core/src/main/java/org/apache/catalina/util/DOMWriter.java index dd34448dd0d..088bdec9475 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/util/DOMWriter.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/util/DOMWriter.java @@ -17,13 +17,17 @@ package org.apache.catalina.util; -import org.w3c.dom.*; - import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.UnsupportedEncodingException; import java.io.Writer; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + /** * A sample DOM writer. This sample program illustrates how to * traverse a DOM tree in order to print a document that is parsed. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/util/ExtensionValidator.java b/appserver/web/web-core/src/main/java/org/apache/catalina/util/ExtensionValidator.java index 72c1ece2dc1..d11a14b432c 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/util/ExtensionValidator.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/util/ExtensionValidator.java @@ -17,14 +17,6 @@ package org.apache.catalina.util; -import org.apache.catalina.LogFacade; -import org.apache.catalina.core.StandardContext; -import org.apache.naming.resources.Resource; - -import javax.naming.Binding; -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; -import javax.naming.directory.DirContext; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -42,6 +34,15 @@ import java.util.logging.Level; import java.util.logging.Logger; +import javax.naming.Binding; +import javax.naming.NamingEnumeration; +import javax.naming.NamingException; +import javax.naming.directory.DirContext; + +import org.apache.catalina.LogFacade; +import org.apache.catalina.core.StandardContext; +import org.apache.naming.resources.Resource; + /** * Ensures that all extension dependies are resolved for a WEB application diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/util/HexUtils.java b/appserver/web/web-core/src/main/java/org/apache/catalina/util/HexUtils.java index 5409c2e4abe..7372d3bd79f 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/util/HexUtils.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/util/HexUtils.java @@ -17,10 +17,10 @@ package org.apache.catalina.util; -import org.apache.catalina.LogFacade; - import java.util.ResourceBundle; +import org.apache.catalina.LogFacade; + /** * Library of utility methods useful in dealing with converting byte arrays * to and from strings of hexadecimal digits. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/util/IOTools.java b/appserver/web/web-core/src/main/java/org/apache/catalina/util/IOTools.java index b00bf89bab1..9d7467343e2 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/util/IOTools.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/util/IOTools.java @@ -17,7 +17,11 @@ package org.apache.catalina.util; -import java.io.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.Reader; +import java.io.Writer; /** diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/util/InstanceSupport.java b/appserver/web/web-core/src/main/java/org/apache/catalina/util/InstanceSupport.java index cefed512ff7..fc93d0488b7 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/util/InstanceSupport.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/util/InstanceSupport.java @@ -18,19 +18,20 @@ package org.apache.catalina.util; -import org.apache.catalina.InstanceEvent; -import org.apache.catalina.InstanceListener; -import org.apache.catalina.Wrapper; - import jakarta.servlet.Filter; import jakarta.servlet.Servlet; import jakarta.servlet.ServletRequest; import jakarta.servlet.ServletResponse; + import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; // END SJSAS 6374619 +import org.apache.catalina.InstanceEvent; +import org.apache.catalina.InstanceListener; +import org.apache.catalina.Wrapper; + /** * Support class to assist in firing InstanceEvent notifications to * registered InstanceListeners. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/util/LifecycleSupport.java b/appserver/web/web-core/src/main/java/org/apache/catalina/util/LifecycleSupport.java index 74b5214495e..904ca2ebebf 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/util/LifecycleSupport.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/util/LifecycleSupport.java @@ -17,14 +17,14 @@ package org.apache.catalina.util; +import java.util.ArrayList; +import java.util.List; + import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleEvent; import org.apache.catalina.LifecycleException; import org.apache.catalina.LifecycleListener; -import java.util.ArrayList; -import java.util.List; - /** * Support class to assist in firing LifecycleEvent notifications to diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/util/ParameterMap.java b/appserver/web/web-core/src/main/java/org/apache/catalina/util/ParameterMap.java index f624751d95d..84873898f5c 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/util/ParameterMap.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/util/ParameterMap.java @@ -17,6 +17,10 @@ package org.apache.catalina.util; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.ResourceBundle; + /* START PWC 6057385 import java.util.HashMap; */ @@ -24,10 +28,6 @@ import org.apache.catalina.LogFacade; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.ResourceBundle; - /** * Extended implementation of HashMap that includes a diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/util/ProcessEnvironment.java b/appserver/web/web-core/src/main/java/org/apache/catalina/util/ProcessEnvironment.java index 84137259634..42c212b100b 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/util/ProcessEnvironment.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/util/ProcessEnvironment.java @@ -17,10 +17,9 @@ package org.apache.catalina.util; -import org.apache.catalina.LogFacade; - import jakarta.servlet.ServletContext; import jakarta.servlet.http.HttpServletRequest; + import java.io.File; import java.util.Enumeration; import java.util.Hashtable; @@ -28,6 +27,8 @@ import java.util.logging.Logger; // import org.apache.catalina.util.StringManager; +import org.apache.catalina.LogFacade; + /** diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/util/RequestUtil.java b/appserver/web/web-core/src/main/java/org/apache/catalina/util/RequestUtil.java index 5befea99b0b..5ab6873b653 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/util/RequestUtil.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/util/RequestUtil.java @@ -17,6 +17,8 @@ package org.apache.catalina.util; +import jakarta.servlet.http.Cookie; + import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; import java.nio.charset.UnsupportedCharsetException; @@ -24,7 +26,6 @@ import java.util.HashMap; import java.util.Map; import java.util.StringTokenizer; -import jakarta.servlet.http.Cookie; import org.apache.naming.Util; import org.glassfish.grizzly.http.util.ByteChunk; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/util/ResponseUtil.java b/appserver/web/web-core/src/main/java/org/apache/catalina/util/ResponseUtil.java index 6b686d5d020..4ce913b6fa8 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/util/ResponseUtil.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/util/ResponseUtil.java @@ -18,6 +18,7 @@ package org.apache.catalina.util; import jakarta.servlet.ServletOutputStream; + import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/util/SchemaResolver.java b/appserver/web/web-core/src/main/java/org/apache/catalina/util/SchemaResolver.java index 9cc24ab281d..100083b5de8 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/util/SchemaResolver.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/util/SchemaResolver.java @@ -18,16 +18,16 @@ package org.apache.catalina.util; -import org.apache.tomcat.util.digester.Digester; -import org.xml.sax.EntityResolver; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; - import java.net.URI; import java.net.URISyntaxException; import java.util.HashMap; // END PWC 6457880 +import org.apache.tomcat.util.digester.Digester; +import org.xml.sax.EntityResolver; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + /** * This class implements a local SAX's EntityResolver. All * DTDs and schemas used to validate the web.xml file will re-directed diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/util/URLEncoder.java b/appserver/web/web-core/src/main/java/org/apache/catalina/util/URLEncoder.java index 79944845ea5..dbb0692bb91 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/util/URLEncoder.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/util/URLEncoder.java @@ -17,8 +17,6 @@ package org.apache.catalina.util; -import org.apache.catalina.LogFacade; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; @@ -27,6 +25,8 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.catalina.LogFacade; + /** * * This class is very similar to the java.net.URLEncoder class. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/valves/AccessLogValve.java b/appserver/web/web-core/src/main/java/org/apache/catalina/valves/AccessLogValve.java index 55022ae00f9..2fe6bc080f2 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/valves/AccessLogValve.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/valves/AccessLogValve.java @@ -18,8 +18,6 @@ package org.apache.catalina.valves; -import org.apache.catalina.*; - import jakarta.servlet.ServletException; import jakarta.servlet.ServletRequest; import jakarta.servlet.ServletResponse; @@ -27,6 +25,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; + import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -38,6 +37,13 @@ import java.util.TimeZone; import java.util.logging.Level; +import org.apache.catalina.HttpResponse; +import org.apache.catalina.LifecycleException; +import org.apache.catalina.LogFacade; +import org.apache.catalina.Request; +import org.apache.catalina.Response; +import org.apache.catalina.Session; + /** *

      Implementation of the Valve interface that generates a web server * access log with the detailed line contents matching a configurable pattern. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/valves/ErrorReportValve.java b/appserver/web/web-core/src/main/java/org/apache/catalina/valves/ErrorReportValve.java index 32f59a95d49..58f142eea64 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/valves/ErrorReportValve.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/valves/ErrorReportValve.java @@ -18,20 +18,12 @@ package org.apache.catalina.valves; -import org.apache.catalina.HttpResponse; -import org.apache.catalina.LogFacade; -import org.apache.catalina.Logger; -import org.apache.catalina.Request; -import org.apache.catalina.Response; -import org.apache.catalina.util.ServerInfo; -import org.apache.catalina.util.StringManager; -import org.glassfish.web.util.HtmlEntityEncoder; - import jakarta.servlet.RequestDispatcher; import jakarta.servlet.ServletException; import jakarta.servlet.ServletRequest; import jakarta.servlet.ServletResponse; import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.io.Writer; import java.text.MessageFormat; @@ -39,6 +31,15 @@ import java.util.Locale; import java.util.logging.Level; +import org.apache.catalina.HttpResponse; +import org.apache.catalina.LogFacade; +import org.apache.catalina.Logger; +import org.apache.catalina.Request; +import org.apache.catalina.Response; +import org.apache.catalina.util.ServerInfo; +import org.apache.catalina.util.StringManager; +import org.glassfish.web.util.HtmlEntityEncoder; + /** *

      Implementation of a Valve that outputs HTML error pages.

      * diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/valves/ExtendedAccessLogValve.java b/appserver/web/web-core/src/main/java/org/apache/catalina/valves/ExtendedAccessLogValve.java index 5cb6b409332..437f01d3f5e 100755 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/valves/ExtendedAccessLogValve.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/valves/ExtendedAccessLogValve.java @@ -17,18 +17,12 @@ package org.apache.catalina.valves; -import org.apache.catalina.HttpResponse; -import org.apache.catalina.LifecycleException; -import org.apache.catalina.LogFacade; -import org.apache.catalina.Request; -import org.apache.catalina.Response; -import org.apache.catalina.util.ServerInfo; - import jakarta.servlet.ServletException; import jakarta.servlet.ServletRequest; import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpSession; + import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -44,6 +38,13 @@ import java.util.TimeZone; import java.util.logging.Level; +import org.apache.catalina.HttpResponse; +import org.apache.catalina.LifecycleException; +import org.apache.catalina.LogFacade; +import org.apache.catalina.Request; +import org.apache.catalina.Response; +import org.apache.catalina.util.ServerInfo; + /** * An implementation of the W3c Extended Log File Format. See diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/valves/JDBCAccessLogValve.java b/appserver/web/web-core/src/main/java/org/apache/catalina/valves/JDBCAccessLogValve.java index 8d85646a60b..41fc5fd74f3 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/valves/JDBCAccessLogValve.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/valves/JDBCAccessLogValve.java @@ -18,18 +18,23 @@ package org.apache.catalina.valves; -import org.apache.catalina.HttpResponse; -import org.apache.catalina.LifecycleException; -import org.apache.catalina.Request; -import org.apache.catalina.Response; - import jakarta.servlet.ServletException; import jakarta.servlet.ServletRequest; import jakarta.servlet.http.HttpServletRequest; + import java.io.IOException; -import java.sql.*; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Timestamp; import java.util.Properties; +import org.apache.catalina.HttpResponse; +import org.apache.catalina.LifecycleException; +import org.apache.catalina.Request; +import org.apache.catalina.Response; + /** *

      diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/valves/PersistentValve.java b/appserver/web/web-core/src/main/java/org/apache/catalina/valves/PersistentValve.java index 202ae08f998..f886bdca57f 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/valves/PersistentValve.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/valves/PersistentValve.java @@ -18,15 +18,23 @@ package org.apache.catalina.valves; -import org.apache.catalina.*; -import org.apache.catalina.session.PersistentManager; - import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; + import java.io.IOException; +import org.apache.catalina.Context; +import org.apache.catalina.LogFacade; +import org.apache.catalina.Logger; +import org.apache.catalina.Manager; +import org.apache.catalina.Request; +import org.apache.catalina.Response; +import org.apache.catalina.Session; +import org.apache.catalina.Store; +import org.apache.catalina.session.PersistentManager; + /** * Valve that implements the default basic behavior for the * StandardHost container implementation. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/valves/RemoteAddrValve.java b/appserver/web/web-core/src/main/java/org/apache/catalina/valves/RemoteAddrValve.java index b0f40b46ae4..9483cd5bca4 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/valves/RemoteAddrValve.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/valves/RemoteAddrValve.java @@ -18,12 +18,13 @@ package org.apache.catalina.valves; -import org.apache.catalina.Request; -import org.apache.catalina.Response; - import jakarta.servlet.ServletException; + import java.io.IOException; +import org.apache.catalina.Request; +import org.apache.catalina.Response; + /** * Concrete implementation of RequestFilterValve that filters diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/valves/RemoteHostValve.java b/appserver/web/web-core/src/main/java/org/apache/catalina/valves/RemoteHostValve.java index 8122377dc67..2efe0cba956 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/valves/RemoteHostValve.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/valves/RemoteHostValve.java @@ -18,12 +18,13 @@ package org.apache.catalina.valves; -import org.apache.catalina.Request; -import org.apache.catalina.Response; - import jakarta.servlet.ServletException; + import java.io.IOException; +import org.apache.catalina.Request; +import org.apache.catalina.Response; + /** * Concrete implementation of RequestFilterValve that filters diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/valves/RequestDumperValve.java b/appserver/web/web-core/src/main/java/org/apache/catalina/valves/RequestDumperValve.java index 500d0479ea2..26633dd0abe 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/valves/RequestDumperValve.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/valves/RequestDumperValve.java @@ -18,17 +18,23 @@ package org.apache.catalina.valves; -import org.apache.catalina.*; -import static com.sun.logging.LogCleanerUtil.neutralizeForLog; - import jakarta.servlet.ServletException; import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.util.Enumeration; import java.util.logging.Level; +import org.apache.catalina.HttpRequest; +import org.apache.catalina.HttpResponse; +import org.apache.catalina.Logger; +import org.apache.catalina.Request; +import org.apache.catalina.Response; + +import static com.sun.logging.LogCleanerUtil.neutralizeForLog; + /** *

      Implementation of a Valve that logs interesting contents from the * specified Request (before processing) and the corresponding Response diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/valves/RequestFilterValve.java b/appserver/web/web-core/src/main/java/org/apache/catalina/valves/RequestFilterValve.java index 520a5cda49e..5343626a597 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/valves/RequestFilterValve.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/valves/RequestFilterValve.java @@ -18,20 +18,13 @@ package org.apache.catalina.valves; -import org.apache.catalina.LogFacade; -import org.apache.catalina.Request; -import org.apache.catalina.Response; -import org.apache.catalina.core.ApplicationDispatcher; -import org.apache.catalina.core.StandardContext; -import org.apache.catalina.core.StandardHost; -import org.apache.catalina.deploy.ErrorPage; - import jakarta.servlet.DispatcherType; import jakarta.servlet.ServletContext; import jakarta.servlet.ServletException; import jakarta.servlet.ServletRequest; import jakarta.servlet.ServletResponse; import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.text.MessageFormat; import java.util.ArrayList; @@ -39,6 +32,14 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; +import org.apache.catalina.LogFacade; +import org.apache.catalina.Request; +import org.apache.catalina.Response; +import org.apache.catalina.core.ApplicationDispatcher; +import org.apache.catalina.core.StandardContext; +import org.apache.catalina.core.StandardHost; +import org.apache.catalina.deploy.ErrorPage; + /** * Implementation of a Valve that performs filtering based on comparing the diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/valves/ValveBase.java b/appserver/web/web-core/src/main/java/org/apache/catalina/valves/ValveBase.java index 3fc59eba030..18528d93890 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/valves/ValveBase.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/valves/ValveBase.java @@ -17,20 +17,36 @@ package org.apache.catalina.valves; -import org.apache.catalina.*; -import org.apache.catalina.core.ContainerBase; -import org.apache.catalina.util.LifecycleSupport; -import org.glassfish.web.valve.GlassFishValve; - -import javax.management.MalformedObjectNameException; -import javax.management.ObjectName; import jakarta.servlet.ServletException; + import java.io.IOException; import java.util.List; import java.util.ResourceBundle; import java.util.logging.Level; import java.util.logging.Logger; +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; + +import org.apache.catalina.CometEvent; +import org.apache.catalina.Contained; +import org.apache.catalina.Container; +import org.apache.catalina.Context; +import org.apache.catalina.Engine; +import org.apache.catalina.Host; +import org.apache.catalina.Lifecycle; +import org.apache.catalina.LifecycleException; +import org.apache.catalina.LifecycleListener; +import org.apache.catalina.LogFacade; +import org.apache.catalina.Pipeline; +import org.apache.catalina.Request; +import org.apache.catalina.Response; +import org.apache.catalina.Valve; +import org.apache.catalina.Wrapper; +import org.apache.catalina.core.ContainerBase; +import org.apache.catalina.util.LifecycleSupport; +import org.glassfish.web.valve.GlassFishValve; + /** * Convenience base class for implementations of the Valve interface. * A subclass MUST implement an invoke() diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/valves/WebdavFixValve.java b/appserver/web/web-core/src/main/java/org/apache/catalina/valves/WebdavFixValve.java index cf968a4211e..26f651698bf 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/valves/WebdavFixValve.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/valves/WebdavFixValve.java @@ -17,14 +17,15 @@ package org.apache.catalina.valves; -import org.apache.catalina.Request; -import org.apache.catalina.Response; - import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; +import org.apache.catalina.Request; +import org.apache.catalina.Response; + /** * Valve that attempts to force MS WebDAV clients connecting on port 80 to use * a WebDAV client that actually works. Other workarounds that might help diff --git a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/CallMethodRule.java b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/CallMethodRule.java index 8f43bc53fda..409692d0d69 100644 --- a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/CallMethodRule.java +++ b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/CallMethodRule.java @@ -18,11 +18,11 @@ package org.apache.tomcat.util.digester; +import java.util.logging.Level; + import org.glassfish.web.util.IntrospectionUtils; import org.xml.sax.Attributes; -import java.util.logging.Level; - /** *

      Rule implementation that calls a method on an object on the stack diff --git a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/CallParamRule.java b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/CallParamRule.java index 4c32b50b729..ed6765762a2 100644 --- a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/CallParamRule.java +++ b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/CallParamRule.java @@ -18,10 +18,10 @@ package org.apache.tomcat.util.digester; -import org.xml.sax.Attributes; - import java.util.logging.Level; +import org.xml.sax.Attributes; + /** *

      Rule implementation that saves a parameter for use by a surrounding diff --git a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/Digester.java b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/Digester.java index 3971f5ddda7..1c538d65df5 100644 --- a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/Digester.java +++ b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/Digester.java @@ -20,22 +20,43 @@ package org.apache.tomcat.util.digester; -import static com.sun.logging.LogCleanerUtil.neutralizeForLog; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.Reader; +import java.lang.reflect.InvocationTargetException; +import java.text.MessageFormat; +import java.util.EmptyStackException; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.ResourceBundle; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; + import org.apache.catalina.LogFacade; import org.glassfish.web.util.IntrospectionUtils; -import org.xml.sax.*; +import org.xml.sax.Attributes; +import org.xml.sax.EntityResolver; +import org.xml.sax.ErrorHandler; +import org.xml.sax.InputSource; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; +import org.xml.sax.SAXNotRecognizedException; +import org.xml.sax.SAXNotSupportedException; +import org.xml.sax.SAXParseException; +import org.xml.sax.XMLReader; import org.xml.sax.helpers.AttributesImpl; import org.xml.sax.helpers.DefaultHandler; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; -import java.io.*; -import java.lang.reflect.InvocationTargetException; -import java.text.MessageFormat; -import java.util.*; -import java.util.logging.Level; -import java.util.logging.Logger; +import static com.sun.logging.LogCleanerUtil.neutralizeForLog; diff --git a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/FactoryCreateRule.java b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/FactoryCreateRule.java index 98769d6b663..1198ca3c68c 100644 --- a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/FactoryCreateRule.java +++ b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/FactoryCreateRule.java @@ -17,10 +17,10 @@ package org.apache.tomcat.util.digester; -import org.xml.sax.Attributes; - import java.util.logging.Level; +import org.xml.sax.Attributes; + /** *

      Rule implementation that uses an {@link ObjectCreationFactory} to create diff --git a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/GenericParser.java b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/GenericParser.java index b289b57e8f4..736e9e3e1a5 100644 --- a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/GenericParser.java +++ b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/GenericParser.java @@ -17,15 +17,16 @@ package org.apache.tomcat.util.digester; -import org.xml.sax.SAXException; -import org.xml.sax.SAXNotRecognizedException; +import java.util.Properties; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import java.util.Properties; -import java.util.logging.Level; -import java.util.logging.Logger; + +import org.xml.sax.SAXException; +import org.xml.sax.SAXNotRecognizedException; /** * Create a SAXParser configured to support XML Schema and DTD. diff --git a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/NodeCreateRule.java b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/NodeCreateRule.java index 179e00cad1c..ca31e15b279 100644 --- a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/NodeCreateRule.java +++ b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/NodeCreateRule.java @@ -18,17 +18,21 @@ package org.apache.tomcat.util.digester; -import org.w3c.dom.*; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; + +import org.w3c.dom.Attr; +import org.w3c.dom.DOMException; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; import org.xml.sax.helpers.DefaultHandler; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; - /** * A rule implementation that creates a DOM diff --git a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/ObjectCreateRule.java b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/ObjectCreateRule.java index c04f0352841..9e9a569e29e 100644 --- a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/ObjectCreateRule.java +++ b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/ObjectCreateRule.java @@ -18,10 +18,10 @@ package org.apache.tomcat.util.digester; -import org.xml.sax.Attributes; - import java.util.logging.Level; +import org.xml.sax.Attributes; + /** * Rule implementation that creates a new object and pushes it diff --git a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/ParserFeatureSetterFactory.java b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/ParserFeatureSetterFactory.java index b7922542a64..a8af61ac0dd 100644 --- a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/ParserFeatureSetterFactory.java +++ b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/ParserFeatureSetterFactory.java @@ -17,13 +17,14 @@ package org.apache.tomcat.util.digester; -import org.xml.sax.SAXException; -import org.xml.sax.SAXNotRecognizedException; -import org.xml.sax.SAXNotSupportedException; +import java.util.Properties; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; -import java.util.Properties; + +import org.xml.sax.SAXException; +import org.xml.sax.SAXNotRecognizedException; +import org.xml.sax.SAXNotSupportedException; /** * Creates a SAXParser based on the underlying parser. diff --git a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetNextRule.java b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetNextRule.java index db455e55e58..34e59788894 100644 --- a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetNextRule.java +++ b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetNextRule.java @@ -17,10 +17,10 @@ package org.apache.tomcat.util.digester; -import org.glassfish.web.util.IntrospectionUtils; - import java.util.logging.Level; +import org.glassfish.web.util.IntrospectionUtils; + /** *

      Rule implementation that calls a method on the (top-1) (parent) diff --git a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetPropertiesRule.java b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetPropertiesRule.java index 40415b9d087..20992425994 100644 --- a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetPropertiesRule.java +++ b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetPropertiesRule.java @@ -17,12 +17,12 @@ package org.apache.tomcat.util.digester; +import java.util.logging.Level; + import org.apache.catalina.LogFacade; import org.glassfish.web.util.IntrospectionUtils; import org.xml.sax.Attributes; -import java.util.logging.Level; - /** *

      Rule implementation that sets properties on the object at the top of the diff --git a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetPropertyRule.java b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetPropertyRule.java index b3760f451f7..d6e02cbfddd 100644 --- a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetPropertyRule.java +++ b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetPropertyRule.java @@ -17,12 +17,12 @@ package org.apache.tomcat.util.digester; +import java.util.logging.Level; + import org.apache.catalina.LogFacade; import org.glassfish.web.util.IntrospectionUtils; import org.xml.sax.Attributes; -import java.util.logging.Level; - /** * Rule implementation that sets an individual property on the object at the diff --git a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetRootRule.java b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetRootRule.java index de228a1d94e..68f93d6546b 100644 --- a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetRootRule.java +++ b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetRootRule.java @@ -17,10 +17,10 @@ package org.apache.tomcat.util.digester; -import org.glassfish.web.util.IntrospectionUtils; - import java.util.logging.Level; +import org.glassfish.web.util.IntrospectionUtils; + /** *

      Rule implementation that calls a method on the root object on the stack, diff --git a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetTopRule.java b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetTopRule.java index 14fd61e5bc6..d7a23357eb9 100644 --- a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetTopRule.java +++ b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetTopRule.java @@ -18,10 +18,10 @@ package org.apache.tomcat.util.digester; -import org.glassfish.web.util.IntrospectionUtils; - import java.util.logging.Level; +import org.glassfish.web.util.IntrospectionUtils; + /** *

      Rule implementation that calls a "set parent" method on the top (child) diff --git a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/XercesParser.java b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/XercesParser.java index 7f728f4d4ce..9c95e34a509 100644 --- a/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/XercesParser.java +++ b/appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/XercesParser.java @@ -17,18 +17,19 @@ package org.apache.tomcat.util.digester; -import org.xml.sax.SAXException; -import org.xml.sax.SAXNotRecognizedException; -import org.xml.sax.SAXNotSupportedException; - -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; import java.lang.reflect.Method; import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; + +import org.xml.sax.SAXException; +import org.xml.sax.SAXNotRecognizedException; +import org.xml.sax.SAXNotSupportedException; + /** * Create a SAXParser based on the underlying Xerces version. * Currently, Xerces 2.3 and up doesn't implement schema validation the same way diff --git a/appserver/web/web-core/src/main/java/org/glassfish/web/valve/GlassFishValve.java b/appserver/web/web-core/src/main/java/org/glassfish/web/valve/GlassFishValve.java index 1ee566392b7..7941e3bcca7 100644 --- a/appserver/web/web-core/src/main/java/org/glassfish/web/valve/GlassFishValve.java +++ b/appserver/web/web-core/src/main/java/org/glassfish/web/valve/GlassFishValve.java @@ -17,12 +17,13 @@ package org.glassfish.web.valve; -import org.apache.catalina.Request; -import org.apache.catalina.Response; - import jakarta.servlet.ServletException; + import java.io.IOException; +import org.apache.catalina.Request; +import org.apache.catalina.Response; + /** *

      A Valve is a request processing component associated with a * particular Container. A series of Valves are generally associated with diff --git a/appserver/web/web-core/src/main/java/org/glassfish/web/valve/GlassFishValveAdapter.java b/appserver/web/web-core/src/main/java/org/glassfish/web/valve/GlassFishValveAdapter.java index 4b90bdb6c55..9d3fd0f8093 100644 --- a/appserver/web/web-core/src/main/java/org/glassfish/web/valve/GlassFishValveAdapter.java +++ b/appserver/web/web-core/src/main/java/org/glassfish/web/valve/GlassFishValveAdapter.java @@ -16,14 +16,15 @@ package org.glassfish.web.valve; -import org.apache.catalina.Request; -import org.apache.catalina.Response; -import org.apache.catalina.Valve; - import jakarta.servlet.ServletException; + import java.io.IOException; import java.lang.reflect.Method; +import org.apache.catalina.Request; +import org.apache.catalina.Response; +import org.apache.catalina.Valve; + /** * Adapter valve for wrapping a GlassFish-style valve that was compiled * against the "old" org.apache.catalina.Valve interface from GlassFish diff --git a/appserver/web/web-core/src/main/java/org/glassfish/web/valve/TomcatValveAdapter.java b/appserver/web/web-core/src/main/java/org/glassfish/web/valve/TomcatValveAdapter.java index a8bec106845..d654b2bcb11 100644 --- a/appserver/web/web-core/src/main/java/org/glassfish/web/valve/TomcatValveAdapter.java +++ b/appserver/web/web-core/src/main/java/org/glassfish/web/valve/TomcatValveAdapter.java @@ -16,12 +16,13 @@ package org.glassfish.web.valve; -import org.apache.catalina.CometEvent; -import org.apache.catalina.Valve; - import jakarta.servlet.ServletException; + import java.io.IOException; +import org.apache.catalina.CometEvent; +import org.apache.catalina.Valve; + /** * Tomcat-style wrapper valve around GlassFish-style valve. * diff --git a/appserver/web/web-core/src/test/java/org/apache/catalina/core/StandardContextTest.java b/appserver/web/web-core/src/test/java/org/apache/catalina/core/StandardContextTest.java index f36a160c65c..0539f439bac 100644 --- a/appserver/web/web-core/src/test/java/org/apache/catalina/core/StandardContextTest.java +++ b/appserver/web/web-core/src/test/java/org/apache/catalina/core/StandardContextTest.java @@ -21,6 +21,7 @@ import java.net.URL; import java.nio.file.Files; import java.nio.file.Path; + import javax.naming.NamingException; import javax.naming.directory.DirContext; @@ -28,12 +29,13 @@ import org.apache.naming.resources.FileDirContext; import org.apache.naming.resources.Resource; import org.apache.naming.resources.UrlResource; +import org.junit.jupiter.api.Test; + import static org.easymock.EasyMock.createNiceMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.jupiter.api.Test; public class StandardContextTest { diff --git a/appserver/web/web-core/src/test/java/org/apache/catalina/core/StandardContextValveTest.java b/appserver/web/web-core/src/test/java/org/apache/catalina/core/StandardContextValveTest.java index cc6bb641509..26cfac3bdf1 100644 --- a/appserver/web/web-core/src/test/java/org/apache/catalina/core/StandardContextValveTest.java +++ b/appserver/web/web-core/src/test/java/org/apache/catalina/core/StandardContextValveTest.java @@ -24,8 +24,8 @@ import org.glassfish.grizzly.http.util.DataChunk; import org.glassfish.web.valve.GlassFishValve; import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.ValueSource; import org.junit.jupiter.params.provider.CsvSource; +import org.junit.jupiter.params.provider.ValueSource; import static org.easymock.EasyMock.captureInt; import static org.easymock.EasyMock.createNiceMock; diff --git a/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/Context.java b/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/Context.java index aee98a7e7fe..50b7d57b055 100644 --- a/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/Context.java +++ b/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/Context.java @@ -16,8 +16,10 @@ package org.glassfish.embeddable.web; -import java.util.*; -import jakarta.servlet.*; +import jakarta.servlet.ServletContext; + +import java.util.EventListener; + import org.glassfish.embeddable.web.config.SecurityConfig; /** diff --git a/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/VirtualServer.java b/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/VirtualServer.java index ca5b581148e..7d81b3f2c00 100644 --- a/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/VirtualServer.java +++ b/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/VirtualServer.java @@ -18,8 +18,9 @@ import java.io.File; import java.util.Collection; -import org.glassfish.embeddable.web.config.VirtualServerConfig; + import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.web.config.VirtualServerConfig; /** * Representation of a virtual server. diff --git a/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/WebContainer.java b/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/WebContainer.java index 70e3cb6c919..3e82ea40843 100644 --- a/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/WebContainer.java +++ b/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/WebContainer.java @@ -20,8 +20,8 @@ import java.util.Collection; import java.util.logging.Level; -import org.glassfish.embeddable.web.config.WebContainerConfig; import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.web.config.WebContainerConfig; /** * Class representing an embedded web container, which supports the diff --git a/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/WebListenerBase.java b/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/WebListenerBase.java index 7832982a9e3..cff488245bb 100644 --- a/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/WebListenerBase.java +++ b/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/WebListenerBase.java @@ -16,8 +16,8 @@ package org.glassfish.embeddable.web; -import org.glassfish.embeddable.web.config.WebListenerConfig; import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.web.config.WebListenerConfig; /** * Base implementation of the WebListener interface diff --git a/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/config/WebResourceCollection.java b/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/config/WebResourceCollection.java index 268399d23fd..60261f7006e 100644 --- a/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/config/WebResourceCollection.java +++ b/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/config/WebResourceCollection.java @@ -17,6 +17,7 @@ package org.glassfish.embeddable.web.config; import java.util.Set; + import org.glassfish.embeddable.GlassFishException; /** diff --git a/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/CacheHelper.java b/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/CacheHelper.java index 52ad3b2b060..f473ac99fa0 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/CacheHelper.java +++ b/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/CacheHelper.java @@ -18,6 +18,7 @@ import jakarta.servlet.ServletContext; import jakarta.servlet.http.HttpServletRequest; + import java.util.Map; /** CacheHelper interface is an user-extensible interface to customize: diff --git a/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/CacheManager.java b/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/CacheManager.java index aba1a017559..e5dfd96d7f7 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/CacheManager.java +++ b/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/CacheManager.java @@ -18,15 +18,24 @@ import com.sun.appserv.util.cache.Cache; import com.sun.appserv.web.cache.mapping.CacheMapping; -import org.apache.catalina.LifecycleException; -import org.glassfish.web.LogFacade; import jakarta.servlet.ServletContext; + import java.text.MessageFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Properties; +import java.util.ResourceBundle; import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.catalina.LifecycleException; +import org.glassfish.web.LogFacade; + public class CacheManager { public static final String CACHE_MANAGER_ATTR_NAME = diff --git a/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/DefaultCacheHelper.java b/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/DefaultCacheHelper.java index 7bed7e8d1ea..6fb9773824a 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/DefaultCacheHelper.java +++ b/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/DefaultCacheHelper.java @@ -22,6 +22,7 @@ import jakarta.servlet.ServletContext; import jakarta.servlet.http.HttpServletRequest; + import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/filter/CachingFilter.java b/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/filter/CachingFilter.java index 07df9983ac5..190ad48837d 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/filter/CachingFilter.java +++ b/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/filter/CachingFilter.java @@ -23,9 +23,17 @@ import com.sun.appserv.web.cache.CacheManagerListener; import com.sun.appserv.web.cache.DefaultCacheHelper; -import jakarta.servlet.*; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.util.ArrayList; import java.util.HashSet; diff --git a/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/filter/CachingOutputStreamWrapper.java b/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/filter/CachingOutputStreamWrapper.java index f3656053b6d..0559e33a891 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/filter/CachingOutputStreamWrapper.java +++ b/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/filter/CachingOutputStreamWrapper.java @@ -18,6 +18,7 @@ import jakarta.servlet.ServletOutputStream; import jakarta.servlet.WriteListener; + import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/filter/CachingResponseWrapper.java b/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/filter/CachingResponseWrapper.java index a78bb2c7f47..44eb21af9e9 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/filter/CachingResponseWrapper.java +++ b/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/filter/CachingResponseWrapper.java @@ -20,6 +20,7 @@ import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponseWrapper; + import java.io.IOException; import java.io.OutputStreamWriter; import java.io.PrintWriter; diff --git a/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/filter/HttpCacheEntry.java b/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/filter/HttpCacheEntry.java index 556ead0ec56..d26d0f615ab 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/filter/HttpCacheEntry.java +++ b/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/filter/HttpCacheEntry.java @@ -16,10 +16,11 @@ package com.sun.appserv.web.cache.filter; +import jakarta.servlet.http.Cookie; + import java.util.ArrayList; import java.util.HashMap; import java.util.Locale; -import jakarta.servlet.http.Cookie; /** HttpCacheEntry * Each entry holds cached (HTTP) response: diff --git a/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/mapping/ConstraintField.java b/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/mapping/ConstraintField.java index 052c47ca18a..cbfdefdc004 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/mapping/ConstraintField.java +++ b/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/mapping/ConstraintField.java @@ -18,12 +18,14 @@ import jakarta.servlet.ServletContext; import jakarta.servlet.http.HttpServletRequest; + import java.util.logging.Level; import java.util.logging.Logger; -import static com.sun.logging.LogCleanerUtil.neutralizeForLog; import org.glassfish.web.LogFacade; +import static com.sun.logging.LogCleanerUtil.neutralizeForLog; + /** ConstraintField class represents a single Field and constraints on its * values; Field name and its scope are inherited from the Field class. diff --git a/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/mapping/Field.java b/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/mapping/Field.java index 712b81f44ca..76421aee59e 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/mapping/Field.java +++ b/appserver/web/web-glue/src/main/java/com/sun/appserv/web/cache/mapping/Field.java @@ -21,6 +21,7 @@ import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpSession; + import java.text.MessageFormat; import java.util.ResourceBundle; import java.util.logging.Logger; diff --git a/appserver/web/web-glue/src/main/java/com/sun/appserv/web/taglibs/cache/CacheTag.java b/appserver/web/web-glue/src/main/java/com/sun/appserv/web/taglibs/cache/CacheTag.java index 687ed497f1d..aa75b17624a 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/appserv/web/taglibs/cache/CacheTag.java +++ b/appserver/web/web-glue/src/main/java/com/sun/appserv/web/taglibs/cache/CacheTag.java @@ -21,6 +21,7 @@ import jakarta.servlet.jsp.JspException; import jakarta.servlet.jsp.PageContext; import jakarta.servlet.jsp.tagext.BodyTagSupport; + import java.util.ResourceBundle; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/appserver/web/web-glue/src/main/java/com/sun/appserv/web/taglibs/cache/CacheUtil.java b/appserver/web/web-glue/src/main/java/com/sun/appserv/web/taglibs/cache/CacheUtil.java index b88277c1528..f4d36bcbbde 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/appserv/web/taglibs/cache/CacheUtil.java +++ b/appserver/web/web-glue/src/main/java/com/sun/appserv/web/taglibs/cache/CacheUtil.java @@ -17,8 +17,10 @@ package com.sun.appserv.web.taglibs.cache; import com.sun.appserv.util.cache.Cache; + import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.jsp.PageContext; + import java.text.MessageFormat; import java.util.ResourceBundle; import java.util.logging.Logger; diff --git a/appserver/web/web-glue/src/main/java/com/sun/appserv/web/taglibs/cache/FlushTag.java b/appserver/web/web-glue/src/main/java/com/sun/appserv/web/taglibs/cache/FlushTag.java index 9f3091a1d76..0ffbd518a36 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/appserv/web/taglibs/cache/FlushTag.java +++ b/appserver/web/web-glue/src/main/java/com/sun/appserv/web/taglibs/cache/FlushTag.java @@ -21,6 +21,7 @@ import jakarta.servlet.jsp.JspException; import jakarta.servlet.jsp.PageContext; import jakarta.servlet.jsp.tagext.TagSupport; + import java.util.logging.Level; import java.util.logging.Logger; diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/security/web/GlassFishSingleSignOn.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/security/web/GlassFishSingleSignOn.java index 6228ca2af7c..ec3a35f6bd1 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/security/web/GlassFishSingleSignOn.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/security/web/GlassFishSingleSignOn.java @@ -17,18 +17,11 @@ package com.sun.enterprise.security.web; -import static com.sun.logging.LogCleanerUtil.neutralizeForLog; -import org.apache.catalina.*; -import org.apache.catalina.authenticator.Constants; -import org.apache.catalina.authenticator.SingleSignOn; -import org.apache.catalina.authenticator.SingleSignOnEntry; - -import org.glassfish.web.LogFacade; - import jakarta.servlet.ServletException; import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; @@ -36,6 +29,20 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.catalina.HttpRequest; +import org.apache.catalina.LifecycleException; +import org.apache.catalina.Realm; +import org.apache.catalina.Request; +import org.apache.catalina.Response; +import org.apache.catalina.Session; +import org.apache.catalina.SessionEvent; +import org.apache.catalina.authenticator.Constants; +import org.apache.catalina.authenticator.SingleSignOn; +import org.apache.catalina.authenticator.SingleSignOnEntry; +import org.glassfish.web.LogFacade; + +import static com.sun.logging.LogCleanerUtil.neutralizeForLog; + /** * A Valve that supports a "single sign on" user experience, * where the security identity of a user who successfully authenticates to one diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/AdHocContextValve.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/AdHocContextValve.java index 9649a6691bd..8f81df8b9eb 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/AdHocContextValve.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/AdHocContextValve.java @@ -16,22 +16,23 @@ package com.sun.enterprise.web; -import org.apache.catalina.Request; -import org.apache.catalina.Response; -import org.apache.catalina.Wrapper; -import org.glassfish.web.LogFacade; -import org.glassfish.web.valve.GlassFishValve; - import jakarta.servlet.Servlet; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.text.MessageFormat; import java.util.ResourceBundle; import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.catalina.Request; +import org.apache.catalina.Response; +import org.apache.catalina.Wrapper; +import org.glassfish.web.LogFacade; +import org.glassfish.web.valve.GlassFishValve; + /** * Implementation of StandardContextValve which is added as the base valve * to a web module's ad-hoc pipeline. diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/BasePersistenceStrategyBuilder.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/BasePersistenceStrategyBuilder.java index 31df9893786..089a4d0a075 100755 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/BasePersistenceStrategyBuilder.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/BasePersistenceStrategyBuilder.java @@ -16,6 +16,13 @@ package com.sun.enterprise.web; +import java.io.File; +import java.util.ArrayList; +import java.util.ResourceBundle; +import java.util.StringTokenizer; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.apache.catalina.Context; import org.apache.catalina.core.StandardContext; import org.glassfish.web.LogFacade; @@ -25,13 +32,6 @@ import org.glassfish.web.deployment.runtime.StoreProperties; import org.glassfish.web.deployment.runtime.WebProperty; -import java.io.File; -import java.util.ArrayList; -import java.util.ResourceBundle; -import java.util.StringTokenizer; -import java.util.logging.Level; -import java.util.logging.Logger; - public abstract class BasePersistenceStrategyBuilder implements PersistenceStrategyBuilder { diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/CacheModule.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/CacheModule.java index ce9b843af79..662b453144d 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/CacheModule.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/CacheModule.java @@ -23,17 +23,23 @@ import com.sun.appserv.web.cache.mapping.ValueConstraint; import com.sun.enterprise.config.serverbeans.ConfigBeansUtilities; import com.sun.enterprise.deployment.runtime.web.SunWebApp; -import org.glassfish.web.LogFacade; -import org.glassfish.web.deployment.runtime.*; -import org.apache.catalina.deploy.FilterDef; -import org.apache.catalina.deploy.FilterMap; import jakarta.servlet.DispatcherType; + import java.util.EnumSet; import java.util.HashMap; import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.catalina.deploy.FilterDef; +import org.apache.catalina.deploy.FilterMap; +import org.glassfish.web.LogFacade; +import org.glassfish.web.deployment.runtime.Cache; +import org.glassfish.web.deployment.runtime.CacheHelper; +import org.glassfish.web.deployment.runtime.DefaultHelper; +import org.glassfish.web.deployment.runtime.SunWebAppImpl; +import org.glassfish.web.deployment.runtime.WebProperty; + /** * configures the cache for the application */ diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/EmbeddedWebContainer.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/EmbeddedWebContainer.java index aa3ce68ecba..39ea1e8fb0d 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/EmbeddedWebContainer.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/EmbeddedWebContainer.java @@ -19,24 +19,31 @@ import com.sun.enterprise.container.common.spi.util.InjectionManager; import com.sun.enterprise.web.logger.FileLoggerHandlerFactory; import com.sun.enterprise.web.pluggable.WebContainerFeatureFactory; +import com.sun.web.server.WebContainerListener; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import java.io.File; import java.text.MessageFormat; import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.inject.Inject; -import jakarta.inject.Singleton; -import com.sun.web.server.WebContainerListener; -import org.apache.catalina.*; + +import org.apache.catalina.Connector; +import org.apache.catalina.ContainerListener; +import org.apache.catalina.Context; +import org.apache.catalina.Engine; +import org.apache.catalina.Host; import org.apache.catalina.core.StandardEngine; import org.apache.catalina.startup.ContextConfig; import org.apache.catalina.startup.Embedded; import org.glassfish.api.invocation.InvocationManager; import org.glassfish.api.naming.NamedNamingObjectProxy; import org.glassfish.hk2.api.PostConstruct; +import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.api.ServerContext; import org.glassfish.web.LogFacade; import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/FileStrategyBuilder.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/FileStrategyBuilder.java index d8721f9f34a..439252de66c 100755 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/FileStrategyBuilder.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/FileStrategyBuilder.java @@ -16,6 +16,8 @@ package com.sun.enterprise.web; +import java.util.logging.Level; + import org.apache.catalina.Context; import org.apache.catalina.core.StandardContext; import org.apache.catalina.session.FileStore; @@ -24,8 +26,6 @@ import org.glassfish.web.deployment.runtime.SessionManager; import org.jvnet.hk2.annotations.Service; -import java.util.logging.Level; - @Service(name="file") public class FileStrategyBuilder extends BasePersistenceStrategyBuilder { diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/MemoryStrategyBuilder.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/MemoryStrategyBuilder.java index 43a6d04c606..c70d1baf01f 100755 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/MemoryStrategyBuilder.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/MemoryStrategyBuilder.java @@ -18,6 +18,10 @@ import com.sun.enterprise.util.uuid.UuidGenerator; import com.sun.enterprise.web.session.PersistenceType; + +import java.text.MessageFormat; +import java.util.logging.Level; + import org.apache.catalina.Context; import org.apache.catalina.core.StandardContext; import org.apache.catalina.session.StandardManager; @@ -25,9 +29,6 @@ import org.glassfish.web.deployment.runtime.SessionManager; import org.jvnet.hk2.annotations.Service; -import java.text.MessageFormat; -import java.util.logging.Level; - @Service(name="memory") public class MemoryStrategyBuilder extends BasePersistenceStrategyBuilder { diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/PESessionLocker.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/PESessionLocker.java index 04e6aeecac9..9ef52b328dc 100755 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/PESessionLocker.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/PESessionLocker.java @@ -22,15 +22,15 @@ package com.sun.enterprise.web; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; + import org.apache.catalina.Context; import org.apache.catalina.Manager; import org.apache.catalina.Session; import org.apache.catalina.session.BaseSessionLocker; import org.apache.catalina.session.StandardSession; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; - /** * diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/PEWebContainerFeatureFactoryImpl.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/PEWebContainerFeatureFactoryImpl.java index 320444bb325..4ca21a27e8c 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/PEWebContainerFeatureFactoryImpl.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/PEWebContainerFeatureFactoryImpl.java @@ -17,6 +17,7 @@ package com.sun.enterprise.web; import com.sun.enterprise.web.pluggable.WebContainerFeatureFactory; + import org.jvnet.hk2.annotations.Service; /** diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/PersistenceStrategyBuilderFactory.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/PersistenceStrategyBuilderFactory.java index cc918289c7e..fa844708a9d 100755 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/PersistenceStrategyBuilderFactory.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/PersistenceStrategyBuilderFactory.java @@ -18,13 +18,14 @@ import com.sun.enterprise.web.session.PersistenceType; -import org.apache.catalina.Context; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.web.LogFacade; import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.catalina.Context; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.web.LogFacade; + /** * @author Rajiv Mordani */ diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/ProxyHandlerImpl.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/ProxyHandlerImpl.java index 757749d7a84..54ebfbbbbca 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/ProxyHandlerImpl.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/ProxyHandlerImpl.java @@ -19,11 +19,13 @@ import com.sun.appserv.ProxyHandler; import jakarta.servlet.http.HttpServletRequest; + import java.io.ByteArrayInputStream; import java.nio.charset.Charset; import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; + import org.apache.catalina.connector.Constants; /** diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/ServerConfigLookup.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/ServerConfigLookup.java index ded87a0103f..e1f3b440fab 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/ServerConfigLookup.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/ServerConfigLookup.java @@ -16,26 +16,33 @@ package com.sun.enterprise.web; -import com.sun.enterprise.config.serverbeans.*; +import com.sun.enterprise.config.serverbeans.AvailabilityService; +import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.web.session.PersistenceType; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.api.deployment.DeployCommandParameters; import org.glassfish.api.deployment.DeploymentContext; +import org.glassfish.hk2.api.PerLookup; import org.glassfish.internal.api.ClassLoaderHierarchy; import org.glassfish.web.LogFacade; -import org.glassfish.web.config.serverbeans.*; +import org.glassfish.web.config.serverbeans.ManagerProperties; +import org.glassfish.web.config.serverbeans.SessionConfig; +import org.glassfish.web.config.serverbeans.SessionManager; +import org.glassfish.web.config.serverbeans.SessionProperties; +import org.glassfish.web.config.serverbeans.StoreProperties; import org.glassfish.web.config.serverbeans.WebContainer; -import jakarta.inject.Inject; -import jakarta.inject.Named; - +import org.glassfish.web.config.serverbeans.WebContainerAvailability; import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.config.types.Property; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - @Service @PerLookup public class ServerConfigLookup { diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/SessionManagerConfigurationHelper.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/SessionManagerConfigurationHelper.java index 5dea8483e54..442dbc97152 100755 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/SessionManagerConfigurationHelper.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/SessionManagerConfigurationHelper.java @@ -18,16 +18,17 @@ import com.sun.enterprise.deployment.WebBundleDescriptor; import com.sun.enterprise.web.session.PersistenceType; + +import java.util.ArrayList; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.web.LogFacade; import org.glassfish.web.deployment.runtime.ManagerProperties; import org.glassfish.web.deployment.runtime.SessionManager; import org.glassfish.web.deployment.runtime.StoreProperties; import org.glassfish.web.deployment.runtime.WebProperty; -import java.util.ArrayList; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * @author lwhite * @author Rajiv Mordani diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServer.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServer.java index 5e9d8d5ecd6..b660f6955b5 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServer.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServer.java @@ -143,7 +143,39 @@ import static java.util.logging.Level.SEVERE; import static java.util.logging.Level.WARNING; import static org.glassfish.api.web.Constants.ADMIN_VS; -import static org.glassfish.web.LogFacade.*; +import static org.glassfish.web.LogFacade.ADD_HTTP_PROBES_ERROR; +import static org.glassfish.web.LogFacade.ALLOW_ACCESS; +import static org.glassfish.web.LogFacade.APP_NOT_FOUND; +import static org.glassfish.web.LogFacade.CODE_FILTERS_NULL; +import static org.glassfish.web.LogFacade.DENY_ACCESS; +import static org.glassfish.web.LogFacade.DISABLE_SSO; +import static org.glassfish.web.LogFacade.ENABLE_SSO; +import static org.glassfish.web.LogFacade.IGNORE_INVALID_REALM; +import static org.glassfish.web.LogFacade.INVALID_AUTH_REALM; +import static org.glassfish.web.LogFacade.INVALID_LISTENER_VIRTUAL_SERVER; +import static org.glassfish.web.LogFacade.INVALID_SSO_COOKIE_SECURE; +import static org.glassfish.web.LogFacade.MODIFYING_WEB_XML; +import static org.glassfish.web.LogFacade.NOT_A_VALVE; +import static org.glassfish.web.LogFacade.NULL_VIRTUAL_SERVER_PROPERTY; +import static org.glassfish.web.LogFacade.PROXY_NULL; +import static org.glassfish.web.LogFacade.REDIRECT_BOTH_URL_AND_URL_PREFIX; +import static org.glassfish.web.LogFacade.REDIRECT_INVALID_ESCAPE; +import static org.glassfish.web.LogFacade.REDIRECT_MISSING_URL_OR_URL_PREFIX; +import static org.glassfish.web.LogFacade.REDIRECT_MULTIPLE_ELEMENT; +import static org.glassfish.web.LogFacade.REMOVED_CONTEXT; +import static org.glassfish.web.LogFacade.REMOVE_CONTEXT_ERROR; +import static org.glassfish.web.LogFacade.SEND_ERROR_MISSING_PATH; +import static org.glassfish.web.LogFacade.SEND_ERROR_MULTIPLE_ELEMENT; +import static org.glassfish.web.LogFacade.SSO_MAX_INACTIVE_SET; +import static org.glassfish.web.LogFacade.SSO_REAP_INTERVAL_SET; +import static org.glassfish.web.LogFacade.UNABLE_RECONFIGURE_ACCESS_LOG; +import static org.glassfish.web.LogFacade.UNABLE_TO_DELETE; +import static org.glassfish.web.LogFacade.UNABLE_TO_LOAD_EXTENSION_SEVERE; +import static org.glassfish.web.LogFacade.VS_ADDED_CONTEXT; +import static org.glassfish.web.LogFacade.VS_DEFAULT_WEB_MODULE; +import static org.glassfish.web.LogFacade.VS_DEFAULT_WEB_MODULE_DISABLED; +import static org.glassfish.web.LogFacade.VS_DEFAULT_WEB_MODULE_NOT_FOUND; +import static org.glassfish.web.LogFacade.VS_ENABLED_CONTEXT; /** * Standard implementation of a virtual server (aka virtual host) in the iPlanet Application Server. diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServerFacade.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServerFacade.java index 807b7c4b72f..68695f89990 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServerFacade.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServerFacade.java @@ -17,8 +17,11 @@ package com.sun.enterprise.web; -import java.io.*; -import java.util.*; +import java.io.File; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; + import org.glassfish.embeddable.GlassFishException; import org.glassfish.embeddable.web.ConfigException; import org.glassfish.embeddable.web.Context; diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServerPipeline.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServerPipeline.java index effc4169db4..928e812a79c 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServerPipeline.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServerPipeline.java @@ -16,14 +16,10 @@ package com.sun.enterprise.web; -import static com.sun.logging.LogCleanerUtil.neutralizeForLog; -import org.apache.catalina.Request; -import org.apache.catalina.Response; -import org.apache.catalina.core.StandardPipeline; - import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; @@ -34,10 +30,15 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.catalina.Request; +import org.apache.catalina.Response; +import org.apache.catalina.core.StandardPipeline; import org.glassfish.common.util.InputValidationUtil; import org.glassfish.grizzly.http.util.CharChunk; import org.glassfish.web.LogFacade; +import static com.sun.logging.LogCleanerUtil.neutralizeForLog; + /** * Pipeline associated with a virtual server. * diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebComponentInvocation.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebComponentInvocation.java index 4a8ffe455cd..d377958aded 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebComponentInvocation.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebComponentInvocation.java @@ -16,13 +16,13 @@ package com.sun.enterprise.web; +import jakarta.servlet.Filter; +import jakarta.servlet.Servlet; + import java.lang.reflect.Method; import org.glassfish.api.invocation.ComponentInvocation; -import jakarta.servlet.Filter; -import jakarta.servlet.Servlet; - public class WebComponentInvocation extends ComponentInvocation { diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebConnector.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebConnector.java index 7afeb771531..9c4fb3abf90 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebConnector.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebConnector.java @@ -17,6 +17,7 @@ package com.sun.enterprise.web; import com.sun.enterprise.web.connector.coyote.PECoyoteConnector; + import org.apache.catalina.LifecycleException; import org.glassfish.internal.grizzly.V3Mapper; diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebDeployer.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebDeployer.java index 27ec7ef09b7..3e78639fcc8 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebDeployer.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebDeployer.java @@ -19,6 +19,15 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.ServerTags; import com.sun.enterprise.deployment.Application; + +import jakarta.inject.Inject; + +import java.io.File; +import java.text.MessageFormat; +import java.util.ResourceBundle; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.container.RequestDispatcher; import org.glassfish.api.deployment.DeployCommandParameters; import org.glassfish.api.deployment.DeploymentContext; @@ -30,17 +39,10 @@ import org.glassfish.javaee.core.deployment.JavaEEDeployer; import org.glassfish.loader.util.ASClassLoaderUtil; import org.glassfish.web.LogFacade; -import org.glassfish.web.jsp.JSPCompiler; import org.glassfish.web.deployment.descriptor.WebBundleDescriptorImpl; -import jakarta.inject.Inject; +import org.glassfish.web.jsp.JSPCompiler; import org.jvnet.hk2.annotations.Service; -import java.io.File; -import java.text.MessageFormat; -import java.util.ResourceBundle; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * Web module deployer. * diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModule.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModule.java index 61ca736b2bb..e0ffdd39bff 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModule.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModule.java @@ -17,35 +17,42 @@ package com.sun.enterprise.web; -import static com.sun.enterprise.config.serverbeans.ServerTags.DIRECTORY_DEPLOYED; -import static com.sun.enterprise.deployment.web.UserDataConstraint.CONFIDENTIAL_TRANSPORT; -import static com.sun.enterprise.deployment.web.UserDataConstraint.NONE_TRANSPORT; -import static com.sun.enterprise.util.Utility.isAnyNull; -import static com.sun.enterprise.util.Utility.isEmpty; -import static com.sun.enterprise.web.Constants.DEPLOYMENT_CONTEXT_ATTRIBUTE; -import static com.sun.enterprise.web.Constants.ENABLE_HA_ATTRIBUTE; -import static com.sun.enterprise.web.Constants.IS_DISTRIBUTABLE_ATTRIBUTE; -import static java.text.MessageFormat.format; -import static java.util.Collections.emptyMap; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.FINEST; -import static java.util.logging.Level.SEVERE; -import static java.util.logging.Level.WARNING; -import static java.util.stream.Collectors.toSet; -import static org.glassfish.embeddable.web.config.TransportGuarantee.CONFIDENTIAL; -import static org.glassfish.web.LogFacade.ALTERNATE_DOC_BASE_NULL_PROPERTY_NAME_VALVE; -import static org.glassfish.web.LogFacade.ALT_DD_NAME; -import static org.glassfish.web.LogFacade.CONFIGURE_SESSION_MANAGER; -import static org.glassfish.web.LogFacade.CREATE_CUSTOM_BOJECT_OUTPUT_STREAM_ERROR; -import static org.glassfish.web.LogFacade.NULL_WEB_MODULE_PROPERTY; -import static org.glassfish.web.LogFacade.PERSISTENCE_STRATEGY_BUILDER; -import static org.glassfish.web.LogFacade.UNABLE_TO_LOAD_EXTENSION; -import static org.glassfish.web.LogFacade.VALVE_MISSING_PROPERTY_NAME; -import static org.glassfish.web.LogFacade.VALVE_SETTER_CAUSED_EXCEPTION; -import static org.glassfish.web.LogFacade.VALVE_SPECIFIED_METHOD_MISSING; -import static org.glassfish.web.deployment.annotation.handlers.ServletSecurityHandler.createSecurityConstraint; -import static org.glassfish.web.deployment.annotation.handlers.ServletSecurityHandler.getUrlPatternsWithoutSecurityConstraint; -import static org.glassfish.web.loader.ServletContainerInitializerUtil.getServletContainerInitializers; +import com.sun.enterprise.config.serverbeans.Application; +import com.sun.enterprise.config.serverbeans.ConfigBeansUtilities; +import com.sun.enterprise.container.common.spi.util.JavaEEIOUtils; +import com.sun.enterprise.deployment.RunAsIdentityDescriptor; +import com.sun.enterprise.deployment.WebBundleDescriptor; +import com.sun.enterprise.deployment.WebComponentDescriptor; +import com.sun.enterprise.deployment.WebServiceEndpoint; +import com.sun.enterprise.deployment.WebServicesDescriptor; +import com.sun.enterprise.deployment.runtime.web.SunWebApp; +import com.sun.enterprise.deployment.web.LoginConfiguration; +import com.sun.enterprise.deployment.web.SecurityConstraint; +import com.sun.enterprise.deployment.web.ServletFilterMapping; +import com.sun.enterprise.deployment.web.UserDataConstraint; +import com.sun.enterprise.deployment.web.WebResourceCollection; +import com.sun.enterprise.security.integration.RealmInitializer; +import com.sun.enterprise.universal.GFBase64Decoder; +import com.sun.enterprise.universal.GFBase64Encoder; +import com.sun.enterprise.util.Utility; +import com.sun.enterprise.web.deploy.LoginConfigDecorator; +import com.sun.enterprise.web.pwc.PwcWebModule; +import com.sun.enterprise.web.session.PersistenceType; +import com.sun.enterprise.web.session.SessionCookieConfig; +import com.sun.web.security.RealmAdapter; + +import jakarta.annotation.security.DeclareRoles; +import jakarta.annotation.security.RunAs; +import jakarta.servlet.Filter; +import jakarta.servlet.HttpMethodConstraintElement; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.ServletSecurityElement; +import jakarta.servlet.annotation.MultipartConfig; +import jakarta.servlet.annotation.ServletSecurity; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpUpgradeHandler; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -133,42 +140,35 @@ import org.glassfish.web.valve.GlassFishValve; import org.jvnet.hk2.config.types.Property; -import com.sun.enterprise.config.serverbeans.Application; -import com.sun.enterprise.config.serverbeans.ConfigBeansUtilities; -import com.sun.enterprise.container.common.spi.util.JavaEEIOUtils; -import com.sun.enterprise.deployment.RunAsIdentityDescriptor; -import com.sun.enterprise.deployment.WebBundleDescriptor; -import com.sun.enterprise.deployment.WebComponentDescriptor; -import com.sun.enterprise.deployment.WebServiceEndpoint; -import com.sun.enterprise.deployment.WebServicesDescriptor; -import com.sun.enterprise.deployment.runtime.web.SunWebApp; -import com.sun.enterprise.deployment.web.LoginConfiguration; -import com.sun.enterprise.deployment.web.SecurityConstraint; -import com.sun.enterprise.deployment.web.ServletFilterMapping; -import com.sun.enterprise.deployment.web.UserDataConstraint; -import com.sun.enterprise.deployment.web.WebResourceCollection; -import com.sun.enterprise.security.integration.RealmInitializer; -import com.sun.enterprise.universal.GFBase64Decoder; -import com.sun.enterprise.universal.GFBase64Encoder; -import com.sun.enterprise.util.Utility; -import com.sun.enterprise.web.deploy.LoginConfigDecorator; -import com.sun.enterprise.web.pwc.PwcWebModule; -import com.sun.enterprise.web.session.PersistenceType; -import com.sun.enterprise.web.session.SessionCookieConfig; -import com.sun.web.security.RealmAdapter; - -import jakarta.annotation.security.DeclareRoles; -import jakarta.annotation.security.RunAs; -import jakarta.servlet.Filter; -import jakarta.servlet.HttpMethodConstraintElement; -import jakarta.servlet.Servlet; -import jakarta.servlet.ServletContext; -import jakarta.servlet.ServletContextListener; -import jakarta.servlet.ServletSecurityElement; -import jakarta.servlet.annotation.MultipartConfig; -import jakarta.servlet.annotation.ServletSecurity; -import jakarta.servlet.http.HttpSession; -import jakarta.servlet.http.HttpUpgradeHandler; +import static com.sun.enterprise.config.serverbeans.ServerTags.DIRECTORY_DEPLOYED; +import static com.sun.enterprise.deployment.web.UserDataConstraint.CONFIDENTIAL_TRANSPORT; +import static com.sun.enterprise.deployment.web.UserDataConstraint.NONE_TRANSPORT; +import static com.sun.enterprise.util.Utility.isAnyNull; +import static com.sun.enterprise.util.Utility.isEmpty; +import static com.sun.enterprise.web.Constants.DEPLOYMENT_CONTEXT_ATTRIBUTE; +import static com.sun.enterprise.web.Constants.ENABLE_HA_ATTRIBUTE; +import static com.sun.enterprise.web.Constants.IS_DISTRIBUTABLE_ATTRIBUTE; +import static java.text.MessageFormat.format; +import static java.util.Collections.emptyMap; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.FINEST; +import static java.util.logging.Level.SEVERE; +import static java.util.logging.Level.WARNING; +import static java.util.stream.Collectors.toSet; +import static org.glassfish.embeddable.web.config.TransportGuarantee.CONFIDENTIAL; +import static org.glassfish.web.LogFacade.ALTERNATE_DOC_BASE_NULL_PROPERTY_NAME_VALVE; +import static org.glassfish.web.LogFacade.ALT_DD_NAME; +import static org.glassfish.web.LogFacade.CONFIGURE_SESSION_MANAGER; +import static org.glassfish.web.LogFacade.CREATE_CUSTOM_BOJECT_OUTPUT_STREAM_ERROR; +import static org.glassfish.web.LogFacade.NULL_WEB_MODULE_PROPERTY; +import static org.glassfish.web.LogFacade.PERSISTENCE_STRATEGY_BUILDER; +import static org.glassfish.web.LogFacade.UNABLE_TO_LOAD_EXTENSION; +import static org.glassfish.web.LogFacade.VALVE_MISSING_PROPERTY_NAME; +import static org.glassfish.web.LogFacade.VALVE_SETTER_CAUSED_EXCEPTION; +import static org.glassfish.web.LogFacade.VALVE_SPECIFIED_METHOD_MISSING; +import static org.glassfish.web.deployment.annotation.handlers.ServletSecurityHandler.createSecurityConstraint; +import static org.glassfish.web.deployment.annotation.handlers.ServletSecurityHandler.getUrlPatternsWithoutSecurityConstraint; +import static org.glassfish.web.loader.ServletContainerInitializerUtil.getServletContainerInitializers; /** * Class representing a web module for use by the Application Server. diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleConfig.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleConfig.java index f68b063bacf..35bd6561ffc 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleConfig.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleConfig.java @@ -18,11 +18,12 @@ import com.sun.enterprise.config.serverbeans.Application; import com.sun.enterprise.util.io.FileUtils; -import org.glassfish.api.deployment.DeploymentContext; -import org.glassfish.web.deployment.descriptor.WebBundleDescriptorImpl; import java.io.File; +import org.glassfish.api.deployment.DeploymentContext; +import org.glassfish.web.deployment.descriptor.WebBundleDescriptorImpl; + /** * Represents the configuration parameters required in order to create * and install a web module (web application) into the server runtime. diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleListener.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleListener.java index 9c7be5d49e5..ac32dc2a5b2 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleListener.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleListener.java @@ -28,6 +28,7 @@ import jakarta.servlet.ServletContext; +import java.io.IOException; import java.net.URI; import java.util.ArrayList; import java.util.Collection; @@ -49,7 +50,12 @@ import org.apache.catalina.Wrapper; import org.glassfish.api.invocation.InvocationManager; import org.glassfish.api.web.TldProvider; +import org.glassfish.hk2.api.DynamicConfigurationService; +import org.glassfish.hk2.api.MultiException; +import org.glassfish.hk2.api.Populator; import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.hk2.api.ServiceLocatorFactory; +import org.glassfish.hk2.utilities.ClasspathDescriptorFileFinder; import org.glassfish.loader.util.ASClassLoaderUtil; import org.glassfish.web.LogFacade; import org.glassfish.web.deployment.runtime.SunWebAppImpl; @@ -61,13 +67,6 @@ import static java.util.logging.Level.WARNING; import static org.glassfish.web.LogFacade.CLASS_CAST_EXCEPTION; -import java.io.IOException; -import org.glassfish.hk2.api.DynamicConfigurationService; -import org.glassfish.hk2.api.MultiException; -import org.glassfish.hk2.api.Populator; -import org.glassfish.hk2.api.ServiceLocatorFactory; -import org.glassfish.hk2.utilities.ClasspathDescriptorFileFinder; - /** * Startup event listener for a Context that configures the properties of that Jsp Servlet from sun-web.xml */ diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebPipeline.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebPipeline.java index 597cf169eae..55e3cf8f2c0 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebPipeline.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebPipeline.java @@ -16,6 +16,9 @@ package com.sun.enterprise.web; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; + import java.io.IOException; import org.apache.catalina.Container; @@ -24,9 +27,6 @@ import org.apache.catalina.Response; import org.apache.catalina.core.StandardPipeline; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServletRequest; - /** * Pipeline whose invoke logic checks if a given request path represents an ad-hoc path: If so, this pipeline delegates * the request to the ad-hoc pipeline of its associated web module. Otherwise, this pipeline processes the request. diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/accesslog/CombinedAccessLogFormatterImpl.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/accesslog/CombinedAccessLogFormatterImpl.java index 7b9ba4a703a..86269884a5b 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/accesslog/CombinedAccessLogFormatterImpl.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/accesslog/CombinedAccessLogFormatterImpl.java @@ -17,13 +17,14 @@ package com.sun.enterprise.web.accesslog; -import org.apache.catalina.Request; -import org.apache.catalina.Response; - import jakarta.servlet.ServletRequest; import jakarta.servlet.http.HttpServletRequest; + import java.nio.CharBuffer; +import org.apache.catalina.Request; +import org.apache.catalina.Response; + /** * Access log formatter using the combined access log format from Apache. */ diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/connector/MapperListener.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/connector/MapperListener.java index a654d302f41..3113e7839c4 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/connector/MapperListener.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/connector/MapperListener.java @@ -17,16 +17,24 @@ package com.sun.enterprise.web.connector; -import javax.management.*; +import com.sun.enterprise.config.serverbeans.HttpService; +import com.sun.enterprise.config.serverbeans.VirtualServer; +import com.sun.enterprise.web.WebContainer; + import java.text.MessageFormat; import java.util.ResourceBundle; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.web.WebContainer; -import com.sun.enterprise.config.serverbeans.HttpService; -import com.sun.enterprise.config.serverbeans.VirtualServer; -import org.apache.catalina.*; + +import javax.management.MBeanServerNotification; +import javax.management.Notification; +import javax.management.NotificationFilter; +import javax.management.NotificationListener; +import javax.management.ObjectName; + +import org.apache.catalina.Container; +import org.apache.catalina.Engine; import org.apache.catalina.core.ContainerBase; import org.apache.catalina.core.ContextsAdapterUtility; import org.apache.catalina.core.StandardContext; diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/connector/extension/CatalinaListener.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/connector/extension/CatalinaListener.java index 3852d27bed0..643939ccffa 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/connector/extension/CatalinaListener.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/connector/extension/CatalinaListener.java @@ -16,7 +16,11 @@ package com.sun.enterprise.web.connector.extension; -import org.apache.catalina.*; +import org.apache.catalina.Container; +import org.apache.catalina.ContainerEvent; +import org.apache.catalina.ContainerListener; +import org.apache.catalina.Context; +import org.apache.catalina.Host; /** * Listener used to receive events from Catalina when a Context diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/connector/extension/GrizzlyConfig.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/connector/extension/GrizzlyConfig.java index 056d1adfde0..35f70317c60 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/connector/extension/GrizzlyConfig.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/connector/extension/GrizzlyConfig.java @@ -23,18 +23,20 @@ import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.ModuleMonitoringLevels; import com.sun.enterprise.web.WebContainer; -import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.j2ee.statistics.Stats; -import org.glassfish.web.LogFacade; -import javax.management.ObjectName; import java.text.MessageFormat; import java.util.ArrayList; import java.util.ResourceBundle; import java.util.logging.Level; import java.util.logging.Logger; +import javax.management.ObjectName; + +import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.j2ee.statistics.Stats; +import org.glassfish.web.LogFacade; + /** * This class track monitoring or Grizzly, using JMX to invoke Grizzly main * classes. diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/ContextEjbDecorator.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/ContextEjbDecorator.java index 719077e38c7..07844ea600b 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/ContextEjbDecorator.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/ContextEjbDecorator.java @@ -17,6 +17,7 @@ package com.sun.enterprise.web.deploy; import com.sun.enterprise.deployment.EjbReferenceDescriptor; + import org.apache.catalina.deploy.ContextEjb; /** diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/ContextEnvironmentDecorator.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/ContextEnvironmentDecorator.java index 188e2475ffe..e102ef1fb76 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/ContextEnvironmentDecorator.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/ContextEnvironmentDecorator.java @@ -17,6 +17,7 @@ package com.sun.enterprise.web.deploy; import com.sun.enterprise.deployment.EnvironmentProperty; + import org.apache.catalina.deploy.ContextEnvironment; diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/ContextLocalEjbDecorator.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/ContextLocalEjbDecorator.java index 6d2cf51b923..f635928b57a 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/ContextLocalEjbDecorator.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/ContextLocalEjbDecorator.java @@ -17,6 +17,7 @@ package com.sun.enterprise.web.deploy; import com.sun.enterprise.deployment.EjbReferenceDescriptor; + import org.apache.catalina.deploy.ContextLocalEjb; diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/ContextResourceDecorator.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/ContextResourceDecorator.java index 2e70e1b27e8..7e064f27362 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/ContextResourceDecorator.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/ContextResourceDecorator.java @@ -18,6 +18,7 @@ import com.sun.enterprise.deployment.ResourceReferenceDescriptor; + import org.apache.catalina.deploy.ContextResource; diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/FilterDefDecorator.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/FilterDefDecorator.java index 2f0d59a7514..7f66a8c6334 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/FilterDefDecorator.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/FilterDefDecorator.java @@ -18,11 +18,12 @@ import com.sun.enterprise.deployment.web.InitializationParameter; import com.sun.enterprise.deployment.web.ServletFilter; -import org.apache.catalina.deploy.FilterDef; import java.util.Map; import java.util.Vector; +import org.apache.catalina.deploy.FilterDef; + /** * Decorator of class org.apache.catalina.deploy.FilterDef diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/LoginConfigDecorator.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/LoginConfigDecorator.java index ba58ec47ec5..b5bd3d37882 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/LoginConfigDecorator.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/LoginConfigDecorator.java @@ -17,6 +17,7 @@ package com.sun.enterprise.web.deploy; import com.sun.enterprise.deployment.web.LoginConfiguration; + import org.apache.catalina.deploy.LoginConfig; import org.apache.catalina.util.RequestUtil; diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/MessageDestinationDecorator.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/MessageDestinationDecorator.java index 896b3ebc7a6..6474b792365 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/MessageDestinationDecorator.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/MessageDestinationDecorator.java @@ -18,6 +18,7 @@ import com.sun.enterprise.deployment.MessageDestinationDescriptor; + import org.apache.catalina.deploy.MessageDestination; diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/MessageDestinationRefDecorator.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/MessageDestinationRefDecorator.java index 2772c708d02..2e655e7063f 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/MessageDestinationRefDecorator.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/MessageDestinationRefDecorator.java @@ -17,6 +17,7 @@ package com.sun.enterprise.web.deploy; import com.sun.enterprise.deployment.MessageDestinationReferenceDescriptor; + import org.apache.catalina.deploy.MessageDestinationRef; diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/SecurityCollectionDecorator.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/SecurityCollectionDecorator.java index 4040c8cccfc..a3c579e0323 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/SecurityCollectionDecorator.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/deploy/SecurityCollectionDecorator.java @@ -17,6 +17,7 @@ package com.sun.enterprise.web.deploy; import com.sun.enterprise.deployment.web.WebResourceCollection; + import org.apache.catalina.deploy.SecurityCollection; /** diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/jsp/JspProbeEmitterImpl.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/jsp/JspProbeEmitterImpl.java index 1449d6a2423..b8652f44ccd 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/jsp/JspProbeEmitterImpl.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/jsp/JspProbeEmitterImpl.java @@ -18,6 +18,7 @@ import com.sun.enterprise.web.VirtualServer; import com.sun.enterprise.web.WebModule; + import org.glassfish.jsp.api.JspProbeEmitter; import org.glassfish.web.admin.monitor.JspProbeProvider; diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/jsp/ResourceInjectorImpl.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/jsp/ResourceInjectorImpl.java index 768220142bc..081fa41186f 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/jsp/ResourceInjectorImpl.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/jsp/ResourceInjectorImpl.java @@ -19,16 +19,18 @@ import com.sun.enterprise.container.common.spi.util.InjectionManager; import com.sun.enterprise.deployment.JndiNameEnvironment; import com.sun.enterprise.web.WebModule; -import org.glassfish.internal.api.ServerContext; -import org.glassfish.jsp.api.ResourceInjector; -import org.glassfish.web.LogFacade; import jakarta.servlet.jsp.tagext.JspTag; + import java.text.MessageFormat; import java.util.ResourceBundle; import java.util.logging.Level; import java.util.logging.Logger; +import org.glassfish.internal.api.ServerContext; +import org.glassfish.jsp.api.ResourceInjector; +import org.glassfish.web.LogFacade; + /** * Implementation of org.glassfish.jsp.api.ResourceInjector * diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/logger/FileLoggerHandlerFactory.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/logger/FileLoggerHandlerFactory.java index dfb4cd8728f..0b31b84bd18 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/logger/FileLoggerHandlerFactory.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/logger/FileLoggerHandlerFactory.java @@ -16,14 +16,15 @@ package com.sun.enterprise.web.logger; +import jakarta.inject.Inject; + import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.logging.Formatter; -import jakarta.inject.Inject; +import org.glassfish.hk2.api.PostConstruct; import org.jvnet.hk2.annotations.Optional; import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PostConstruct; /** * A factory for FileLoggerHandler. diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/logger/LoggerBase.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/logger/LoggerBase.java index 261abae765a..9cf321e5ed1 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/logger/LoggerBase.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/logger/LoggerBase.java @@ -16,16 +16,17 @@ package com.sun.enterprise.web.logger; -import org.apache.catalina.Container; -import org.apache.catalina.LifecycleException; -import org.apache.catalina.Logger; - import jakarta.servlet.ServletException; + import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.io.CharArrayWriter; import java.io.PrintWriter; +import org.apache.catalina.Container; +import org.apache.catalina.LifecycleException; +import org.apache.catalina.Logger; + /** * Convenience base class for Logger implementations. The only * method that must be implemented is diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/pwc/PwcWebContainerLifecycle.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/pwc/PwcWebContainerLifecycle.java index 43305313b79..06dff70c788 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/pwc/PwcWebContainerLifecycle.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/pwc/PwcWebContainerLifecycle.java @@ -16,6 +16,8 @@ package com.sun.enterprise.web.pwc; +import com.sun.appserv.server.ServerLifecycleException; + import org.apache.catalina.Logger; public interface PwcWebContainerLifecycle { diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/pwc/PwcWebModule.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/pwc/PwcWebModule.java index 24479cda702..de07c971a30 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/pwc/PwcWebModule.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/pwc/PwcWebModule.java @@ -17,15 +17,15 @@ package com.sun.enterprise.web.pwc; +import com.sun.enterprise.web.session.SessionCookieConfig; +import com.sun.enterprise.web.session.WebSessionCookieConfig; + import java.util.Enumeration; import org.apache.catalina.Wrapper; import org.apache.catalina.core.StandardContext; import org.apache.catalina.core.StandardWrapper; -import com.sun.enterprise.web.session.SessionCookieConfig; -import com.sun.enterprise.web.session.WebSessionCookieConfig; - /** * Class representing a web module (servlet context). */ diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/pwc/connector/coyote/PwcCoyoteRequest.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/pwc/connector/coyote/PwcCoyoteRequest.java index 63046b67712..0588a21b090 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/pwc/connector/coyote/PwcCoyoteRequest.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/pwc/connector/coyote/PwcCoyoteRequest.java @@ -19,13 +19,9 @@ import com.sun.enterprise.web.pwc.PwcWebModule; import com.sun.enterprise.web.session.WebSessionCookieConfig; import com.sun.enterprise.web.session.WebSessionCookieConfig.CookieSecureType; -import org.apache.catalina.Context; -import org.apache.catalina.connector.Connector; -import org.apache.catalina.connector.Request; -import org.apache.catalina.connector.Response; -import org.glassfish.web.LogFacade; import jakarta.servlet.http.Cookie; + import java.io.BufferedReader; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -35,6 +31,12 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.catalina.Context; +import org.apache.catalina.connector.Connector; +import org.apache.catalina.connector.Request; +import org.apache.catalina.connector.Response; +import org.glassfish.web.LogFacade; + /** * Customized version of the Tomcat 5 CoyoteRequest * This is required for supporting Web Programmatic Login and setting the diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/reconfig/WebConfigListener.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/reconfig/WebConfigListener.java index fbd65d43b14..9b646839b6c 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/reconfig/WebConfigListener.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/reconfig/WebConfigListener.java @@ -24,26 +24,33 @@ import com.sun.enterprise.config.serverbeans.VirtualServer; import com.sun.enterprise.v3.services.impl.MapperUpdateListener; import com.sun.enterprise.web.WebContainer; -import org.glassfish.grizzly.config.dom.NetworkListener; -import org.glassfish.web.LogFacade; -import org.glassfish.web.config.serverbeans.ManagerProperties; -import org.glassfish.web.config.serverbeans.WebContainerAvailability; -import org.apache.catalina.LifecycleException; + import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Optional; import jakarta.inject.Named; -import org.jvnet.hk2.config.*; -import org.jvnet.hk2.config.types.Property; import java.beans.PropertyChangeEvent; import java.util.ArrayList; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; + +import org.apache.catalina.LifecycleException; import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.grizzly.config.dom.NetworkConfig; +import org.glassfish.grizzly.config.dom.NetworkListener; import org.glassfish.grizzly.config.dom.NetworkListeners; import org.glassfish.grizzly.http.server.util.Mapper; +import org.glassfish.web.LogFacade; +import org.glassfish.web.config.serverbeans.ManagerProperties; +import org.glassfish.web.config.serverbeans.WebContainerAvailability; +import org.jvnet.hk2.annotations.Optional; +import org.jvnet.hk2.config.Changed; +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.ConfigListener; +import org.jvnet.hk2.config.ConfigSupport; +import org.jvnet.hk2.config.NotProcessed; +import org.jvnet.hk2.config.UnprocessedChangeEvents; +import org.jvnet.hk2.config.types.Property; /** diff --git a/appserver/web/web-glue/src/main/java/com/sun/web/server/DecoratorForEEInstanceListener.java b/appserver/web/web-glue/src/main/java/com/sun/web/server/DecoratorForEEInstanceListener.java index 88ed3b1e087..791d3be3999 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/web/server/DecoratorForEEInstanceListener.java +++ b/appserver/web/web-glue/src/main/java/com/sun/web/server/DecoratorForEEInstanceListener.java @@ -17,11 +17,11 @@ package com.sun.web.server; -import org.jvnet.hk2.annotations.Service; - import com.sun.enterprise.web.WebModule; import com.sun.enterprise.web.WebModuleDecorator; +import org.jvnet.hk2.annotations.Service; + /** * {@link WebModuleDecorator} that inserts {@link EEInstanceListener}. * diff --git a/appserver/web/web-glue/src/main/java/com/sun/web/server/EEInstanceListener.java b/appserver/web/web-glue/src/main/java/com/sun/web/server/EEInstanceListener.java index 5772c01a84b..db6d010db62 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/web/server/EEInstanceListener.java +++ b/appserver/web/web-glue/src/main/java/com/sun/web/server/EEInstanceListener.java @@ -17,22 +17,20 @@ package com.sun.web.server; -import static com.sun.enterprise.security.integration.SecurityConstants.WEB_PRINCIPAL_CLASS; -import static com.sun.enterprise.util.Utility.isOneOf; -import static java.security.Policy.getPolicy; -import static java.text.MessageFormat.format; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.SEVERE; -import static org.apache.catalina.InstanceEvent.EventType.AFTER_DESTROY_EVENT; -import static org.apache.catalina.InstanceEvent.EventType.AFTER_FILTER_EVENT; -import static org.apache.catalina.InstanceEvent.EventType.AFTER_INIT_EVENT; -import static org.apache.catalina.InstanceEvent.EventType.AFTER_SERVICE_EVENT; -import static org.apache.catalina.InstanceEvent.EventType.BEFORE_FILTER_EVENT; -import static org.apache.catalina.InstanceEvent.EventType.BEFORE_SERVICE_EVENT; -import static org.glassfish.web.LogFacade.EXCEPTION_DURING_HANDLE_EVENT; -import static org.glassfish.web.LogFacade.NO_SERVER_CONTEXT; -import static org.glassfish.web.LogFacade.SECURITY_CONTEXT_FAILED; -import static org.glassfish.web.LogFacade.SECURITY_CONTEXT_OBTAINED; +import com.sun.enterprise.container.common.spi.util.InjectionException; +import com.sun.enterprise.container.common.spi.util.InjectionManager; +import com.sun.enterprise.security.integration.AppServSecurityContext; +import com.sun.enterprise.security.integration.RealmInitializer; +import com.sun.enterprise.transaction.api.JavaEETransactionManager; +import com.sun.enterprise.web.WebComponentInvocation; +import com.sun.enterprise.web.WebModule; + +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletRequestWrapper; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.security.AccessControlException; import java.security.AccessController; @@ -59,20 +57,22 @@ import org.glassfish.wasp.servlet.JspServlet; import org.glassfish.web.LogFacade; -import com.sun.enterprise.container.common.spi.util.InjectionException; -import com.sun.enterprise.container.common.spi.util.InjectionManager; -import com.sun.enterprise.security.integration.AppServSecurityContext; -import com.sun.enterprise.security.integration.RealmInitializer; -import com.sun.enterprise.transaction.api.JavaEETransactionManager; -import com.sun.enterprise.web.WebComponentInvocation; -import com.sun.enterprise.web.WebModule; - -import jakarta.servlet.Servlet; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletRequestWrapper; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import static com.sun.enterprise.security.integration.SecurityConstants.WEB_PRINCIPAL_CLASS; +import static com.sun.enterprise.util.Utility.isOneOf; +import static java.security.Policy.getPolicy; +import static java.text.MessageFormat.format; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.SEVERE; +import static org.apache.catalina.InstanceEvent.EventType.AFTER_DESTROY_EVENT; +import static org.apache.catalina.InstanceEvent.EventType.AFTER_FILTER_EVENT; +import static org.apache.catalina.InstanceEvent.EventType.AFTER_INIT_EVENT; +import static org.apache.catalina.InstanceEvent.EventType.AFTER_SERVICE_EVENT; +import static org.apache.catalina.InstanceEvent.EventType.BEFORE_FILTER_EVENT; +import static org.apache.catalina.InstanceEvent.EventType.BEFORE_SERVICE_EVENT; +import static org.glassfish.web.LogFacade.EXCEPTION_DURING_HANDLE_EVENT; +import static org.glassfish.web.LogFacade.NO_SERVER_CONTEXT; +import static org.glassfish.web.LogFacade.SECURITY_CONTEXT_FAILED; +import static org.glassfish.web.LogFacade.SECURITY_CONTEXT_OBTAINED; /** * This class implements the Tomcat InstanceListener interface and handles the INIT,DESTROY and SERVICE, FILTER events. diff --git a/appserver/web/web-glue/src/main/java/com/sun/web/server/WebContainerListener.java b/appserver/web/web-glue/src/main/java/com/sun/web/server/WebContainerListener.java index 7107a031293..fe8ef5010b6 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/web/server/WebContainerListener.java +++ b/appserver/web/web-glue/src/main/java/com/sun/web/server/WebContainerListener.java @@ -17,17 +17,11 @@ package com.sun.web.server; -import static java.text.MessageFormat.format; -import static java.util.logging.Level.FINEST; -import static java.util.logging.Level.SEVERE; -import static org.apache.catalina.ContainerEvent.AFTER_CONTEXT_DESTROYED; -import static org.apache.catalina.ContainerEvent.AFTER_FILTER_DESTROYED; -import static org.apache.catalina.ContainerEvent.BEFORE_CONTEXT_DESTROYED; -import static org.apache.catalina.ContainerEvent.PRE_DESTROY; -import static org.glassfish.api.naming.SimpleJndiName.JNDI_CTX_JAVA_COMPONENT; -import static org.glassfish.web.LogFacade.EXCEPTION_DURING_DESTROY_MANAGED_OBJECT; -import static org.glassfish.web.LogFacade.EXCEPTION_DURING_HANDLE_EVENT; -import static org.glassfish.web.LogFacade.EXCEPTION_GETTING_VALIDATOR_FACTORY; +import com.sun.enterprise.container.common.spi.util.InjectionManager; +import com.sun.enterprise.web.WebComponentInvocation; +import com.sun.enterprise.web.WebModule; + +import jakarta.validation.ValidatorFactory; import java.util.HashSet; import java.util.ResourceBundle; @@ -44,11 +38,17 @@ import org.glassfish.api.naming.NamedNamingObjectProxy; import org.glassfish.web.LogFacade; -import com.sun.enterprise.container.common.spi.util.InjectionManager; -import com.sun.enterprise.web.WebComponentInvocation; -import com.sun.enterprise.web.WebModule; - -import jakarta.validation.ValidatorFactory; +import static java.text.MessageFormat.format; +import static java.util.logging.Level.FINEST; +import static java.util.logging.Level.SEVERE; +import static org.apache.catalina.ContainerEvent.AFTER_CONTEXT_DESTROYED; +import static org.apache.catalina.ContainerEvent.AFTER_FILTER_DESTROYED; +import static org.apache.catalina.ContainerEvent.BEFORE_CONTEXT_DESTROYED; +import static org.apache.catalina.ContainerEvent.PRE_DESTROY; +import static org.glassfish.api.naming.SimpleJndiName.JNDI_CTX_JAVA_COMPONENT; +import static org.glassfish.web.LogFacade.EXCEPTION_DURING_DESTROY_MANAGED_OBJECT; +import static org.glassfish.web.LogFacade.EXCEPTION_DURING_HANDLE_EVENT; +import static org.glassfish.web.LogFacade.EXCEPTION_GETTING_VALIDATOR_FACTORY; /** * This class implements the Tomcat ContainerListener interface and handles Context and Session related events. diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/LibrariesTldProvider.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/LibrariesTldProvider.java index 0f8162fad92..0ead8503f0c 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/LibrariesTldProvider.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/LibrariesTldProvider.java @@ -17,12 +17,8 @@ package org.glassfish.web; import com.sun.enterprise.util.net.JarURIPattern; -import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.api.web.TldProvider; -import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PostConstruct; +import jakarta.inject.Inject; import jakarta.inject.Singleton; import java.io.File; @@ -34,6 +30,11 @@ import java.util.Map; import java.util.regex.Pattern; +import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.api.web.TldProvider; +import org.glassfish.hk2.api.PostConstruct; +import org.jvnet.hk2.annotations.Service; + /** * Implementation of TldProvider for libraries in lib and DOMAIN_ROOT/lib/applibs. * @author Shing Wai Chan diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/LogFacade.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/LogFacade.java index c64f022544d..f28634da2ca 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/LogFacade.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/LogFacade.java @@ -17,10 +17,11 @@ package org.glassfish.web; +import java.util.logging.Logger; + import org.glassfish.logging.annotation.LogMessageInfo; -import org.glassfish.logging.annotation.LoggerInfo; import org.glassfish.logging.annotation.LogMessagesResourceBundle; -import java.util.logging.Logger; +import org.glassfish.logging.annotation.LoggerInfo; /** /** diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/WebEntityResolver.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/WebEntityResolver.java index bcf7513281e..ccc5dcc57d0 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/WebEntityResolver.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/WebEntityResolver.java @@ -17,20 +17,22 @@ package org.glassfish.web; import com.sun.enterprise.util.MapBuilder; + +import jakarta.inject.Inject; + +import java.io.File; +import java.io.IOException; +import java.util.Map; + import org.apache.catalina.startup.Constants; +import org.glassfish.hk2.api.PostConstruct; import org.glassfish.internal.api.ServerContext; import org.jvnet.hk2.annotations.ContractsProvided; -import jakarta.inject.Inject; import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PostConstruct; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import java.io.File; -import java.io.IOException; -import java.util.Map; - /** * {@link EntityResolver} that recognizes known public IDs of JavaEE DTDs/schemas * and return a local copy. diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/config/WebSslConfigHandler.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/config/WebSslConfigHandler.java index e0b6aa68c93..ae7365ed864 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/config/WebSslConfigHandler.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/config/WebSslConfigHandler.java @@ -16,11 +16,13 @@ package org.glassfish.web.config; -import java.text.MessageFormat; -import java.util.ResourceBundle; import com.sun.enterprise.admin.commands.CreateSsl; import com.sun.enterprise.admin.commands.DeleteSsl; import com.sun.enterprise.admin.commands.SslConfigHandler; + +import java.text.MessageFormat; +import java.util.ResourceBundle; + import org.glassfish.api.ActionReport; import org.glassfish.grizzly.config.dom.NetworkConfig; import org.glassfish.grizzly.config.dom.NetworkListener; diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/AbstractWebHandler.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/AbstractWebHandler.java index 4fd145259e9..b664eee1030 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/AbstractWebHandler.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/AbstractWebHandler.java @@ -20,6 +20,7 @@ import com.sun.enterprise.deployment.annotation.context.WebComponentContext; import com.sun.enterprise.deployment.annotation.context.WebComponentsContext; import com.sun.enterprise.deployment.annotation.handlers.AbstractHandler; + import org.glassfish.apf.AnnotatedElementHandler; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/MultipartConfigHandler.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/MultipartConfigHandler.java index 13e0fdf0607..5bd887b7e0d 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/MultipartConfigHandler.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/MultipartConfigHandler.java @@ -19,13 +19,19 @@ import com.sun.enterprise.deployment.WebComponentDescriptor; import com.sun.enterprise.deployment.annotation.context.WebBundleContext; import com.sun.enterprise.deployment.annotation.context.WebComponentContext; -import org.glassfish.web.deployment.descriptor.MultipartConfigDescriptor; -import org.glassfish.apf.*; -import org.jvnet.hk2.annotations.Service; import jakarta.servlet.annotation.MultipartConfig; + import java.lang.annotation.Annotation; +import org.glassfish.apf.AnnotationHandlerFor; +import org.glassfish.apf.AnnotationInfo; +import org.glassfish.apf.AnnotationProcessorException; +import org.glassfish.apf.HandlerProcessingResult; +import org.glassfish.apf.ResultType; +import org.glassfish.web.deployment.descriptor.MultipartConfigDescriptor; +import org.jvnet.hk2.annotations.Service; + /** * This handler is responsible in handling * jakarta.servlet.annotation.MultipartConfig. diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/WebListenerHandler.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/WebListenerHandler.java index c85b6a8646d..6f760df3b23 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/WebListenerHandler.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/WebListenerHandler.java @@ -21,23 +21,25 @@ import com.sun.enterprise.deployment.annotation.context.WebComponentContext; import com.sun.enterprise.deployment.web.AppListenerDescriptor; import com.sun.enterprise.util.LocalStringManagerImpl; -import org.glassfish.apf.AnnotationHandlerFor; -import org.glassfish.apf.AnnotationInfo; -import org.glassfish.apf.AnnotationProcessorException; -import org.glassfish.apf.HandlerProcessingResult; -import org.glassfish.web.deployment.descriptor.AppListenerDescriptorImpl; -import org.jvnet.hk2.annotations.Service; -import jakarta.servlet.ServletContextListener; import jakarta.servlet.ServletContextAttributeListener; -import jakarta.servlet.ServletRequestListener; +import jakarta.servlet.ServletContextListener; import jakarta.servlet.ServletRequestAttributeListener; +import jakarta.servlet.ServletRequestListener; import jakarta.servlet.annotation.WebListener; import jakarta.servlet.http.HttpSessionAttributeListener; import jakarta.servlet.http.HttpSessionIdListener; import jakarta.servlet.http.HttpSessionListener; + import java.util.logging.Level; +import org.glassfish.apf.AnnotationHandlerFor; +import org.glassfish.apf.AnnotationInfo; +import org.glassfish.apf.AnnotationProcessorException; +import org.glassfish.apf.HandlerProcessingResult; +import org.glassfish.web.deployment.descriptor.AppListenerDescriptorImpl; +import org.jvnet.hk2.annotations.Service; + /** * This handler is responsible in handling * jakarta.servlet.annotation.WebListener. diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/WebServletHandler.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/WebServletHandler.java index bb8ad04ae62..aa24941d295 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/WebServletHandler.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/WebServletHandler.java @@ -23,16 +23,23 @@ import com.sun.enterprise.deployment.annotation.context.WebComponentContext; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.net.URLPattern; -import org.glassfish.apf.*; -import org.glassfish.web.deployment.descriptor.WebComponentDescriptorImpl; -import org.jvnet.hk2.annotations.Service; import jakarta.servlet.annotation.WebInitParam; import jakarta.servlet.annotation.WebServlet; import jakarta.servlet.http.HttpServlet; + import java.util.Arrays; import java.util.logging.Level; +import org.glassfish.apf.AnnotatedElementHandler; +import org.glassfish.apf.AnnotationHandlerFor; +import org.glassfish.apf.AnnotationInfo; +import org.glassfish.apf.AnnotationProcessorException; +import org.glassfish.apf.HandlerProcessingResult; +import org.glassfish.apf.ResultType; +import org.glassfish.web.deployment.descriptor.WebComponentDescriptorImpl; +import org.jvnet.hk2.annotations.Service; + /** * This handler is responsible in handling * jakarta.servlet.annotation.WebServlet. diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/AppListenerDescriptorImpl.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/AppListenerDescriptorImpl.java index 6c72f0afcda..3f3d2adfe32 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/AppListenerDescriptorImpl.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/AppListenerDescriptorImpl.java @@ -17,6 +17,7 @@ package org.glassfish.web.deployment.descriptor; import com.sun.enterprise.deployment.web.AppListenerDescriptor; + import org.glassfish.deployment.common.Descriptor; /** diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/AuthorizationConstraintImpl.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/AuthorizationConstraintImpl.java index 641364dc45a..1c745ebad1f 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/AuthorizationConstraintImpl.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/AuthorizationConstraintImpl.java @@ -15,7 +15,9 @@ */ package org.glassfish.web.deployment.descriptor; -import static java.util.Collections.enumeration; +import com.sun.enterprise.deployment.SecurityRoleDescriptor; +import com.sun.enterprise.deployment.web.AuthorizationConstraint; +import com.sun.enterprise.deployment.web.SecurityRole; import java.util.Enumeration; import java.util.HashSet; @@ -23,9 +25,7 @@ import org.glassfish.deployment.common.Descriptor; -import com.sun.enterprise.deployment.SecurityRoleDescriptor; -import com.sun.enterprise.deployment.web.AuthorizationConstraint; -import com.sun.enterprise.deployment.web.SecurityRole; +import static java.util.Collections.enumeration; /** * This descriptor represents an authorization contraint on a security constraint in a web application. diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/CookieConfigDescriptor.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/CookieConfigDescriptor.java index de7d546330f..382c10e875c 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/CookieConfigDescriptor.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/CookieConfigDescriptor.java @@ -17,6 +17,7 @@ package org.glassfish.web.deployment.descriptor; import com.sun.enterprise.deployment.web.CookieConfig; + import org.glassfish.deployment.common.Descriptor; /** diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/JspGroupDescriptor.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/JspGroupDescriptor.java index 505ffb0669e..24fd9d11ebc 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/JspGroupDescriptor.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/JspGroupDescriptor.java @@ -18,11 +18,13 @@ package org.glassfish.web.deployment.descriptor; import com.sun.enterprise.deployment.OrderedSet; -import org.glassfish.deployment.common.Descriptor; -import java.util.Set; import jakarta.servlet.descriptor.JspPropertyGroupDescriptor; +import java.util.Set; + +import org.glassfish.deployment.common.Descriptor; + public class JspGroupDescriptor extends Descriptor implements JspPropertyGroupDescriptor { private String elIgnored; diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/LoginConfigurationImpl.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/LoginConfigurationImpl.java index 4d9060fbc59..e837c44b023 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/LoginConfigurationImpl.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/LoginConfigurationImpl.java @@ -19,14 +19,15 @@ import com.sun.enterprise.deployment.web.LoginConfiguration; import com.sun.enterprise.util.LocalStringManagerImpl; -import org.glassfish.deployment.common.Descriptor; -import org.glassfish.web.LogFacade; import java.text.MessageFormat; import java.util.logging.Level; import java.util.logging.Logger; //END OF IASRI 4660482 +import org.glassfish.deployment.common.Descriptor; +import org.glassfish.web.LogFacade; + /** * I dictate how the web app I belong to should be logged into. diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/MultipartConfigDescriptor.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/MultipartConfigDescriptor.java index b8e5ecad7de..8b506785242 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/MultipartConfigDescriptor.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/MultipartConfigDescriptor.java @@ -17,6 +17,7 @@ package org.glassfish.web.deployment.descriptor; import com.sun.enterprise.deployment.web.MultipartConfig; + import org.glassfish.deployment.common.Descriptor; /** diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/OrderingDescriptor.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/OrderingDescriptor.java index 600151124da..4b6922b5007 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/OrderingDescriptor.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/OrderingDescriptor.java @@ -16,16 +16,17 @@ package org.glassfish.web.deployment.descriptor; +import com.sun.enterprise.util.LocalStringManagerImpl; + import java.util.ArrayList; -import java.util.Iterator; import java.util.HashMap; +import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; import java.util.Stack; -import com.sun.enterprise.util.LocalStringManagerImpl; import org.glassfish.deployment.common.Descriptor; /** diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/OrderingOrderingDescriptor.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/OrderingOrderingDescriptor.java index 731395a1089..78154ad400b 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/OrderingOrderingDescriptor.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/OrderingOrderingDescriptor.java @@ -16,10 +16,11 @@ package org.glassfish.web.deployment.descriptor; +import com.sun.enterprise.util.LocalStringManagerImpl; + import java.util.Set; import java.util.TreeSet; -import com.sun.enterprise.util.LocalStringManagerImpl; import org.glassfish.deployment.common.Descriptor; /** diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/SecurityConstraintImpl.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/SecurityConstraintImpl.java index 131f494f6e8..73ce4d02455 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/SecurityConstraintImpl.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/SecurityConstraintImpl.java @@ -20,11 +20,12 @@ import com.sun.enterprise.deployment.web.SecurityConstraint; import com.sun.enterprise.deployment.web.UserDataConstraint; import com.sun.enterprise.deployment.web.WebResourceCollection; -import org.glassfish.deployment.common.Descriptor; import java.util.HashSet; import java.util.Set; +import org.glassfish.deployment.common.Descriptor; + /** * Objects exhibiting this interface represent a security constraint on the web application diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/ServletFilterDescriptor.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/ServletFilterDescriptor.java index aeaa9eecf74..e45cca6df42 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/ServletFilterDescriptor.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/ServletFilterDescriptor.java @@ -20,12 +20,13 @@ import com.sun.enterprise.deployment.EnvironmentProperty; import com.sun.enterprise.deployment.web.InitializationParameter; import com.sun.enterprise.deployment.web.ServletFilter; -import org.glassfish.deployment.common.Descriptor; import java.util.Collection; import java.util.Objects; import java.util.Vector; +import org.glassfish.deployment.common.Descriptor; + /** * Deployment object representing the servlet filter spec * diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/ServletFilterMappingDescriptor.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/ServletFilterMappingDescriptor.java index 561ae603c09..6f77158f133 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/ServletFilterMappingDescriptor.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/ServletFilterMappingDescriptor.java @@ -18,6 +18,8 @@ import com.sun.enterprise.deployment.web.ServletFilterMapping; +import jakarta.servlet.DispatcherType; + import java.util.EnumSet; import java.util.LinkedList; import java.util.List; @@ -25,8 +27,6 @@ import org.glassfish.deployment.common.Descriptor; -import jakarta.servlet.DispatcherType; - /** * Deployment object representing the servlet filter mapping spec * @author Martin D. Flynn diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/SessionConfigDescriptor.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/SessionConfigDescriptor.java index 979fe4e7b49..15a9dac2a33 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/SessionConfigDescriptor.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/SessionConfigDescriptor.java @@ -16,12 +16,14 @@ package org.glassfish.web.deployment.descriptor; +import com.sun.enterprise.deployment.web.CookieConfig; +import com.sun.enterprise.deployment.web.SessionConfig; + +import jakarta.servlet.SessionTrackingMode; + import java.util.EnumSet; import java.util.Set; -import jakarta.servlet.SessionTrackingMode; -import com.sun.enterprise.deployment.web.CookieConfig; -import com.sun.enterprise.deployment.web.SessionConfig; import org.glassfish.deployment.common.Descriptor; /** diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/UserDataConstraintImpl.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/UserDataConstraintImpl.java index 96abbb633aa..26995f00397 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/UserDataConstraintImpl.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/UserDataConstraintImpl.java @@ -18,6 +18,7 @@ import com.sun.enterprise.deployment.web.UserDataConstraint; import com.sun.enterprise.util.LocalStringManagerImpl; + import org.glassfish.deployment.common.Descriptor; 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 411ee881b9a..fcfd64c710c 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 @@ -58,8 +58,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.glassfish.api.deployment.archive.ReadableArchive; +import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.deployment.common.DescriptorVisitor; import org.glassfish.deployment.common.JavaEEResourceType; import org.glassfish.deployment.common.RootDeploymentDescriptor; 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 d36350bca7f..d10795f2ab1 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 @@ -39,12 +39,12 @@ import com.sun.enterprise.deployment.web.MimeMapping; import com.sun.enterprise.deployment.web.SecurityConstraint; import com.sun.enterprise.deployment.web.ServletFilter; + import java.util.Collections; import java.util.Enumeration; - import java.util.Set; -import org.glassfish.api.deployment.archive.ReadableArchive; +import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.deployment.common.JavaEEResourceType; /** diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/WebResourceCollectionImpl.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/WebResourceCollectionImpl.java index d357d9f20e8..c170ad30fde 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/WebResourceCollectionImpl.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/descriptor/WebResourceCollectionImpl.java @@ -17,11 +17,12 @@ package org.glassfish.web.deployment.descriptor; import com.sun.enterprise.deployment.web.WebResourceCollection; -import org.glassfish.deployment.common.Descriptor; import java.util.HashSet; import java.util.Set; +import org.glassfish.deployment.common.Descriptor; + /** * This descriptor represents a description of a portion of a web app * in terms of a collection of url patterns and diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/AbsoluteOrderingNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/AbsoluteOrderingNode.java index 6aff625b9d9..e4ad2eb7bee 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/AbsoluteOrderingNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/AbsoluteOrderingNode.java @@ -16,10 +16,11 @@ package org.glassfish.web.deployment.node; -import java.util.Map; - import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; import com.sun.enterprise.deployment.node.XMLElement; + +import java.util.Map; + import org.glassfish.web.deployment.descriptor.AbsoluteOrderingDescriptor; import org.glassfish.web.deployment.xml.WebTagNames; import org.w3c.dom.Node; diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/AuthConstraintNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/AuthConstraintNode.java index 69078e92a52..2fe2102b8eb 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/AuthConstraintNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/AuthConstraintNode.java @@ -24,13 +24,14 @@ import com.sun.enterprise.deployment.SecurityRoleDescriptor; import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; -import org.glassfish.web.deployment.descriptor.AuthorizationConstraintImpl; -import org.glassfish.web.deployment.xml.WebTagNames; -import org.w3c.dom.Node; import java.util.Enumeration; import java.util.Map; +import org.glassfish.web.deployment.descriptor.AuthorizationConstraintImpl; +import org.glassfish.web.deployment.xml.WebTagNames; +import org.w3c.dom.Node; + /** * This node contains the auth-constraint xml node * diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/CookieConfigNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/CookieConfigNode.java index b38e0cf1975..f39476b8754 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/CookieConfigNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/CookieConfigNode.java @@ -16,13 +16,13 @@ package org.glassfish.web.deployment.node; -import java.util.Map; - import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; import com.sun.enterprise.deployment.node.XMLElement; + +import java.util.Map; + import org.glassfish.web.deployment.descriptor.CookieConfigDescriptor; import org.glassfish.web.deployment.xml.WebTagNames; - import org.w3c.dom.Node; /** diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/FilterMappingNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/FilterMappingNode.java index eeaa2d0b191..dd21d66a386 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/FilterMappingNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/FilterMappingNode.java @@ -27,17 +27,18 @@ import com.sun.enterprise.deployment.node.XMLElement; import com.sun.enterprise.deployment.util.DOLUtils; import com.sun.enterprise.util.net.URLPattern; -import org.glassfish.web.LogFacade; -import org.glassfish.web.deployment.descriptor.ServletFilterMappingDescriptor; -import org.glassfish.web.deployment.xml.WebTagNames; -import org.w3c.dom.Node; + +import jakarta.servlet.DispatcherType; import java.text.MessageFormat; import java.util.Map; import java.util.ResourceBundle; import java.util.logging.Level; -import jakarta.servlet.DispatcherType; +import org.glassfish.web.LogFacade; +import org.glassfish.web.deployment.descriptor.ServletFilterMappingDescriptor; +import org.glassfish.web.deployment.xml.WebTagNames; +import org.w3c.dom.Node; /** diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/FilterNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/FilterNode.java index f84207cda80..42dc3ec29c6 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/FilterNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/FilterNode.java @@ -18,13 +18,14 @@ import com.sun.enterprise.deployment.node.DisplayableComponentNode; import com.sun.enterprise.deployment.node.XMLElement; -import org.glassfish.web.deployment.descriptor.ServletFilterDescriptor; -import org.glassfish.web.deployment.xml.WebTagNames; -import org.w3c.dom.Node; import java.util.Map; import java.util.Vector; +import org.glassfish.web.deployment.descriptor.ServletFilterDescriptor; +import org.glassfish.web.deployment.xml.WebTagNames; +import org.w3c.dom.Node; + /** * This class is responsible for handling filter xml node * diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/ListenerNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/ListenerNode.java index b44fc666892..da102fb5c4e 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/ListenerNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/ListenerNode.java @@ -17,13 +17,14 @@ package org.glassfish.web.deployment.node; import com.sun.enterprise.deployment.node.DisplayableComponentNode; -import org.glassfish.web.deployment.descriptor.AppListenerDescriptorImpl; -import org.glassfish.web.deployment.xml.WebTagNames; -import org.w3c.dom.Node; import java.util.HashMap; import java.util.Map; +import org.glassfish.web.deployment.descriptor.AppListenerDescriptorImpl; +import org.glassfish.web.deployment.xml.WebTagNames; +import org.w3c.dom.Node; + /** * This node handles the web listener xml fragment * diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/LocaleEncodingMappingNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/LocaleEncodingMappingNode.java index 828c49cbf33..311ebc6c32a 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/LocaleEncodingMappingNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/LocaleEncodingMappingNode.java @@ -18,11 +18,12 @@ import com.sun.enterprise.deployment.LocaleEncodingMappingDescriptor; import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; -import org.glassfish.web.deployment.xml.WebTagNames; -import org.w3c.dom.Node; import java.util.Map; +import org.glassfish.web.deployment.xml.WebTagNames; +import org.w3c.dom.Node; + /** */ public class LocaleEncodingMappingNode extends DeploymentDescriptorNode { diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/LoginConfigNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/LoginConfigNode.java index 1e554750921..4e528eeb5f2 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/LoginConfigNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/LoginConfigNode.java @@ -23,12 +23,13 @@ package org.glassfish.web.deployment.node; import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; + +import java.util.Map; + import org.glassfish.web.deployment.descriptor.LoginConfigurationImpl; import org.glassfish.web.deployment.xml.WebTagNames; import org.w3c.dom.Node; -import java.util.Map; - /** * This node handles the login-config xml tag * diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/MultipartConfigNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/MultipartConfigNode.java index 6b30b0d702b..04e2c0d520e 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/MultipartConfigNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/MultipartConfigNode.java @@ -16,10 +16,11 @@ package org.glassfish.web.deployment.node; -import java.util.Map; - import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; import com.sun.enterprise.deployment.node.XMLElement; + +import java.util.Map; + import org.glassfish.web.deployment.descriptor.MultipartConfigDescriptor; import org.glassfish.web.deployment.xml.WebTagNames; import org.w3c.dom.Node; diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/OrderingNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/OrderingNode.java index c98426b737b..90bad648471 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/OrderingNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/OrderingNode.java @@ -18,6 +18,7 @@ import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; import com.sun.enterprise.deployment.node.XMLElement; + import org.glassfish.web.deployment.descriptor.OrderingDescriptor; import org.glassfish.web.deployment.xml.WebTagNames; import org.w3c.dom.Node; diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/OrderingOrderingNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/OrderingOrderingNode.java index 6e6bca752ed..c1b49b67243 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/OrderingOrderingNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/OrderingOrderingNode.java @@ -16,10 +16,11 @@ package org.glassfish.web.deployment.node; -import java.util.Map; - import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; import com.sun.enterprise.deployment.node.XMLElement; + +import java.util.Map; + import org.glassfish.web.deployment.descriptor.OrderingOrderingDescriptor; import org.glassfish.web.deployment.xml.WebTagNames; import org.w3c.dom.Node; diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/SessionConfigNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/SessionConfigNode.java index ade69c05194..1b1ff4356e3 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/SessionConfigNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/SessionConfigNode.java @@ -18,10 +18,10 @@ import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; import com.sun.enterprise.deployment.node.XMLElement; + import org.glassfish.web.deployment.descriptor.CookieConfigDescriptor; import org.glassfish.web.deployment.descriptor.SessionConfigDescriptor; import org.glassfish.web.deployment.xml.WebTagNames; - import org.w3c.dom.Node; /** diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/UserDataConstraintNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/UserDataConstraintNode.java index 21ddbcafd6e..41525953cd4 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/UserDataConstraintNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/UserDataConstraintNode.java @@ -17,12 +17,13 @@ package org.glassfish.web.deployment.node; import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; + +import java.util.Map; + import org.glassfish.web.deployment.descriptor.UserDataConstraintImpl; import org.glassfish.web.deployment.xml.WebTagNames; import org.w3c.dom.Node; -import java.util.Map; - /** * This node handles the sercurity-constraint xml node * diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/WebResourceCollectionNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/WebResourceCollectionNode.java index 91dd8ef2e00..5f119239757 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/WebResourceCollectionNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/WebResourceCollectionNode.java @@ -21,16 +21,17 @@ import com.sun.enterprise.deployment.node.XMLElement; import com.sun.enterprise.deployment.util.DOLUtils; import com.sun.enterprise.util.net.URLPattern; -import org.glassfish.web.deployment.descriptor.WebResourceCollectionImpl; -import org.glassfish.web.deployment.xml.WebTagNames; -import org.glassfish.web.LogFacade; -import org.w3c.dom.Node; import java.text.MessageFormat; import java.util.Map; import java.util.ResourceBundle; import java.util.logging.Level; +import org.glassfish.web.LogFacade; +import org.glassfish.web.deployment.descriptor.WebResourceCollectionImpl; +import org.glassfish.web.deployment.xml.WebTagNames; +import org.w3c.dom.Node; + /** * This nodes handles the web-collection xml tag element * diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/CacheMappingNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/CacheMappingNode.java index f1c4d1900b4..f762befe28d 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/CacheMappingNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/CacheMappingNode.java @@ -19,14 +19,15 @@ import com.sun.enterprise.deployment.node.XMLElement; import com.sun.enterprise.deployment.node.runtime.RuntimeDescriptorNode; import com.sun.enterprise.deployment.xml.RuntimeTagNames; + +import java.util.Map; + import org.glassfish.web.deployment.runtime.CacheMapping; import org.glassfish.web.deployment.runtime.ConstraintField; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.xml.sax.Attributes; -import java.util.Map; - /** * node for cache-mapping tag * diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/CacheNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/CacheNode.java index ff04005d2d4..6ac30d4df33 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/CacheNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/CacheNode.java @@ -20,6 +20,7 @@ import com.sun.enterprise.deployment.node.runtime.RuntimeDescriptorNode; import com.sun.enterprise.deployment.runtime.RuntimeDescriptor; import com.sun.enterprise.deployment.xml.RuntimeTagNames; + import org.glassfish.web.deployment.runtime.Cache; import org.glassfish.web.deployment.runtime.CacheHelper; import org.glassfish.web.deployment.runtime.CacheMapping; diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/ClassLoaderNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/ClassLoaderNode.java index bf13da9530d..b138c7ccb8d 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/ClassLoaderNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/ClassLoaderNode.java @@ -20,6 +20,7 @@ import com.sun.enterprise.deployment.node.runtime.RuntimeDescriptorNode; import com.sun.enterprise.deployment.runtime.RuntimeDescriptor; import com.sun.enterprise.deployment.xml.RuntimeTagNames; + import org.glassfish.web.deployment.runtime.ClassLoader; import org.glassfish.web.deployment.runtime.WebProperty; import org.w3c.dom.Element; diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/IdempotentUrlPatternNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/IdempotentUrlPatternNode.java index 02be4b07aed..a0ac3de340a 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/IdempotentUrlPatternNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/IdempotentUrlPatternNode.java @@ -20,6 +20,7 @@ import com.sun.enterprise.deployment.node.runtime.RuntimeDescriptorNode; import com.sun.enterprise.deployment.runtime.web.IdempotentUrlPattern; import com.sun.enterprise.deployment.xml.RuntimeTagNames; + import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/JspConfigRuntimeNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/JspConfigRuntimeNode.java index 8d0324886da..799b70d74ea 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/JspConfigRuntimeNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/JspConfigRuntimeNode.java @@ -19,6 +19,7 @@ import com.sun.enterprise.deployment.node.XMLElement; import com.sun.enterprise.deployment.node.runtime.RuntimeDescriptorNode; import com.sun.enterprise.deployment.xml.RuntimeTagNames; + import org.glassfish.web.deployment.runtime.JspConfig; /** diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/LocaleCharsetInfoNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/LocaleCharsetInfoNode.java index 179ecc4c4ae..0e1cf9fdac3 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/LocaleCharsetInfoNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/LocaleCharsetInfoNode.java @@ -19,6 +19,7 @@ import com.sun.enterprise.deployment.node.XMLElement; import com.sun.enterprise.deployment.node.runtime.RuntimeDescriptorNode; import com.sun.enterprise.deployment.xml.RuntimeTagNames; + import org.glassfish.web.deployment.runtime.LocaleCharsetInfo; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/LocaleCharsetMapNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/LocaleCharsetMapNode.java index 3e52dc68b76..a9c577c7b74 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/LocaleCharsetMapNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/LocaleCharsetMapNode.java @@ -16,9 +16,9 @@ package org.glassfish.web.deployment.node.runtime.gf; -import com.sun.enterprise.deployment.runtime.RuntimeDescriptor; import com.sun.enterprise.deployment.node.XMLElement; import com.sun.enterprise.deployment.node.runtime.RuntimeDescriptorNode; +import com.sun.enterprise.deployment.runtime.RuntimeDescriptor; import com.sun.enterprise.deployment.xml.RuntimeTagNames; import com.sun.enterprise.deployment.xml.TagNames; diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/ManagerPropertiesNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/ManagerPropertiesNode.java index b2b6368cce8..5eff2427d61 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/ManagerPropertiesNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/ManagerPropertiesNode.java @@ -19,6 +19,7 @@ import com.sun.enterprise.deployment.node.XMLElement; import com.sun.enterprise.deployment.node.runtime.RuntimeDescriptorNode; import com.sun.enterprise.deployment.xml.RuntimeTagNames; + import org.glassfish.web.deployment.runtime.ManagerProperties; /** diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/ServletNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/ServletNode.java index d1384efcd7b..c390b29b99c 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/ServletNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/ServletNode.java @@ -30,6 +30,7 @@ import com.sun.enterprise.deployment.node.runtime.WebServiceEndpointRuntimeNode; import com.sun.enterprise.deployment.xml.RuntimeTagNames; import com.sun.enterprise.deployment.xml.WebServicesTagNames; + import org.glassfish.web.deployment.descriptor.WebComponentDescriptorImpl; import org.w3c.dom.Node; diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/SessionConfigNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/SessionConfigNode.java index 1a31f5b2b55..07940defec4 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/SessionConfigNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/SessionConfigNode.java @@ -19,6 +19,7 @@ import com.sun.enterprise.deployment.node.XMLElement; import com.sun.enterprise.deployment.node.runtime.RuntimeDescriptorNode; import com.sun.enterprise.deployment.xml.RuntimeTagNames; + import org.glassfish.web.deployment.runtime.SessionConfig; import org.w3c.dom.Node; diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/SessionManagerNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/SessionManagerNode.java index 28945c33731..714c1ea13fb 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/SessionManagerNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/SessionManagerNode.java @@ -20,6 +20,7 @@ import com.sun.enterprise.deployment.node.runtime.RuntimeDescriptorNode; import com.sun.enterprise.deployment.runtime.RuntimeDescriptor; import com.sun.enterprise.deployment.xml.RuntimeTagNames; + import org.glassfish.web.deployment.runtime.SessionManager; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/SessionPropertiesNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/SessionPropertiesNode.java index e898a58d6b1..5e0d0f8d5d6 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/SessionPropertiesNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/SessionPropertiesNode.java @@ -19,6 +19,7 @@ import com.sun.enterprise.deployment.node.XMLElement; import com.sun.enterprise.deployment.node.runtime.RuntimeDescriptorNode; import com.sun.enterprise.deployment.xml.RuntimeTagNames; + import org.glassfish.web.deployment.runtime.SessionProperties; /** diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/StorePropertiesNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/StorePropertiesNode.java index ce68177796c..5654cda45ac 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/StorePropertiesNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/StorePropertiesNode.java @@ -19,6 +19,7 @@ import com.sun.enterprise.deployment.node.XMLElement; import com.sun.enterprise.deployment.node.runtime.RuntimeDescriptorNode; import com.sun.enterprise.deployment.xml.RuntimeTagNames; + import org.glassfish.web.deployment.runtime.StoreProperties; /** diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/ValveNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/ValveNode.java index e9fd4afb132..9d69d93a922 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/ValveNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/ValveNode.java @@ -19,6 +19,7 @@ import com.sun.enterprise.deployment.node.XMLElement; import com.sun.enterprise.deployment.node.runtime.RuntimeDescriptorNode; import com.sun.enterprise.deployment.xml.RuntimeTagNames; + import org.glassfish.web.deployment.runtime.Valve; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/WebPropertyContainerNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/WebPropertyContainerNode.java index 70d6417c9b0..bbcd36d1f3d 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/WebPropertyContainerNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/WebPropertyContainerNode.java @@ -19,6 +19,7 @@ import com.sun.enterprise.deployment.node.XMLElement; import com.sun.enterprise.deployment.node.runtime.RuntimeDescriptorNode; import com.sun.enterprise.deployment.xml.RuntimeTagNames; + import org.glassfish.web.deployment.runtime.WebPropertyContainer; /** diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/jsp/JSPCompiler.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/jsp/JSPCompiler.java index 21283b62aba..3b7d44aea21 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/jsp/JSPCompiler.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/jsp/JSPCompiler.java @@ -33,6 +33,11 @@ package org.glassfish.web.jsp; +import com.sun.enterprise.deployment.WebBundleDescriptor; +import com.sun.enterprise.deployment.WebComponentDescriptor; +import com.sun.enterprise.deployment.web.InitializationParameter; +import com.sun.enterprise.util.io.FileUtils; + import java.io.File; import java.util.Enumeration; import java.util.Iterator; @@ -50,11 +55,6 @@ import org.glassfish.web.deployment.runtime.SunWebAppImpl; import org.glassfish.web.deployment.runtime.WebProperty; -import com.sun.enterprise.deployment.WebBundleDescriptor; -import com.sun.enterprise.deployment.WebComponentDescriptor; -import com.sun.enterprise.deployment.web.InitializationParameter; -import com.sun.enterprise.util.io.FileUtils; - public final class JSPCompiler { public static void compile(File inWebDir, File outWebDir, WebBundleDescriptor wbd, ServerContext serverContext) diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/upgrade/WebConfigurationUpgrade.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/upgrade/WebConfigurationUpgrade.java index 80807b7295c..e02fb33649d 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/upgrade/WebConfigurationUpgrade.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/upgrade/WebConfigurationUpgrade.java @@ -16,16 +16,18 @@ package org.glassfish.web.upgrade; +import com.sun.enterprise.util.io.FileUtils; + +import jakarta.inject.Inject; + import java.io.File; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.util.io.FileUtils; import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.api.admin.config.ConfigurationUpgrade; import org.glassfish.hk2.api.PostConstruct; import org.glassfish.web.LogFacade; -import jakarta.inject.Inject; import org.jvnet.hk2.annotations.Service; diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/HACNonceCacheImpl.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/HACNonceCacheImpl.java index f6afc7e6e23..1da2819340b 100644 --- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/HACNonceCacheImpl.java +++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/HACNonceCacheImpl.java @@ -16,24 +16,26 @@ package org.glassfish.web.ha; -import org.glassfish.security.common.NonceInfo; -import org.glassfish.security.common.CNonceCache; import com.sun.enterprise.security.CNonceCacheFactory; +import com.sun.web.security.CNonceCacheImpl; + +import jakarta.inject.Inject; + import java.util.Collection; import java.util.Map; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; + import org.glassfish.ha.store.api.BackingStore; import org.glassfish.ha.store.api.BackingStoreConfiguration; import org.glassfish.ha.store.api.BackingStoreException; import org.glassfish.ha.store.api.BackingStoreFactory; -import jakarta.inject.Inject; - -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.hk2.api.PerLookup; -import com.sun.web.security.CNonceCacheImpl; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.security.common.CNonceCache; +import org.glassfish.security.common.NonceInfo; +import org.jvnet.hk2.annotations.Service; /** * diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/HAUtilImpl.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/HAUtilImpl.java index ec945e6e3b8..b7f862f922b 100644 --- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/HAUtilImpl.java +++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/HAUtilImpl.java @@ -19,15 +19,16 @@ import com.sun.enterprise.config.serverbeans.AvailabilityService; import com.sun.enterprise.config.serverbeans.Config; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.gms.bootstrap.GMSAdapterService; +import org.glassfish.hk2.api.PerLookup; import org.glassfish.security.common.HAUtil; -import jakarta.inject.Inject; import org.jvnet.hk2.annotations.Optional; -import jakarta.inject.Named; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; /** * diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/HAWebContainerFeatureFactoryImpl.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/HAWebContainerFeatureFactoryImpl.java index 9a338f831a3..47589595471 100755 --- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/HAWebContainerFeatureFactoryImpl.java +++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/HAWebContainerFeatureFactoryImpl.java @@ -16,14 +16,15 @@ package org.glassfish.web.ha; -import com.sun.enterprise.web.PEWebContainerFeatureFactoryImpl; import com.sun.enterprise.web.PESSOFactory; -import com.sun.enterprise.web.ServerConfigLookup; +import com.sun.enterprise.web.PEWebContainerFeatureFactoryImpl; import com.sun.enterprise.web.SSOFactory; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.web.ha.authenticator.HASSOFactory; +import com.sun.enterprise.web.ServerConfigLookup; import jakarta.inject.Inject; + +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.web.ha.authenticator.HASSOFactory; import org.jvnet.hk2.annotations.Service; /** diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/LogFacade.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/LogFacade.java index 16e82841e03..6b29b459e4d 100644 --- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/LogFacade.java +++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/LogFacade.java @@ -16,10 +16,11 @@ package org.glassfish.web.ha; +import java.util.logging.Logger; + import org.glassfish.logging.annotation.LogMessageInfo; -import org.glassfish.logging.annotation.LoggerInfo; import org.glassfish.logging.annotation.LogMessagesResourceBundle; -import java.util.logging.Logger; +import org.glassfish.logging.annotation.LoggerInfo; /** /** diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/authenticator/HASSOFactory.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/authenticator/HASSOFactory.java index 35c6d99ae08..33b7af67952 100644 --- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/authenticator/HASSOFactory.java +++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/authenticator/HASSOFactory.java @@ -24,21 +24,20 @@ import com.sun.enterprise.container.common.spi.util.JavaEEIOUtils; - +import com.sun.enterprise.security.web.GlassFishSingleSignOn; import com.sun.enterprise.web.SSOFactory; import com.sun.enterprise.web.session.PersistenceType; -import com.sun.enterprise.security.web.GlassFishSingleSignOn; + +import jakarta.inject.Inject; import org.glassfish.gms.bootstrap.GMSAdapterService; import org.glassfish.ha.store.api.BackingStore; import org.glassfish.ha.store.api.BackingStoreConfiguration; import org.glassfish.ha.store.api.BackingStoreException; import org.glassfish.ha.store.api.BackingStoreFactory; -import jakarta.inject.Inject; - -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; +import org.jvnet.hk2.annotations.Service; /** * diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/authenticator/HASingleSignOn.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/authenticator/HASingleSignOn.java index 66cb3fca4e3..4f6bcbd3738 100644 --- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/authenticator/HASingleSignOn.java +++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/authenticator/HASingleSignOn.java @@ -20,16 +20,16 @@ import com.sun.enterprise.container.common.spi.util.JavaEEIOUtils; import com.sun.enterprise.security.web.GlassFishSingleSignOn; +import java.security.Principal; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.apache.catalina.Session; import org.apache.catalina.authenticator.SingleSignOnEntry; import org.glassfish.ha.store.api.BackingStore; import org.glassfish.ha.store.api.BackingStoreException; import org.glassfish.web.ha.LogFacade; -import java.util.logging.Logger; -import java.util.logging.Level; -import java.security.Principal; - /** * @author Shing Wai Chan */ diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/authenticator/HASingleSignOnEntry.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/authenticator/HASingleSignOnEntry.java index 7f7bc157a81..12b0d13628e 100644 --- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/authenticator/HASingleSignOnEntry.java +++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/authenticator/HASingleSignOnEntry.java @@ -18,19 +18,26 @@ package org.glassfish.web.ha.authenticator; import com.sun.enterprise.container.common.spi.util.JavaEEIOUtils; -import org.apache.catalina.Container; -import org.apache.catalina.core.StandardContext; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.Closeable; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.security.Principal; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.apache.catalina.Container; import org.apache.catalina.Session; import org.apache.catalina.authenticator.SingleSignOn; import org.apache.catalina.authenticator.SingleSignOnEntry; +import org.apache.catalina.core.StandardContext; import org.glassfish.web.ha.LogFacade; -import java.io.*; -import java.security.Principal; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * @author Shing Wai Chan */ diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/authenticator/HASingleSignOnEntryMetadata.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/authenticator/HASingleSignOnEntryMetadata.java index 8277c3fcfaf..4a714ed829e 100644 --- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/authenticator/HASingleSignOnEntryMetadata.java +++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/authenticator/HASingleSignOnEntryMetadata.java @@ -16,7 +16,7 @@ package org.glassfish.web.ha.authenticator; -import java.io.*; +import java.io.Serializable; import java.util.HashSet; import java.util.Set; diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/BaseHASession.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/BaseHASession.java index 7dbe89090b9..6883476703d 100644 --- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/BaseHASession.java +++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/BaseHASession.java @@ -24,11 +24,13 @@ import jakarta.servlet.http.HttpSession; import jakarta.servlet.http.HttpSessionBindingEvent; + import java.io.IOException; -import java.io.ObjectOutputStream; import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.security.Principal; import java.util.Enumeration; + import org.apache.catalina.Globals; import org.apache.catalina.Manager; import org.apache.catalina.core.StandardContext; diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/CompositeMetadata.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/CompositeMetadata.java index 7a214500fad..e2b1c214473 100644 --- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/CompositeMetadata.java +++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/CompositeMetadata.java @@ -17,10 +17,19 @@ package org.glassfish.web.ha.session.management; -import org.glassfish.ha.store.api.Storeable; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.nio.charset.Charset; -import java.util.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import org.glassfish.ha.store.api.Storeable; /** * A class to hold a collection of children SessionAttributeMetadata. This class is diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/HASessionStoreValve.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/HASessionStoreValve.java index 8951d34d15f..1c845e48bd8 100644 --- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/HASessionStoreValve.java +++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/HASessionStoreValve.java @@ -22,20 +22,22 @@ package org.glassfish.web.ha.session.management; -import java.util.logging.Logger; -import java.util.logging.Level; -import java.io.IOException; import jakarta.servlet.ServletException; import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpSession; -import org.apache.catalina.valves.ValveBase; + +import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.apache.catalina.Globals; import org.apache.catalina.Manager; import org.apache.catalina.Request; import org.apache.catalina.Response; import org.apache.catalina.Session; import org.apache.catalina.core.StandardContext; +import org.apache.catalina.valves.ValveBase; import org.glassfish.ha.common.HACookieManager; /** diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/HAStoreBase.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/HAStoreBase.java index 67564cde478..a65307caa33 100644 --- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/HAStoreBase.java +++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/HAStoreBase.java @@ -23,15 +23,21 @@ package org.glassfish.web.ha.session.management; -import java.io.*; +import com.sun.enterprise.container.common.spi.util.JavaEEIOUtils; + +import java.io.BufferedOutputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectOutputStream; import java.util.ArrayList; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; import java.util.zip.GZIPOutputStream; -import com.sun.enterprise.container.common.spi.util.JavaEEIOUtils; -import org.apache.catalina.*; +import org.apache.catalina.Container; +import org.apache.catalina.Manager; +import org.apache.catalina.Session; import org.apache.catalina.session.StoreBase; import org.glassfish.web.ha.LogFacade; diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ModifiedAttributeHASession.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ModifiedAttributeHASession.java index 1ab7ade686c..02675c37a27 100755 --- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ModifiedAttributeHASession.java +++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ModifiedAttributeHASession.java @@ -22,13 +22,17 @@ package org.glassfish.web.ha.session.management; -import org.apache.catalina.Manager; -import org.apache.catalina.util.Enumerator; - -import java.util.*; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.catalina.Manager; +import org.apache.catalina.util.Enumerator; + /** * diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationAttributeStore.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationAttributeStore.java index 696999d0f7d..703d6221c9b 100755 --- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationAttributeStore.java +++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationAttributeStore.java @@ -18,12 +18,14 @@ package org.glassfish.web.ha.session.management; import com.sun.enterprise.container.common.spi.util.JavaEEIOUtils; -import org.glassfish.ha.store.api.BackingStore; -import org.glassfish.ha.store.api.BackingStoreException; -import org.apache.catalina.*; -import org.apache.catalina.session.*; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -31,6 +33,13 @@ import java.util.List; import java.util.logging.Level; +import org.apache.catalina.Container; +import org.apache.catalina.Loader; +import org.apache.catalina.Session; +import org.apache.catalina.session.StandardSession; +import org.glassfish.ha.store.api.BackingStore; +import org.glassfish.ha.store.api.BackingStoreException; + /** * * @author Larry White diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationManagerBase.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationManagerBase.java index f88c66b332a..dabd17a84df 100644 --- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationManagerBase.java +++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationManagerBase.java @@ -16,6 +16,11 @@ package org.glassfish.web.ha.session.management; +import java.io.IOException; +import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.apache.catalina.Session; import org.apache.catalina.session.PersistentManagerBase; import org.glassfish.ha.store.api.BackingStore; @@ -23,11 +28,6 @@ import org.glassfish.ha.store.api.Storeable; import org.glassfish.web.ha.LogFacade; -import java.io.IOException; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * @author Rajiv Mordani */ diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationStore.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationStore.java index 7cfbb1094aa..7dee756770a 100755 --- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationStore.java +++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationStore.java @@ -25,20 +25,25 @@ import com.sun.appserv.util.cache.BaseCache; import com.sun.enterprise.container.common.spi.util.JavaEEIOUtils; + +import java.io.BufferedInputStream; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.util.logging.Level; +import java.util.zip.GZIPInputStream; + import org.apache.catalina.Container; -import org.apache.catalina.Session; import org.apache.catalina.LifecycleException; import org.apache.catalina.Loader; +import org.apache.catalina.Session; import org.glassfish.ha.store.api.BackingStore; import org.glassfish.ha.store.api.BackingStoreException; import org.glassfish.ha.store.api.Storeable; import org.glassfish.ha.store.util.SimpleMetadata; import org.glassfish.web.ha.LogFacade; -import java.io.*; -import java.util.logging.Level; -import java.util.zip.GZIPInputStream; - /** * * @author Larry White diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationWebEventPersistentManager.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationWebEventPersistentManager.java index 3e9c0886ebc..3d6df1433ea 100755 --- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationWebEventPersistentManager.java +++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationWebEventPersistentManager.java @@ -23,6 +23,13 @@ package org.glassfish.web.ha.session.management; +import jakarta.inject.Inject; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; + +import java.util.Map; +import java.util.logging.Level; + import org.apache.catalina.Session; import org.glassfish.gms.bootstrap.GMSAdapterService; import org.glassfish.ha.common.GlassFishHAReplicaPredictor; @@ -33,17 +40,10 @@ import org.glassfish.ha.store.api.BackingStoreException; import org.glassfish.ha.store.api.BackingStoreFactory; import org.glassfish.ha.store.api.Storeable; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.web.ha.LogFacade; -import jakarta.inject.Inject; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.hk2.api.PerLookup; - -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; -import java.util.Map; -import java.util.logging.Level; /** * diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/strategy/builder/ReplicatedWebMethodSessionStrategyBuilder.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/strategy/builder/ReplicatedWebMethodSessionStrategyBuilder.java index f3606eff0e6..0f5fd1ca317 100644 --- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/strategy/builder/ReplicatedWebMethodSessionStrategyBuilder.java +++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/strategy/builder/ReplicatedWebMethodSessionStrategyBuilder.java @@ -16,24 +16,33 @@ package org.glassfish.web.ha.strategy.builder; -import com.sun.enterprise.web.WebModule; import com.sun.enterprise.container.common.spi.util.JavaEEIOUtils; import com.sun.enterprise.web.BasePersistenceStrategyBuilder; import com.sun.enterprise.web.ServerConfigLookup; +import com.sun.enterprise.web.WebModule; + +import jakarta.inject.Inject; + +import java.util.HashMap; +import java.util.Map; + import org.apache.catalina.Context; import org.apache.catalina.core.StandardContext; -import org.glassfish.web.deployment.runtime.SessionManager; import org.glassfish.ha.store.api.Storeable; import org.glassfish.ha.store.util.SimpleMetadata; -import org.glassfish.web.ha.session.management.*; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.web.deployment.runtime.SessionManager; +import org.glassfish.web.ha.session.management.CompositeMetadata; +import org.glassfish.web.ha.session.management.FullSessionFactory; +import org.glassfish.web.ha.session.management.HASessionStoreValve; +import org.glassfish.web.ha.session.management.ModifiedAttributeSessionFactory; +import org.glassfish.web.ha.session.management.ModifiedSessionFactory; +import org.glassfish.web.ha.session.management.ReplicationAttributeStore; +import org.glassfish.web.ha.session.management.ReplicationStore; +import org.glassfish.web.ha.session.management.ReplicationWebEventPersistentManager; +import org.glassfish.web.ha.session.management.SessionFactory; import org.glassfish.web.valve.GlassFishValve; -import jakarta.inject.Inject; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; - -import java.util.HashMap; -import java.util.Map; /** * @author Rajiv Mordani diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/ContextBindings.java b/appserver/web/web-naming/src/main/java/org/apache/naming/ContextBindings.java index 7a8ed142cc6..4bebefa71b5 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/ContextBindings.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/ContextBindings.java @@ -20,8 +20,9 @@ import java.text.MessageFormat; import java.util.Hashtable; import java.util.ResourceBundle; -import javax.naming.NamingException; + import javax.naming.Context; +import javax.naming.NamingException; /** * Handles the associations : diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/EjbRef.java b/appserver/web/web-naming/src/main/java/org/apache/naming/EjbRef.java index 229630db014..2a76e80afa0 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/EjbRef.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/EjbRef.java @@ -17,8 +17,8 @@ package org.apache.naming; -import javax.naming.Reference; import javax.naming.Context; +import javax.naming.Reference; import javax.naming.StringRefAddr; /** diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/LogFacade.java b/appserver/web/web-naming/src/main/java/org/apache/naming/LogFacade.java index 15913adbfc3..7c4f40439d1 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/LogFacade.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/LogFacade.java @@ -17,10 +17,11 @@ package org.apache.naming; +import java.util.logging.Logger; + import org.glassfish.logging.annotation.LogMessageInfo; -import org.glassfish.logging.annotation.LoggerInfo; import org.glassfish.logging.annotation.LogMessagesResourceBundle; -import java.util.logging.Logger; +import org.glassfish.logging.annotation.LoggerInfo; /** /** diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/NameParserImpl.java b/appserver/web/web-naming/src/main/java/org/apache/naming/NameParserImpl.java index 1ea0c195c1b..7de442f7bc5 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/NameParserImpl.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/NameParserImpl.java @@ -17,10 +17,10 @@ package org.apache.naming; -import javax.naming.NameParser; +import javax.naming.CompositeName; import javax.naming.Name; +import javax.naming.NameParser; import javax.naming.NamingException; -import javax.naming.CompositeName; /** * Parses names. diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/NamingContext.java b/appserver/web/web-naming/src/main/java/org/apache/naming/NamingContext.java index 885e2d22d4b..7e0b50c799a 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/NamingContext.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/NamingContext.java @@ -18,25 +18,29 @@ package org.apache.naming; import java.text.MessageFormat; -import java.util.Hashtable; import java.util.Enumeration; +import java.util.Hashtable; import java.util.ResourceBundle; -import java.util.logging.*; +import java.util.logging.Level; +import java.util.logging.Logger; + import javax.naming.Binding; +import javax.naming.CompositeName; import javax.naming.Context; -import javax.naming.Name; +import javax.naming.InitialContext; import javax.naming.LinkRef; -import javax.naming.CompositeName; +import javax.naming.Name; +import javax.naming.NameAlreadyBoundException; import javax.naming.NameClassPair; +import javax.naming.NameNotFoundException; import javax.naming.NameParser; -import javax.naming.Referenceable; -import javax.naming.Reference; import javax.naming.NamingEnumeration; import javax.naming.NamingException; -import javax.naming.NameNotFoundException; import javax.naming.NotContextException; -import javax.naming.InitialContext; import javax.naming.OperationNotSupportedException; +import javax.naming.Reference; +import javax.naming.Referenceable; +import javax.naming.directory.InvalidAttributesException; import javax.naming.spi.NamingManager; /** diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/NamingContextBindingsEnumeration.java b/appserver/web/web-naming/src/main/java/org/apache/naming/NamingContextBindingsEnumeration.java index ecc1e8f55bb..85795183831 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/NamingContextBindingsEnumeration.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/NamingContextBindingsEnumeration.java @@ -22,8 +22,8 @@ import javax.naming.Binding; import javax.naming.CompositeName; import javax.naming.Context; -import javax.naming.NamingException; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; /** * Naming enumeration implementation. diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/NamingContextEnumeration.java b/appserver/web/web-naming/src/main/java/org/apache/naming/NamingContextEnumeration.java index 9855d7f3fb1..00a8055a006 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/NamingContextEnumeration.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/NamingContextEnumeration.java @@ -19,9 +19,9 @@ import java.util.Iterator; -import javax.naming.NamingException; -import javax.naming.NamingEnumeration; import javax.naming.NameClassPair; +import javax.naming.NamingEnumeration; +import javax.naming.NamingException; /** * Naming enumeration implementation. diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/NamingService.java b/appserver/web/web-naming/src/main/java/org/apache/naming/NamingService.java index 8e2882b350c..ae6b0732ec3 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/NamingService.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/NamingService.java @@ -17,15 +17,16 @@ package org.apache.naming; -import java.util.logging.Logger; import java.util.logging.Level; -import javax.naming.Context; -import javax.management.NotificationBroadcasterSupport; -import javax.management.ObjectName; -import javax.management.MBeanServer; -import javax.management.MBeanRegistration; +import java.util.logging.Logger; + import javax.management.AttributeChangeNotification; +import javax.management.MBeanRegistration; +import javax.management.MBeanServer; import javax.management.Notification; +import javax.management.NotificationBroadcasterSupport; +import javax.management.ObjectName; +import javax.naming.Context; /** * Implementation of the NamingService JMX MBean. diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/ResourceEnvRef.java b/appserver/web/web-naming/src/main/java/org/apache/naming/ResourceEnvRef.java index 8f15c84b393..10484400c1c 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/ResourceEnvRef.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/ResourceEnvRef.java @@ -17,8 +17,8 @@ package org.apache.naming; -import javax.naming.Reference; import javax.naming.Context; +import javax.naming.Reference; /** * Represents a reference address to a resource environment. diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/ResourceLinkRef.java b/appserver/web/web-naming/src/main/java/org/apache/naming/ResourceLinkRef.java index c58562804a8..9558bc78703 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/ResourceLinkRef.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/ResourceLinkRef.java @@ -17,8 +17,8 @@ package org.apache.naming; -import javax.naming.Reference; import javax.naming.Context; +import javax.naming.Reference; import javax.naming.StringRefAddr; /** diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/ResourceRef.java b/appserver/web/web-naming/src/main/java/org/apache/naming/ResourceRef.java index 26be437c75a..e047c5ef5a9 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/ResourceRef.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/ResourceRef.java @@ -19,9 +19,9 @@ import java.util.Enumeration; +import javax.naming.Context; import javax.naming.RefAddr; import javax.naming.Reference; -import javax.naming.Context; import javax.naming.StringRefAddr; /** diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/Util.java b/appserver/web/web-naming/src/main/java/org/apache/naming/Util.java index 0a2542529c4..0c13b5bedc0 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/Util.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/Util.java @@ -19,6 +19,7 @@ import java.nio.charset.Charset; import java.nio.charset.UnsupportedCharsetException; + import org.glassfish.grizzly.utils.Charsets; /** diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/factory/BeanFactory.java b/appserver/web/web-naming/src/main/java/org/apache/naming/factory/BeanFactory.java index 8ad1856aa45..9711153827d 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/factory/BeanFactory.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/factory/BeanFactory.java @@ -17,21 +17,21 @@ package org.apache.naming.factory; -import java.util.Hashtable; +import java.beans.BeanInfo; +import java.beans.Introspector; +import java.beans.PropertyDescriptor; +import java.lang.reflect.Method; import java.util.Enumeration; -import javax.naming.Name; +import java.util.Hashtable; + import javax.naming.Context; +import javax.naming.Name; import javax.naming.NamingException; -import javax.naming.Reference; import javax.naming.RefAddr; +import javax.naming.Reference; import javax.naming.spi.ObjectFactory; -import org.apache.naming.ResourceRef; -import java.beans.Introspector; -import java.beans.BeanInfo; -import java.beans.PropertyDescriptor; - -import java.lang.reflect.Method; +import org.apache.naming.ResourceRef; /** * Object factory for any Resource conforming to the JavaBean spec. diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/factory/EjbFactory.java b/appserver/web/web-naming/src/main/java/org/apache/naming/factory/EjbFactory.java index 449f6c72367..5deaefa9f3d 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/factory/EjbFactory.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/factory/EjbFactory.java @@ -18,13 +18,15 @@ package org.apache.naming.factory; import java.util.Hashtable; -import javax.naming.Name; + import javax.naming.Context; import javax.naming.InitialContext; +import javax.naming.Name; import javax.naming.NamingException; -import javax.naming.Reference; import javax.naming.RefAddr; +import javax.naming.Reference; import javax.naming.spi.ObjectFactory; + import org.apache.naming.EjbRef; /** diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/factory/MailSessionFactory.java b/appserver/web/web-naming/src/main/java/org/apache/naming/factory/MailSessionFactory.java index 11e3ac06e6a..5613e9f8eb1 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/factory/MailSessionFactory.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/factory/MailSessionFactory.java @@ -17,14 +17,16 @@ package org.apache.naming.factory; +import jakarta.mail.Session; + import java.security.AccessController; import java.security.PrivilegedAction; import java.util.Enumeration; import java.util.Hashtable; import java.util.Properties; -import jakarta.mail.Session; -import javax.naming.Name; + import javax.naming.Context; +import javax.naming.Name; import javax.naming.RefAddr; import javax.naming.Reference; import javax.naming.spi.ObjectFactory; diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/factory/OpenEjbFactory.java b/appserver/web/web-naming/src/main/java/org/apache/naming/factory/OpenEjbFactory.java index 8149c2a69ce..ab2380692c7 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/factory/OpenEjbFactory.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/factory/OpenEjbFactory.java @@ -17,16 +17,17 @@ package org.apache.naming.factory; -import org.apache.naming.EjbRef; +import java.util.Hashtable; +import java.util.Properties; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.Name; -import javax.naming.Reference; import javax.naming.RefAddr; +import javax.naming.Reference; import javax.naming.spi.ObjectFactory; -import java.util.Hashtable; -import java.util.Properties; + +import org.apache.naming.EjbRef; /** * Object factory for EJBs. diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/factory/ResourceEnvFactory.java b/appserver/web/web-naming/src/main/java/org/apache/naming/factory/ResourceEnvFactory.java index 887831da744..4b8a9a3385f 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/factory/ResourceEnvFactory.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/factory/ResourceEnvFactory.java @@ -18,12 +18,14 @@ package org.apache.naming.factory; import java.util.Hashtable; -import javax.naming.Name; + import javax.naming.Context; +import javax.naming.Name; import javax.naming.NamingException; -import javax.naming.Reference; import javax.naming.RefAddr; +import javax.naming.Reference; import javax.naming.spi.ObjectFactory; + import org.apache.naming.ResourceEnvRef; /** diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/factory/ResourceFactory.java b/appserver/web/web-naming/src/main/java/org/apache/naming/factory/ResourceFactory.java index 7c4b376734d..afc1276e37c 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/factory/ResourceFactory.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/factory/ResourceFactory.java @@ -18,12 +18,14 @@ package org.apache.naming.factory; import java.util.Hashtable; -import javax.naming.Name; + import javax.naming.Context; +import javax.naming.Name; import javax.naming.NamingException; -import javax.naming.Reference; import javax.naming.RefAddr; +import javax.naming.Reference; import javax.naming.spi.ObjectFactory; + import org.apache.naming.ResourceRef; /** diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/factory/ResourceLinkFactory.java b/appserver/web/web-naming/src/main/java/org/apache/naming/factory/ResourceLinkFactory.java index 44f361ad610..d6ef5a0e19e 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/factory/ResourceLinkFactory.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/factory/ResourceLinkFactory.java @@ -18,12 +18,14 @@ package org.apache.naming.factory; import java.util.Hashtable; -import javax.naming.Name; + import javax.naming.Context; +import javax.naming.Name; import javax.naming.NamingException; -import javax.naming.Reference; import javax.naming.RefAddr; +import javax.naming.Reference; import javax.naming.spi.ObjectFactory; + import org.apache.naming.ResourceLinkRef; diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/factory/SendMailFactory.java b/appserver/web/web-naming/src/main/java/org/apache/naming/factory/SendMailFactory.java index f45864eca17..6880753a8da 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/factory/SendMailFactory.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/factory/SendMailFactory.java @@ -17,19 +17,21 @@ package org.apache.naming.factory; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.util.Hashtable; -import java.util.Properties; -import java.util.Enumeration; import jakarta.mail.Session; import jakarta.mail.internet.InternetAddress; import jakarta.mail.internet.MimeMessage; import jakarta.mail.internet.MimePartDataSource; -import javax.naming.Name; + +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Properties; + import javax.naming.Context; -import javax.naming.Reference; +import javax.naming.Name; import javax.naming.RefAddr; +import javax.naming.Reference; import javax.naming.spi.ObjectFactory; /** diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/factory/TransactionFactory.java b/appserver/web/web-naming/src/main/java/org/apache/naming/factory/TransactionFactory.java index 6b1364f535e..7a46aea0ca7 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/factory/TransactionFactory.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/factory/TransactionFactory.java @@ -18,12 +18,14 @@ package org.apache.naming.factory; import java.util.Hashtable; -import javax.naming.Name; + import javax.naming.Context; +import javax.naming.Name; import javax.naming.NamingException; -import javax.naming.Reference; import javax.naming.RefAddr; +import javax.naming.Reference; import javax.naming.spi.ObjectFactory; + import org.apache.naming.TransactionRef; /** diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/java/javaURLContextFactory.java b/appserver/web/web-naming/src/main/java/org/apache/naming/java/javaURLContextFactory.java index 27726df48bd..956bcc9c1ba 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/java/javaURLContextFactory.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/java/javaURLContextFactory.java @@ -18,14 +18,16 @@ package org.apache.naming.java; import java.util.Hashtable; -import javax.naming.Name; + import javax.naming.Context; +import javax.naming.Name; import javax.naming.NamingException; -import javax.naming.spi.ObjectFactory; import javax.naming.spi.InitialContextFactory; -import org.apache.naming.SelectorContext; -import org.apache.naming.NamingContext; +import javax.naming.spi.ObjectFactory; + import org.apache.naming.ContextBindings; +import org.apache.naming.NamingContext; +import org.apache.naming.SelectorContext; /** * Context factory for the "java:" namespace. diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/BaseDirContext.java b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/BaseDirContext.java index de14b6391fa..4afb8e5fe1b 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/BaseDirContext.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/BaseDirContext.java @@ -27,11 +27,12 @@ import javax.naming.NameParser; import javax.naming.NamingEnumeration; import javax.naming.NamingException; -import javax.naming.directory.DirContext; import javax.naming.directory.Attributes; +import javax.naming.directory.DirContext; import javax.naming.directory.ModificationItem; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; + import org.apache.naming.LogFacade; import org.apache.naming.NameParserImpl; diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/DirContextURLConnection.java b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/DirContextURLConnection.java index 52c35d086a7..6b39094ab35 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/DirContextURLConnection.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/DirContextURLConnection.java @@ -17,9 +17,9 @@ package org.apache.naming.resources; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import java.io.FileNotFoundException; import java.net.URL; import java.net.URLConnection; import java.net.URLDecoder; @@ -33,12 +33,14 @@ import java.util.List; import java.util.Map; import java.util.Vector; -import javax.naming.NamingException; -import javax.naming.NamingEnumeration; + import javax.naming.NameClassPair; -import javax.naming.directory.DirContext; +import javax.naming.NamingEnumeration; +import javax.naming.NamingException; import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; +import javax.naming.directory.DirContext; + import org.apache.naming.JndiPermission; /** diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/DirContextURLStreamHandler.java b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/DirContextURLStreamHandler.java index 7ad19e2e88f..bbc8bd83828 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/DirContextURLStreamHandler.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/DirContextURLStreamHandler.java @@ -17,11 +17,12 @@ package org.apache.naming.resources; +import java.io.IOException; import java.net.URL; import java.net.URLConnection; import java.net.URLStreamHandler; -import java.io.IOException; import java.util.Hashtable; + import javax.naming.directory.DirContext; /** diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/DirContextURLStreamHandlerService.java b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/DirContextURLStreamHandlerService.java index ccfdc8781b3..214e8c7045c 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/DirContextURLStreamHandlerService.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/DirContextURLStreamHandlerService.java @@ -16,18 +16,18 @@ package org.apache.naming.resources; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.service.url.AbstractURLStreamHandlerService; -import org.osgi.service.url.URLConstants; -import org.osgi.service.url.URLStreamHandlerService; - import java.io.IOException; import java.net.URL; import java.net.URLConnection; import java.util.Dictionary; import java.util.Properties; +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; +import org.osgi.service.url.AbstractURLStreamHandlerService; +import org.osgi.service.url.URLConstants; +import org.osgi.service.url.URLStreamHandlerService; + /** * This class is responsible for adding {@code DirContextURLStreamHandler} * to OSGi service registry. diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/RecyclableNamingEnumeration.java b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/RecyclableNamingEnumeration.java index 3ba0861d057..cabfe52c8ea 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/RecyclableNamingEnumeration.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/RecyclableNamingEnumeration.java @@ -17,10 +17,11 @@ package org.apache.naming.resources; -import java.util.Vector; import java.util.Enumeration; -import javax.naming.NamingException; +import java.util.Vector; + import javax.naming.NamingEnumeration; +import javax.naming.NamingException; /** * Naming enumeration implementation. diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/Resource.java b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/Resource.java index 805b9d95945..7292603d620 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/Resource.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/Resource.java @@ -17,9 +17,9 @@ package org.apache.naming.resources; -import java.io.InputStream; import java.io.ByteArrayInputStream; import java.io.IOException; +import java.io.InputStream; /** * Encapsultes the contents of a resource. diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/ResourceCache.java b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/ResourceCache.java index 159be74ae6f..f9b2fa8908b 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/ResourceCache.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/ResourceCache.java @@ -18,8 +18,8 @@ package org.apache.naming.resources; -import java.util.HashMap; import java.security.SecureRandom; +import java.util.HashMap; /** * Implements a special purpose cache. * diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/WARDirContext.java b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/WARDirContext.java index c75480d6b22..4092c3af816 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/WARDirContext.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/WARDirContext.java @@ -17,34 +17,46 @@ package org.apache.naming.resources; -import java.text.MessageFormat; -import java.util.*; -import java.util.logging.*; import java.io.File; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.ResourceBundle; +import java.util.logging.Level; +import java.util.logging.Logger; import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; import java.util.zip.ZipException; +import java.util.zip.ZipFile; import javax.naming.Binding; +import javax.naming.CompositeName; import javax.naming.Name; +import javax.naming.NameAlreadyBoundException; import javax.naming.NameClassPair; +import javax.naming.NameNotFoundException; import javax.naming.NamingEnumeration; import javax.naming.NamingException; -import javax.naming.CompositeName; +import javax.naming.NotContextException; import javax.naming.OperationNotSupportedException; -import javax.naming.NameAlreadyBoundException; -import javax.naming.directory.DirContext; +import javax.naming.directory.AttributeModificationException; import javax.naming.directory.Attributes; +import javax.naming.directory.DirContext; +import javax.naming.directory.InvalidAttributesException; +import javax.naming.directory.InvalidSearchControlsException; +import javax.naming.directory.InvalidSearchFilterException; import javax.naming.directory.ModificationItem; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; import org.apache.naming.LogFacade; -import org.apache.naming.NamingEntry; import org.apache.naming.NamingContextBindingsEnumeration; import org.apache.naming.NamingContextEnumeration; +import org.apache.naming.NamingEntry; /** * WAR Directory Context implementation. diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/WebNamingStartup.java b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/WebNamingStartup.java index c35eba0fd49..23dfc5303c7 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/WebNamingStartup.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/WebNamingStartup.java @@ -16,8 +16,8 @@ package org.apache.naming.resources; -import org.glassfish.internal.api.InitRunLevel; import org.glassfish.hk2.runlevel.RunLevel; +import org.glassfish.internal.api.InitRunLevel; import org.jvnet.hk2.annotations.Service; /** diff --git a/appserver/web/web-sse/src/main/java/org/glassfish/sse/api/ServerSentEvent.java b/appserver/web/web-sse/src/main/java/org/glassfish/sse/api/ServerSentEvent.java index 4523864af21..11d4c2bec59 100644 --- a/appserver/web/web-sse/src/main/java/org/glassfish/sse/api/ServerSentEvent.java +++ b/appserver/web/web-sse/src/main/java/org/glassfish/sse/api/ServerSentEvent.java @@ -17,12 +17,12 @@ package org.glassfish.sse.api; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - import java.lang.annotation.Retention; import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + /** * {@code ServerSentEvent} indicates a server component that pushes notifications to clients via a HTTP connection. * Browser applications typically use EventSource API to connect to diff --git a/appserver/web/web-sse/src/main/java/org/glassfish/sse/api/ServerSentEventConnection.java b/appserver/web/web-sse/src/main/java/org/glassfish/sse/api/ServerSentEventConnection.java index 02a879abad3..cd8f7d92879 100644 --- a/appserver/web/web-sse/src/main/java/org/glassfish/sse/api/ServerSentEventConnection.java +++ b/appserver/web/web-sse/src/main/java/org/glassfish/sse/api/ServerSentEventConnection.java @@ -18,6 +18,7 @@ package org.glassfish.sse.api; import jakarta.servlet.http.HttpServletRequest; + import java.io.Closeable; import java.io.IOException; diff --git a/appserver/web/web-sse/src/main/java/org/glassfish/sse/api/ServerSentEventContext.java b/appserver/web/web-sse/src/main/java/org/glassfish/sse/api/ServerSentEventContext.java index 980c50d3350..f8369e0a204 100644 --- a/appserver/web/web-sse/src/main/java/org/glassfish/sse/api/ServerSentEventContext.java +++ b/appserver/web/web-sse/src/main/java/org/glassfish/sse/api/ServerSentEventContext.java @@ -17,13 +17,13 @@ package org.glassfish.sse.api; +import jakarta.inject.Qualifier; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import jakarta.inject.Qualifier; - /** * Qualifier for ServerSentEventHandlerContext. If there is Server-Sent Event * source, its context can be injected in any EE component. This qualifier diff --git a/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventApplication.java b/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventApplication.java index fd4fcb3eef7..80b7003f364 100644 --- a/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventApplication.java +++ b/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventApplication.java @@ -16,14 +16,15 @@ package org.glassfish.sse.impl; -import org.glassfish.sse.api.ServerSentEventHandler; - import jakarta.enterprise.context.spi.CreationalContext; import jakarta.servlet.AsyncContext; import jakarta.servlet.http.HttpServletRequest; + import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; +import org.glassfish.sse.api.ServerSentEventHandler; + /** * ServerSentEventApplicationImpl class. * diff --git a/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventCdiExtension.java b/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventCdiExtension.java index 8cc27250f31..7ef39805fb4 100644 --- a/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventCdiExtension.java +++ b/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventCdiExtension.java @@ -17,7 +17,18 @@ package org.glassfish.sse.impl; -import static java.util.logging.Level.FINE; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.spi.AfterBeanDiscovery; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.BeforeBeanDiscovery; +import jakarta.enterprise.inject.spi.Extension; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.inject.spi.ProcessAnnotatedType; +import jakarta.enterprise.inject.spi.WithAnnotations; +import jakarta.enterprise.util.AnnotationLiteral; import java.lang.annotation.Annotation; import java.lang.reflect.ParameterizedType; @@ -34,18 +45,7 @@ import org.glassfish.sse.api.ServerSentEventHandler; import org.glassfish.sse.api.ServerSentEventHandlerContext; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.context.spi.CreationalContext; -import jakarta.enterprise.event.Observes; -import jakarta.enterprise.inject.spi.AfterBeanDiscovery; -import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.inject.spi.BeanManager; -import jakarta.enterprise.inject.spi.BeforeBeanDiscovery; -import jakarta.enterprise.inject.spi.Extension; -import jakarta.enterprise.inject.spi.InjectionPoint; -import jakarta.enterprise.inject.spi.ProcessAnnotatedType; -import jakarta.enterprise.inject.spi.WithAnnotations; -import jakarta.enterprise.util.AnnotationLiteral; +import static java.util.logging.Level.FINE; /** * A CDI extension that creates ServerSentEventHandlerContext beans so that they can be injected into other EE diff --git a/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventConnectionImpl.java b/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventConnectionImpl.java index 65c64131d3d..a0cf47fe9e2 100644 --- a/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventConnectionImpl.java +++ b/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventConnectionImpl.java @@ -16,19 +16,21 @@ package org.glassfish.sse.impl; +import jakarta.enterprise.context.spi.CreationalContext; import jakarta.servlet.AsyncContext; import jakarta.servlet.AsyncEvent; import jakarta.servlet.AsyncListener; import jakarta.servlet.ServletOutputStream; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import jakarta.enterprise.context.spi.CreationalContext; - -import org.glassfish.sse.api.*; import java.io.IOException; import java.io.UnsupportedEncodingException; +import org.glassfish.sse.api.ServerSentEventConnection; +import org.glassfish.sse.api.ServerSentEventData; +import org.glassfish.sse.api.ServerSentEventHandler; + /** * ServerSentEventClientImpl class. * diff --git a/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventHandlerContextImpl.java b/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventHandlerContextImpl.java index 029765edf88..369340d2feb 100644 --- a/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventHandlerContextImpl.java +++ b/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventHandlerContextImpl.java @@ -17,7 +17,9 @@ package org.glassfish.sse.impl; import java.util.Set; -import org.glassfish.sse.api.*; + +import org.glassfish.sse.api.ServerSentEventHandler; +import org.glassfish.sse.api.ServerSentEventHandlerContext; /** * WebCommunicationContextImpl class diff --git a/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventServlet.java b/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventServlet.java index db86e1f565f..02b31922542 100644 --- a/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventServlet.java +++ b/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventServlet.java @@ -17,8 +17,6 @@ package org.glassfish.sse.impl; -import org.glassfish.sse.api.ServerSentEventHandler; - import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.BeanManager; @@ -29,10 +27,13 @@ import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.util.Iterator; import java.util.Map; +import org.glassfish.sse.api.ServerSentEventHandler; + /** * ServerSentEventServlet class. * diff --git a/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventServletContainerInitializer.java b/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventServletContainerInitializer.java index 80fbb1004c9..556c754ffb3 100644 --- a/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventServletContainerInitializer.java +++ b/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventServletContainerInitializer.java @@ -22,9 +22,14 @@ import jakarta.servlet.ServletException; import jakarta.servlet.ServletRegistration; import jakarta.servlet.annotation.HandlesTypes; -import java.util.*; -import org.glassfish.sse.api.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.glassfish.sse.api.ServerSentEvent; +import org.glassfish.sse.api.ServerSentEventHandler; /** * Registers a context listener to get ServletContext diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDIContextBridge.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDIContextBridge.java index 0a53bb2c602..3341888ea8f 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDIContextBridge.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDIContextBridge.java @@ -16,14 +16,14 @@ package org.glassfish.cdi.hk2; +import jakarta.inject.Singleton; + import java.lang.annotation.Annotation; import org.glassfish.hk2.api.ActiveDescriptor; import org.glassfish.hk2.api.Context; import org.glassfish.hk2.api.ServiceHandle; -import jakarta.inject.Singleton; - /** * This is an HK2 context for use with descriptors that are backed by CDI services (which are not Dependent or * Singleton). This scope is most like PerLookup, as it always asks for a new instance. Whether or not CDI truly gives a diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDIHK2Descriptor.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDIHK2Descriptor.java index e608605dcfe..bfd5614d446 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDIHK2Descriptor.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDIHK2Descriptor.java @@ -16,6 +16,13 @@ package org.glassfish.cdi.hk2; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.inject.Singleton; + import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.HashMap; @@ -28,13 +35,6 @@ import org.glassfish.hk2.api.ServiceHandle; import org.glassfish.hk2.utilities.AbstractActiveDescriptor; -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.inject.Any; -import jakarta.enterprise.inject.Default; -import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.inject.spi.BeanManager; -import jakarta.inject.Singleton; - /** * This is an HK2 Descriptor that is backed by a CDI bean * diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDIScope.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDIScope.java index f98c3952896..d6acfa9116e 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDIScope.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/CDIScope.java @@ -16,15 +16,15 @@ package org.glassfish.cdi.hk2; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; +import jakarta.inject.Scope; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import jakarta.inject.Scope; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; /** * This scope is given from HK2 beans that are representing CDI services that are NOT in Dependent or Singleton scopes diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/HK2CDIBean.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/HK2CDIBean.java index 465dbdf7cb2..0f081bd0d16 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/HK2CDIBean.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/HK2CDIBean.java @@ -17,7 +17,11 @@ package org.glassfish.cdi.hk2; -import static java.util.Collections.emptySet; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.InjectionPoint; import java.lang.annotation.Annotation; import java.lang.reflect.Type; @@ -29,11 +33,7 @@ import org.glassfish.hk2.api.ServiceHandle; import org.glassfish.hk2.api.ServiceLocator; -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.context.spi.CreationalContext; -import jakarta.enterprise.inject.Default; -import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.inject.spi.InjectionPoint; +import static java.util.Collections.emptySet; /** * This is a CDI bean that is backed by an HK2 service diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/HK2ContextBridge.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/HK2ContextBridge.java index ae5e764c81e..c30c1f07d53 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/HK2ContextBridge.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/HK2ContextBridge.java @@ -16,14 +16,14 @@ package org.glassfish.cdi.hk2; -import java.lang.annotation.Annotation; - -import org.glassfish.hk2.api.ActiveDescriptor; - import jakarta.enterprise.context.spi.Context; import jakarta.enterprise.context.spi.Contextual; import jakarta.enterprise.context.spi.CreationalContext; +import java.lang.annotation.Annotation; + +import org.glassfish.hk2.api.ActiveDescriptor; + /** * This is an implementation of a CDI context that is put into CDI which will handle all of the hk2 scope/context pairs * diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/HK2IntegrationExtension.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/HK2IntegrationExtension.java index 3acb0120894..025ad1fe208 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/HK2IntegrationExtension.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/hk2/HK2IntegrationExtension.java @@ -16,7 +16,14 @@ package org.glassfish.cdi.hk2; -import static org.glassfish.cdi.hk2.HK2IntegrationUtilities.convertInjectionPointToInjectee; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.spi.AfterBeanDiscovery; +import jakarta.enterprise.inject.spi.AfterDeploymentValidation; +import jakarta.enterprise.inject.spi.Extension; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.inject.spi.InjectionTarget; +import jakarta.enterprise.inject.spi.ProcessInjectionTarget; +import jakarta.inject.Singleton; import java.lang.annotation.Annotation; import java.util.HashMap; @@ -31,14 +38,7 @@ import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; -import jakarta.enterprise.event.Observes; -import jakarta.enterprise.inject.spi.AfterBeanDiscovery; -import jakarta.enterprise.inject.spi.AfterDeploymentValidation; -import jakarta.enterprise.inject.spi.Extension; -import jakarta.enterprise.inject.spi.InjectionPoint; -import jakarta.enterprise.inject.spi.InjectionTarget; -import jakarta.enterprise.inject.spi.ProcessInjectionTarget; -import jakarta.inject.Singleton; +import static org.glassfish.cdi.hk2.HK2IntegrationUtilities.convertInjectionPointToInjectee; /** * A portable CDI extension, which is the touch-point for hk2 integration with CDI diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedBean.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedBean.java index e3cb10c745d..8214b5655d2 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedBean.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedBean.java @@ -16,19 +16,19 @@ package org.glassfish.cdi.transaction; -import static org.glassfish.cdi.transaction.TransactionScopedCDIUtil.DESTORYED_EVENT; -import static org.glassfish.cdi.transaction.TransactionScopedCDIUtil.log; -import static org.glassfish.cdi.transaction.TransactionScopedContextImpl.TRANSACTION_SYNCHRONIZATION_REGISTRY_JNDI_NAME; +import jakarta.enterprise.context.spi.Contextual; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.transaction.Synchronization; +import jakarta.transaction.TransactionSynchronizationRegistry; import java.util.Set; import javax.naming.InitialContext; import javax.naming.NamingException; -import jakarta.enterprise.context.spi.Contextual; -import jakarta.enterprise.context.spi.CreationalContext; -import jakarta.transaction.Synchronization; -import jakarta.transaction.TransactionSynchronizationRegistry; +import static org.glassfish.cdi.transaction.TransactionScopedCDIUtil.DESTORYED_EVENT; +import static org.glassfish.cdi.transaction.TransactionScopedCDIUtil.log; +import static org.glassfish.cdi.transaction.TransactionScopedContextImpl.TRANSACTION_SYNCHRONIZATION_REGISTRY_JNDI_NAME; /** * A wrapper for contextual instances of {@link jakarta.transaction.TransactionScoped} beans. We need this wrapper so diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedCDIUtil.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedCDIUtil.java index c5f565f6418..f680600a591 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedCDIUtil.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedCDIUtil.java @@ -17,17 +17,6 @@ package org.glassfish.cdi.transaction; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.glassfish.logging.annotation.LogMessagesResourceBundle; -import org.glassfish.logging.annotation.LoggerInfo; - import jakarta.enterprise.context.Dependent; import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.Any; @@ -41,6 +30,17 @@ import jakarta.enterprise.inject.spi.InjectionTargetFactory; import jakarta.enterprise.util.AnnotationLiteral; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.glassfish.logging.annotation.LogMessagesResourceBundle; +import org.glassfish.logging.annotation.LoggerInfo; + /** * This class contains utility methods used for TransactionScoped related CDI event processing. * diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorBase.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorBase.java index 0a646a57407..7f77babb30c 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorBase.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorBase.java @@ -16,9 +16,15 @@ package org.glassfish.cdi.transaction; -import static java.util.logging.Level.INFO; -import static java.util.logging.Level.SEVERE; -import static java.util.logging.Level.WARNING; +import com.sun.enterprise.transaction.spi.TransactionOperationsManager; + +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.interceptor.InvocationContext; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.Transactional; import java.io.Serializable; import java.util.logging.Logger; @@ -35,15 +41,9 @@ import org.glassfish.logging.annotation.LogMessagesResourceBundle; import org.glassfish.logging.annotation.LoggerInfo; -import com.sun.enterprise.transaction.spi.TransactionOperationsManager; - -import jakarta.annotation.PostConstruct; -import jakarta.annotation.PreDestroy; -import jakarta.interceptor.InvocationContext; -import jakarta.transaction.SystemException; -import jakarta.transaction.Transaction; -import jakarta.transaction.TransactionManager; -import jakarta.transaction.Transactional; +import static java.util.logging.Level.INFO; +import static java.util.logging.Level.SEVERE; +import static java.util.logging.Level.WARNING; /** * Base class for all interceptors providing common logic for exception handling, etc. diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorMandatory.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorMandatory.java index 93391fc18c7..a7a8dba1210 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorMandatory.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorMandatory.java @@ -16,12 +16,6 @@ package org.glassfish.cdi.transaction; -import static jakarta.interceptor.Interceptor.Priority.PLATFORM_BEFORE; -import static jakarta.transaction.Transactional.TxType.MANDATORY; -import static java.util.logging.Level.INFO; - -import java.util.logging.Logger; - import jakarta.annotation.Priority; import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.Interceptor; @@ -30,6 +24,12 @@ import jakarta.transaction.Transactional; import jakarta.transaction.TransactionalException; +import java.util.logging.Logger; + +import static jakarta.interceptor.Interceptor.Priority.PLATFORM_BEFORE; +import static jakarta.transaction.Transactional.TxType.MANDATORY; +import static java.util.logging.Level.INFO; + /** * Transactional annotation Interceptor class for Mandatory transaction type, ie * jakarta.transaction.Transactional.TxType.MANDATORY If called outside a transaction context, diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorNever.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorNever.java index 7f8bdcabdb8..9a5730067d3 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorNever.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorNever.java @@ -16,12 +16,6 @@ package org.glassfish.cdi.transaction; -import static jakarta.interceptor.Interceptor.Priority.PLATFORM_BEFORE; -import static jakarta.transaction.Transactional.TxType.NEVER; -import static java.util.logging.Level.INFO; - -import java.util.logging.Logger; - import jakarta.annotation.Priority; import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.Interceptor; @@ -30,6 +24,12 @@ import jakarta.transaction.Transactional; import jakarta.transaction.TransactionalException; +import java.util.logging.Logger; + +import static jakarta.interceptor.Interceptor.Priority.PLATFORM_BEFORE; +import static jakarta.transaction.Transactional.TxType.NEVER; +import static java.util.logging.Level.INFO; + /** * Transactional annotation Interceptor class for Never transaction type, ie * jakarta.transaction.Transactional.TxType.NEVER If called outside a transaction context, managed bean method execution diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorNotSupported.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorNotSupported.java index 14371e05d98..8a475c5a898 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorNotSupported.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorNotSupported.java @@ -16,12 +16,6 @@ package org.glassfish.cdi.transaction; -import static jakarta.interceptor.Interceptor.Priority.PLATFORM_BEFORE; -import static jakarta.transaction.Transactional.TxType.NOT_SUPPORTED; -import static java.util.logging.Level.INFO; - -import java.util.logging.Logger; - import jakarta.annotation.Priority; import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.Interceptor; @@ -30,6 +24,12 @@ import jakarta.transaction.Transactional; import jakarta.transaction.TransactionalException; +import java.util.logging.Logger; + +import static jakarta.interceptor.Interceptor.Priority.PLATFORM_BEFORE; +import static jakarta.transaction.Transactional.TxType.NOT_SUPPORTED; +import static java.util.logging.Level.INFO; + /** * Transactional annotation Interceptor class for NotSupported transaction type, ie * jakarta.transaction.Transactional.TxType.NOT_SUPPORTED If called outside a transaction context, managed bean method diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorRequired.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorRequired.java index e2d71a8ac64..386bb2b9743 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorRequired.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorRequired.java @@ -16,13 +16,6 @@ package org.glassfish.cdi.transaction; -import static jakarta.interceptor.Interceptor.Priority.PLATFORM_BEFORE; -import static jakarta.transaction.Status.STATUS_MARKED_ROLLBACK; -import static jakarta.transaction.Transactional.TxType.REQUIRED; -import static java.util.logging.Level.INFO; - -import java.util.logging.Logger; - import com.sun.enterprise.transaction.TransactionManagerHelper; import jakarta.annotation.Priority; @@ -33,6 +26,13 @@ import jakarta.transaction.Transactional; import jakarta.transaction.TransactionalException; +import java.util.logging.Logger; + +import static jakarta.interceptor.Interceptor.Priority.PLATFORM_BEFORE; +import static jakarta.transaction.Status.STATUS_MARKED_ROLLBACK; +import static jakarta.transaction.Transactional.TxType.REQUIRED; +import static java.util.logging.Level.INFO; + /** * Transactional annotation Interceptor class for Required transaction type, ie * jakarta.transaction.Transactional.TxType.REQUIRED If called outside a transaction context, a new JTA transaction will diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorRequiresNew.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorRequiresNew.java index 1c1b38fefb0..d7f83062109 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorRequiresNew.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorRequiresNew.java @@ -16,13 +16,6 @@ package org.glassfish.cdi.transaction; -import static jakarta.interceptor.Interceptor.Priority.PLATFORM_BEFORE; -import static jakarta.transaction.Status.STATUS_MARKED_ROLLBACK; -import static jakarta.transaction.Transactional.TxType.REQUIRES_NEW; -import static java.util.logging.Level.INFO; - -import java.util.logging.Logger; - import com.sun.enterprise.transaction.TransactionManagerHelper; import jakarta.annotation.Priority; @@ -34,6 +27,13 @@ import jakarta.transaction.Transactional; import jakarta.transaction.TransactionalException; +import java.util.logging.Logger; + +import static jakarta.interceptor.Interceptor.Priority.PLATFORM_BEFORE; +import static jakarta.transaction.Status.STATUS_MARKED_ROLLBACK; +import static jakarta.transaction.Transactional.TxType.REQUIRES_NEW; +import static java.util.logging.Level.INFO; + /** * Transactional annotation Interceptor class for RequiresNew transaction type, ie * jakarta.transaction.Transactional.TxType.REQUIRES_NEW If called outside a transaction context, a new JTA transaction diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorSupports.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorSupports.java index f919db94fb7..f0cbb5aaa6b 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorSupports.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorSupports.java @@ -16,18 +16,18 @@ package org.glassfish.cdi.transaction; -import static jakarta.interceptor.Interceptor.Priority.PLATFORM_BEFORE; -import static jakarta.transaction.Transactional.TxType.SUPPORTS; -import static java.util.logging.Level.INFO; - -import java.util.logging.Logger; - import jakarta.annotation.Priority; import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.Interceptor; import jakarta.interceptor.InvocationContext; import jakarta.transaction.Transactional; +import java.util.logging.Logger; + +import static jakarta.interceptor.Interceptor.Priority.PLATFORM_BEFORE; +import static jakarta.transaction.Transactional.TxType.SUPPORTS; +import static java.util.logging.Level.INFO; + /** * Transactional annotation Interceptor class for Supports transaction type, ie * jakarta.transaction.Transactional.TxType.SUPPORT If called outside a transaction context, managed bean method diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/GlassFishWeldProvider.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/GlassFishWeldProvider.java index 6f741626ec2..be13e19adbd 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/GlassFishWeldProvider.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/GlassFishWeldProvider.java @@ -16,6 +16,9 @@ package org.glassfish.weld; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.spi.CDIProvider; + import java.util.Map; import java.util.Map.Entry; import java.util.Set; @@ -25,9 +28,6 @@ import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive; import org.jboss.weld.manager.BeanManagerImpl; -import jakarta.enterprise.inject.spi.CDI; -import jakarta.enterprise.inject.spi.CDIProvider; - /** * @author JJ Snyder */ diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/RootBeanDeploymentArchive.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/RootBeanDeploymentArchive.java index 57bd105c81e..28196164781 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/RootBeanDeploymentArchive.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/RootBeanDeploymentArchive.java @@ -17,7 +17,7 @@ package org.glassfish.weld; -import static java.util.Collections.emptyList; +import com.sun.enterprise.deployment.EjbDescriptor; import java.util.Collection; @@ -27,7 +27,7 @@ import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive; import org.jboss.weld.bootstrap.spi.BeansXml; -import com.sun.enterprise.deployment.EjbDescriptor; +import static java.util.Collections.emptyList; /** * A root BDA represents the root of a module where a module is a war, ejb, rar, ear lib A root BDA of each module diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WebComponentInjectionManager.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WebComponentInjectionManager.java index 3e75576bb88..79d7158c8cc 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WebComponentInjectionManager.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WebComponentInjectionManager.java @@ -17,14 +17,6 @@ package org.glassfish.weld; -import static org.glassfish.weld.WeldDeployer.WELD_BOOTSTRAP; -import static org.glassfish.weld.WeldDeployer.WELD_DEPLOYMENT; -import static org.glassfish.weld.WeldDeployer.WELD_EXTENSION; - -import org.glassfish.api.deployment.DeploymentContext; -import org.jboss.weld.bootstrap.WeldBootstrap; -import org.jvnet.hk2.annotations.Service; - import com.sun.enterprise.web.WebComponentDecorator; import com.sun.enterprise.web.WebModule; @@ -33,6 +25,14 @@ import jakarta.enterprise.inject.spi.BeanManager; import jakarta.enterprise.inject.spi.InjectionTargetFactory; +import org.glassfish.api.deployment.DeploymentContext; +import org.jboss.weld.bootstrap.WeldBootstrap; +import org.jvnet.hk2.annotations.Service; + +import static org.glassfish.weld.WeldDeployer.WELD_BOOTSTRAP; +import static org.glassfish.weld.WeldDeployer.WELD_DEPLOYMENT; +import static org.glassfish.weld.WeldDeployer.WELD_EXTENSION; + /** * This is a decorator which calls Weld implementation to do necessary injection of a web component. It is called by * {@link com.sun.web.server.J2EEInstanceListener} before a web component is put into service. diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WeldContextListener.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WeldContextListener.java index 5a7be9e7952..84161354075 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WeldContextListener.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WeldContextListener.java @@ -17,13 +17,6 @@ package org.glassfish.weld; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.glassfish.cdi.CDILoggerInfo; -import org.glassfish.wasp.runtime.JspApplicationContextImpl; -import org.jboss.weld.module.web.el.WeldELContextListener; - import jakarta.enterprise.inject.spi.BeanManager; import jakarta.inject.Inject; import jakarta.servlet.ServletContextEvent; @@ -31,6 +24,13 @@ import jakarta.servlet.jsp.JspApplicationContext; import jakarta.servlet.jsp.JspFactory; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.glassfish.cdi.CDILoggerInfo; +import org.glassfish.wasp.runtime.JspApplicationContextImpl; +import org.jboss.weld.module.web.el.WeldELContextListener; + /** * ServletContextListener implementation that ensures (for Weld applications) the correct Weld EL Resolver and Weld EL * Context Listener is used for JSP(s). diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/jsf/WeldFacesConfigProvider.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/jsf/WeldFacesConfigProvider.java index 510f7ba0696..5e7e1ffd0b1 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/jsf/WeldFacesConfigProvider.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/jsf/WeldFacesConfigProvider.java @@ -17,9 +17,11 @@ package org.glassfish.weld.jsf; -import static java.util.logging.Level.SEVERE; -import static org.glassfish.cdi.CDILoggerInfo.SEVERE_ERROR_CREATING_URI_FOR_FACES_CONFIG_XML; -import static org.glassfish.weld.WeldDeployer.WELD_EXTENSION; +import com.sun.enterprise.deployment.WebBundleDescriptor; +import com.sun.enterprise.web.WebModule; +import com.sun.faces.spi.FacesConfigResourceProvider; + +import jakarta.servlet.ServletContext; import java.net.URI; import java.net.URISyntaxException; @@ -33,11 +35,9 @@ import org.glassfish.cdi.CDILoggerInfo; import org.glassfish.hk2.api.ServiceLocator; -import com.sun.enterprise.deployment.WebBundleDescriptor; -import com.sun.enterprise.web.WebModule; -import com.sun.faces.spi.FacesConfigResourceProvider; - -import jakarta.servlet.ServletContext; +import static java.util.logging.Level.SEVERE; +import static org.glassfish.cdi.CDILoggerInfo.SEVERE_ERROR_CREATING_URI_FOR_FACES_CONFIG_XML; +import static org.glassfish.weld.WeldDeployer.WELD_EXTENSION; /** * This provider returns the Web Beans faces-config.xml to the Faces runtime. It will only return the configuration file diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/CDIAroundConstructCallback.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/CDIAroundConstructCallback.java index d3aadb3e3e9..c53724298ff 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/CDIAroundConstructCallback.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/CDIAroundConstructCallback.java @@ -16,6 +16,12 @@ package org.glassfish.weld.services; +import com.sun.ejb.containers.BaseContainer; +import com.sun.ejb.containers.EJBContextImpl; +import com.sun.enterprise.deployment.LifecycleCallbackDescriptor; + +import jakarta.enterprise.inject.spi.AnnotatedConstructor; + import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; @@ -24,12 +30,6 @@ import org.jboss.weld.construction.api.ConstructionHandle; import org.jboss.weld.exceptions.WeldException; -import com.sun.ejb.containers.BaseContainer; -import com.sun.ejb.containers.EJBContextImpl; -import com.sun.enterprise.deployment.LifecycleCallbackDescriptor; - -import jakarta.enterprise.inject.spi.AnnotatedConstructor; - /** * This calls back into the ejb container to perform the around construct interception. When that's finished the ejb * itself is then created. diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/NonModuleInjectionServices.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/NonModuleInjectionServices.java index e4045462890..2334d279741 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/NonModuleInjectionServices.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/NonModuleInjectionServices.java @@ -16,11 +16,6 @@ package org.glassfish.weld.services; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.internal.api.Globals; -import org.jboss.weld.injection.spi.InjectionContext; -import org.jboss.weld.injection.spi.InjectionServices; - import com.sun.enterprise.container.common.spi.util.ComponentEnvManager; import com.sun.enterprise.container.common.spi.util.InjectionException; import com.sun.enterprise.container.common.spi.util.InjectionManager; @@ -28,6 +23,11 @@ import jakarta.enterprise.inject.spi.AnnotatedType; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Globals; +import org.jboss.weld.injection.spi.InjectionContext; +import org.jboss.weld.injection.spi.InjectionServices; + /** * The InjectionServices for a non-module bda (library or rar). A non-module bda has no associated bundle so we cannot * reuse the InjectionServicesImpl for injecting into a bean that's resides in an application library (not WEB-INF/lib) diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/ProxyServicesImpl.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/ProxyServicesImpl.java index d34e72aa5c4..24449851e51 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/ProxyServicesImpl.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/ProxyServicesImpl.java @@ -17,14 +17,14 @@ package org.glassfish.weld.services; +import com.sun.ejb.codegen.ClassGenerator; + import java.security.ProtectionDomain; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.api.ClassLoaderHierarchy; import org.jboss.weld.serialization.spi.ProxyServices; -import com.sun.ejb.codegen.ClassGenerator; - /** * An implementation of the {@link ProxyServices}. *

      diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/SecurityServicesImpl.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/SecurityServicesImpl.java index f658e33e5bb..422d50b7bea 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/SecurityServicesImpl.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/SecurityServicesImpl.java @@ -16,12 +16,12 @@ package org.glassfish.weld.services; +import com.sun.enterprise.security.SecurityContext; + import java.security.Principal; import org.jboss.weld.security.spi.SecurityServices; -import com.sun.enterprise.security.SecurityContext; - public class SecurityServicesImpl implements SecurityServices { @Override diff --git a/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/BeanSpecExampleOfRollbackDontRollback.java b/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/BeanSpecExampleOfRollbackDontRollback.java index dc315b82590..bfcdc168b32 100644 --- a/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/BeanSpecExampleOfRollbackDontRollback.java +++ b/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/BeanSpecExampleOfRollbackDontRollback.java @@ -17,6 +17,7 @@ package org.glassfish.cdi.transaction; import jakarta.transaction.Transactional; + import java.sql.SQLException; import java.sql.SQLWarning; diff --git a/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/MyInitialContextFactory.java b/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/MyInitialContextFactory.java index 27b3ea4d49a..285fd1323d8 100644 --- a/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/MyInitialContextFactory.java +++ b/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/MyInitialContextFactory.java @@ -16,11 +16,12 @@ package org.glassfish.cdi.transaction; +import java.util.Hashtable; + import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import javax.naming.spi.InitialContextFactory; -import java.util.Hashtable; /** * @author JJ Snyder diff --git a/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/Transaction.java b/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/Transaction.java index f5f8c0fb274..ed1c1a87319 100644 --- a/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/Transaction.java +++ b/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/Transaction.java @@ -16,7 +16,12 @@ package org.glassfish.cdi.transaction; -import jakarta.transaction.*; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; + import javax.transaction.xa.XAResource; /** diff --git a/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/TransactionManager.java b/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/TransactionManager.java index 57b5924cfdc..75eed29c685 100644 --- a/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/TransactionManager.java +++ b/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/TransactionManager.java @@ -16,7 +16,12 @@ package org.glassfish.cdi.transaction; -import jakarta.transaction.*; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.InvalidTransactionException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; public class TransactionManager implements jakarta.transaction.TransactionManager { ThreadLocal transactionThreadLocal = new ThreadLocal(); diff --git a/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/TransactionScopedBeanTest.java b/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/TransactionScopedBeanTest.java index 79335db7fdf..2105e98c817 100644 --- a/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/TransactionScopedBeanTest.java +++ b/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/TransactionScopedBeanTest.java @@ -17,14 +17,14 @@ package org.glassfish.cdi.transaction; +import jakarta.enterprise.context.spi.Contextual; +import jakarta.enterprise.context.spi.CreationalContext; + import java.util.concurrent.ConcurrentHashMap; import org.easymock.EasyMockSupport; import org.junit.jupiter.api.Test; -import jakarta.enterprise.context.spi.Contextual; -import jakarta.enterprise.context.spi.CreationalContext; - import static org.easymock.EasyMock.expect; import static org.junit.jupiter.api.Assertions.assertSame; diff --git a/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/TransactionScopedContextExtensionTest.java b/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/TransactionScopedContextExtensionTest.java index e981420bb73..5feda82bd08 100644 --- a/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/TransactionScopedContextExtensionTest.java +++ b/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/TransactionScopedContextExtensionTest.java @@ -17,9 +17,6 @@ package org.glassfish.cdi.transaction; -import org.easymock.EasyMockSupport; -import org.junit.jupiter.api.Test; - import jakarta.enterprise.inject.spi.AfterBeanDiscovery; import jakarta.enterprise.inject.spi.AnnotatedType; import jakarta.enterprise.inject.spi.Bean; @@ -27,6 +24,9 @@ import jakarta.enterprise.inject.spi.InjectionTarget; import jakarta.enterprise.inject.spi.InjectionTargetFactory; +import org.easymock.EasyMockSupport; +import org.junit.jupiter.api.Test; + import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.isA; diff --git a/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/TransactionalAnnotationTest.java b/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/TransactionalAnnotationTest.java index 77093911210..8888aaf3f65 100644 --- a/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/TransactionalAnnotationTest.java +++ b/appserver/web/weld-integration/src/test/java/org/glassfish/cdi/transaction/TransactionalAnnotationTest.java @@ -17,17 +17,17 @@ package org.glassfish.cdi.transaction; -import java.sql.SQLException; -import java.sql.SQLWarning; - -import org.junit.jupiter.api.Test; - import jakarta.transaction.InvalidTransactionException; import jakarta.transaction.RollbackException; import jakarta.transaction.TransactionRequiredException; import jakarta.transaction.Transactional; import jakarta.transaction.TransactionalException; +import java.sql.SQLException; +import java.sql.SQLWarning; + +import org.junit.jupiter.api.Test; + import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/appserver/web/weld-integration/src/test/java/org/glassfish/weld/RootBeanDeploymentArchiveTest.java b/appserver/web/weld-integration/src/test/java/org/glassfish/weld/RootBeanDeploymentArchiveTest.java index 11184f8e9ac..71585a8c84b 100644 --- a/appserver/web/weld-integration/src/test/java/org/glassfish/weld/RootBeanDeploymentArchiveTest.java +++ b/appserver/web/weld-integration/src/test/java/org/glassfish/weld/RootBeanDeploymentArchiveTest.java @@ -17,13 +17,7 @@ package org.glassfish.weld; -import static org.easymock.EasyMock.anyObject; -import static org.easymock.EasyMock.expect; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertTrue; +import com.sun.enterprise.deployment.EjbDescriptor; import java.net.URI; import java.net.URL; @@ -40,7 +34,13 @@ import org.jboss.weld.bootstrap.spi.BeansXml; import org.junit.jupiter.api.Test; -import com.sun.enterprise.deployment.EjbDescriptor; +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.expect; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author JJ Snyder diff --git a/appserver/web/weld-integration/src/test/java/org/glassfish/weld/WeldContextListenerTest.java b/appserver/web/weld-integration/src/test/java/org/glassfish/weld/WeldContextListenerTest.java index 633c148b465..f5d74011928 100644 --- a/appserver/web/weld-integration/src/test/java/org/glassfish/weld/WeldContextListenerTest.java +++ b/appserver/web/weld-integration/src/test/java/org/glassfish/weld/WeldContextListenerTest.java @@ -17,14 +17,11 @@ package org.glassfish.weld; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.isA; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertTrue; +import jakarta.el.ELResolver; +import jakarta.el.ExpressionFactory; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.jsp.JspApplicationContext; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -37,11 +34,14 @@ import org.jboss.weld.module.web.el.WeldELContextListener; import org.junit.jupiter.api.Test; -import jakarta.el.ELResolver; -import jakarta.el.ExpressionFactory; -import jakarta.enterprise.inject.spi.BeanManager; -import jakarta.servlet.ServletContextEvent; -import jakarta.servlet.jsp.JspApplicationContext; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.isA; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author JJ Snyder From d94226a166da6027b7c84c7e8e910753a56078d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 01:31:17 +0200 Subject: [PATCH 19/40] Imports: appclient modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../appclient/client/acc/config/util/XML.java | 1 + .../client/acc/config/util/XMLTest.java | 6 ++--- .../acc/agent/AppClientContainerAgent.java | 6 ++--- .../packageappclient/PackageAppClient.java | 4 ++-- .../appclient/client/CLIBootstrap.java | 5 ++-- .../appclient/client/MaskingClassLoader.java | 6 ++++- .../client/acc/ACCStartupContext.java | 3 ++- .../appclient/client/acc/AgentArguments.java | 6 ++--- .../client/acc/AppClientContainer.java | 24 ++++++++++--------- .../client/acc/AppClientContainerBuilder.java | 10 ++++---- .../acc/AppClientContainerSecurityHelper.java | 18 +++++++------- .../client/acc/AppclientCommandArguments.java | 8 +++---- .../client/acc/ClassFileAppClientInfo.java | 2 ++ .../client/acc/HTTPInputArchive.java | 7 +++--- .../client/acc/HTTPSInputArchive.java | 2 +- .../client/acc/HttpAuthenticator.java | 4 ++-- .../client/acc/JWSFacadeLaunchable.java | 1 + .../appclient/client/acc/Launchable.java | 3 +++ .../client/acc/NestedAppClientInfo.java | 6 +++-- .../client/acc/TargetServerHelper.java | 1 + .../glassfish/appclient/client/acc/Util.java | 1 + .../callbackhandler/CallbackGUIBindings.java | 2 ++ .../DefaultGUICallbackHandler.java | 3 +++ .../DefaultTextCallbackHandler.java | 2 ++ .../client/jws/boot/ErrorDisplayDialog.java | 2 ++ .../client/jws/boot/LaunchSecurityHelper.java | 1 + .../common/ClientClassLoaderDelegate.java | 7 +++--- .../appclient/common/PermissionsUtil.java | 7 +++--- .../appclient/client/CLIBootstrapTest.java | 8 +++---- .../server/connector/AppClientSniffer.java | 18 +++++++------- .../admin/GetRelativeJWSURICommand.java | 14 ++++++++--- .../core/AppClientContainerStarter.java | 3 +-- .../core/ApplicationSignedJARManager.java | 2 ++ .../appclient/server/core/CarHandler.java | 1 + .../core/NestedAppClientDeployerHelper.java | 6 +++-- .../server/core/jws/ClientJNLPConfigData.java | 1 + .../server/core/jws/CombinedXPath.java | 2 ++ .../core/jws/DeveloperContentService.java | 10 ++++---- .../core/jws/RestrictedContentAdapter.java | 5 ++-- .../appclient/server/core/jws/Util.java | 1 + .../XPathToDeveloperProvidedContentRefs.java | 2 ++ .../jws/servedcontent/ACCConfigContent.java | 1 + .../CachingDynamicContentImpl.java | 1 + .../core/jws/servedcontent/FixedContent.java | 4 +++- .../SimpleDynamicContentImpl.java | 1 + .../core/jws/servedcontent/StaticContent.java | 1 + .../StreamedAutoSignedStaticContent.java | 6 +++-- .../core/jws/servedcontent/TokenHelper.java | 2 ++ 48 files changed, 149 insertions(+), 88 deletions(-) diff --git a/appserver/appclient/client/acc-config/src/main/java/org/glassfish/appclient/client/acc/config/util/XML.java b/appserver/appclient/client/acc-config/src/main/java/org/glassfish/appclient/client/acc/config/util/XML.java index 50bf3d1b882..e29f66d2b18 100644 --- a/appserver/appclient/client/acc-config/src/main/java/org/glassfish/appclient/client/acc/config/util/XML.java +++ b/appserver/appclient/client/acc-config/src/main/java/org/glassfish/appclient/client/acc/config/util/XML.java @@ -19,6 +19,7 @@ import java.util.Arrays; import java.util.List; import java.util.Properties; + import org.glassfish.appclient.client.acc.config.Property; /** diff --git a/appserver/appclient/client/acc-config/src/test/java/org/glassfish/appclient/client/acc/config/util/XMLTest.java b/appserver/appclient/client/acc-config/src/test/java/org/glassfish/appclient/client/acc/config/util/XMLTest.java index 60d713aa7ad..67a854c682a 100644 --- a/appserver/appclient/client/acc-config/src/test/java/org/glassfish/appclient/client/acc/config/util/XMLTest.java +++ b/appserver/appclient/client/acc-config/src/test/java/org/glassfish/appclient/client/acc/config/util/XMLTest.java @@ -17,6 +17,9 @@ package org.glassfish.appclient.client.acc.config.util; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Unmarshaller; + import java.io.InputStream; import java.net.URI; import java.util.HashMap; @@ -35,9 +38,6 @@ import org.xml.sax.InputSource; import org.xml.sax.XMLReader; -import jakarta.xml.bind.JAXBContext; -import jakarta.xml.bind.Unmarshaller; - import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/appserver/appclient/client/acc-standalone/src/main/java/org/glassfish/appclient/client/acc/agent/AppClientContainerAgent.java b/appserver/appclient/client/acc-standalone/src/main/java/org/glassfish/appclient/client/acc/agent/AppClientContainerAgent.java index c7ede713a15..4259952c059 100644 --- a/appserver/appclient/client/acc-standalone/src/main/java/org/glassfish/appclient/client/acc/agent/AppClientContainerAgent.java +++ b/appserver/appclient/client/acc-standalone/src/main/java/org/glassfish/appclient/client/acc/agent/AppClientContainerAgent.java @@ -16,9 +16,6 @@ package org.glassfish.appclient.client.acc.agent; -import static java.util.logging.Level.FINE; -import static org.glassfish.appclient.client.CLIBootstrap.FILE_OPTIONS_INTRODUCER; - import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; @@ -30,6 +27,9 @@ import org.glassfish.appclient.client.AppClientFacade; import org.glassfish.appclient.client.acc.UserError; +import static java.util.logging.Level.FINE; +import static org.glassfish.appclient.client.CLIBootstrap.FILE_OPTIONS_INTRODUCER; + /** * Agent which prepares the ACC before the VM launches the selected main program. * diff --git a/appserver/appclient/client/acc-standalone/src/main/java/org/glassfish/appclient/client/packageappclient/PackageAppClient.java b/appserver/appclient/client/acc-standalone/src/main/java/org/glassfish/appclient/client/packageappclient/PackageAppClient.java index 40cdb8310e7..cac07567328 100644 --- a/appserver/appclient/client/acc-standalone/src/main/java/org/glassfish/appclient/client/packageappclient/PackageAppClient.java +++ b/appserver/appclient/client/acc-standalone/src/main/java/org/glassfish/appclient/client/packageappclient/PackageAppClient.java @@ -16,7 +16,7 @@ package org.glassfish.appclient.client.packageappclient; -import static java.util.jar.Attributes.Name.CLASS_PATH; +import com.sun.enterprise.universal.i18n.LocalStringsImpl; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -35,7 +35,7 @@ import java.util.jar.JarOutputStream; import java.util.zip.ZipException; -import com.sun.enterprise.universal.i18n.LocalStringsImpl; +import static java.util.jar.Attributes.Name.CLASS_PATH; /** * Creates a JAR file containing the runtime bits required to run app clients remotely, on a system without a full diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/CLIBootstrap.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/CLIBootstrap.java index 40aea49e3ac..2b4a0e15978 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/CLIBootstrap.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/CLIBootstrap.java @@ -17,7 +17,7 @@ package org.glassfish.appclient.client; -import static java.lang.System.arraycopy; +import com.sun.enterprise.util.OS; import java.io.File; import java.io.IOException; @@ -32,7 +32,8 @@ import org.glassfish.appclient.client.acc.UserError; import org.glassfish.appclient.common.ClassPathUtils; -import com.sun.enterprise.util.OS; + +import static java.lang.System.arraycopy; /** * Constructs a java command to launch the ACC with the correct agent and command line arguments, based on the current diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/MaskingClassLoader.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/MaskingClassLoader.java index 345b717e1ca..d5aa476a8ba 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/MaskingClassLoader.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/MaskingClassLoader.java @@ -18,7 +18,11 @@ import java.io.IOException; import java.net.URL; -import java.util.*; +import java.util.Collection; +import java.util.Enumeration; +import java.util.HashSet; +import java.util.NoSuchElementException; +import java.util.Set; /** * {@link ClassLoader} that masks a specified set of classes from its parent class loader. diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/ACCStartupContext.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/ACCStartupContext.java index 84f4e58a9b9..b63e7c8f99c 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/ACCStartupContext.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/ACCStartupContext.java @@ -21,13 +21,14 @@ import com.sun.enterprise.module.bootstrap.StartupContext; import com.sun.enterprise.util.io.FileUtils; +import jakarta.inject.Singleton; + import java.io.File; import java.net.URI; import java.net.URISyntaxException; import java.util.Properties; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Singleton; /** * Start-up context for the ACC. Note that this context is used also for diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AgentArguments.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AgentArguments.java index d9931309910..a49e078f102 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AgentArguments.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AgentArguments.java @@ -16,9 +16,6 @@ package org.glassfish.appclient.client.acc; -import static java.util.Collections.emptyList; -import static java.util.regex.Pattern.DOTALL; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -28,6 +25,9 @@ import org.glassfish.appclient.client.CLIBootstrap; +import static java.util.Collections.emptyList; +import static java.util.regex.Pattern.DOTALL; + /** * Self-contained scanner for an agent argument string. * diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientContainer.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientContainer.java index 4a28a5aee36..b7f416f5efd 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientContainer.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientContainer.java @@ -17,16 +17,22 @@ package org.glassfish.appclient.client.acc; +import com.sun.appserv.connectors.internal.api.ConnectorRuntime; +import com.sun.enterprise.container.common.spi.ManagedBeanManager; import com.sun.enterprise.container.common.spi.util.ComponentEnvManager; import com.sun.enterprise.container.common.spi.util.InjectionException; import com.sun.enterprise.container.common.spi.util.InjectionManager; import com.sun.enterprise.deployment.ApplicationClientDescriptor; +import com.sun.enterprise.deployment.PersistenceUnitDescriptor; import com.sun.enterprise.deployment.ServiceReferenceDescriptor; import com.sun.enterprise.security.webservices.client.ClientPipeCloser; -import com.sun.appserv.connectors.internal.api.ConnectorRuntime; - -import com.sun.enterprise.deployment.PersistenceUnitDescriptor; import com.sun.logging.LogDomains; + +import jakarta.inject.Inject; +import jakarta.persistence.EntityManagerFactory; +import jakarta.transaction.Status; +import jakarta.transaction.TransactionManager; + import java.io.IOException; import java.lang.instrument.Instrumentation; import java.lang.reflect.InvocationTargetException; @@ -43,13 +49,11 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.inject.Inject; + import javax.naming.NamingException; -import jakarta.persistence.EntityManagerFactory; import javax.security.auth.callback.CallbackHandler; import javax.swing.SwingUtilities; -import jakarta.transaction.Status; -import jakarta.transaction.TransactionManager; + import org.apache.naming.resources.DirContextURLStreamHandlerFactory; import org.glassfish.api.invocation.ComponentInvocation; import org.glassfish.api.invocation.InvocationManager; @@ -59,13 +63,11 @@ import org.glassfish.appclient.client.acc.config.Property; import org.glassfish.appclient.client.acc.config.Security; import org.glassfish.appclient.client.acc.config.TargetServer; -import org.glassfish.persistence.jpa.PersistenceUnitLoader; -import com.sun.enterprise.container.common.spi.ManagedBeanManager; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceHandle; import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.persistence.jpa.PersistenceUnitLoader; +import org.jvnet.hk2.annotations.Service; import org.xml.sax.SAXException; /** diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientContainerBuilder.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientContainerBuilder.java index 63e9b668f7d..d65a66c207c 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientContainerBuilder.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientContainerBuilder.java @@ -22,11 +22,6 @@ import com.sun.enterprise.util.LocalStringManager; import com.sun.enterprise.util.LocalStringManagerImpl; -import static java.util.logging.Level.CONFIG; -import static org.glassfish.internal.api.ORBLocator.OMG_ORB_INIT_HOST_PROPERTY; -import static org.glassfish.internal.api.ORBLocator.OMG_ORB_INIT_PORT_PROPERTY; -import static org.glassfish.internal.api.ORBLocator.ORB_SSL_CLIENT_REQUIRED; - import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; @@ -47,6 +42,11 @@ import org.glassfish.enterprise.iiop.api.GlassFishORBHelper; import org.xml.sax.SAXException; +import static java.util.logging.Level.CONFIG; +import static org.glassfish.internal.api.ORBLocator.OMG_ORB_INIT_HOST_PROPERTY; +import static org.glassfish.internal.api.ORBLocator.OMG_ORB_INIT_PORT_PROPERTY; +import static org.glassfish.internal.api.ORBLocator.ORB_SSL_CLIENT_REQUIRED; + /** * Implements a builder for accumulating configuration information for the app client container and then starting the * ACC. diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientContainerSecurityHelper.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientContainerSecurityHelper.java index e37ecc31d1a..1720cab8de1 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientContainerSecurityHelper.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppClientContainerSecurityHelper.java @@ -16,9 +16,12 @@ package org.glassfish.appclient.client.acc; -import static com.sun.enterprise.security.appclient.integration.AppClientSecurityInfo.CredentialType.USERNAME_PASSWORD; -import static java.util.Arrays.asList; -import static org.glassfish.appclient.client.acc.Util.writeTextToTempFile; +import com.sun.enterprise.container.common.spi.util.InjectionException; +import com.sun.enterprise.container.common.spi.util.InjectionManager; +import com.sun.enterprise.deployment.ApplicationClientDescriptor; +import com.sun.enterprise.security.appclient.integration.AppClientSecurityInfo; + +import jakarta.inject.Inject; import java.io.File; import java.io.IOException; @@ -36,12 +39,9 @@ import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.container.common.spi.util.InjectionException; -import com.sun.enterprise.container.common.spi.util.InjectionManager; -import com.sun.enterprise.deployment.ApplicationClientDescriptor; -import com.sun.enterprise.security.appclient.integration.AppClientSecurityInfo; - -import jakarta.inject.Inject; +import static com.sun.enterprise.security.appclient.integration.AppClientSecurityInfo.CredentialType.USERNAME_PASSWORD; +import static java.util.Arrays.asList; +import static org.glassfish.appclient.client.acc.Util.writeTextToTempFile; /** * diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppclientCommandArguments.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppclientCommandArguments.java index e5ce12c5c67..62a74159860 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppclientCommandArguments.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/AppclientCommandArguments.java @@ -16,6 +16,10 @@ package org.glassfish.appclient.client.acc; +import com.sun.enterprise.util.LocalStringManager; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.logging.LogDomains; + import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; @@ -31,10 +35,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.util.LocalStringManager; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.logging.LogDomains; - /** * Encapsulates handling of appclient script command arguments and options. *

      diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/ClassFileAppClientInfo.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/ClassFileAppClientInfo.java index 12dd16c2043..ee301229107 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/ClassFileAppClientInfo.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/ClassFileAppClientInfo.java @@ -19,9 +19,11 @@ import com.sun.enterprise.deploy.shared.FileArchive; import com.sun.enterprise.deployment.ApplicationClientDescriptor; import com.sun.enterprise.deployment.archivist.AppClientArchivist; + import java.io.File; import java.io.IOException; import java.util.logging.Logger; + import org.glassfish.apf.AnnotationProcessorException; /** diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/HTTPInputArchive.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/HTTPInputArchive.java index ac54eb838e2..58c28875a7c 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/HTTPInputArchive.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/HTTPInputArchive.java @@ -16,6 +16,8 @@ package org.glassfish.appclient.client.acc; +import com.sun.enterprise.deploy.shared.AbstractReadableArchive; + import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; @@ -33,11 +35,10 @@ import java.util.jar.Manifest; import java.util.logging.Level; import java.util.logging.Logger; -import org.glassfish.api.deployment.archive.ReadableArchive; -import com.sun.enterprise.deploy.shared.AbstractReadableArchive; -import org.jvnet.hk2.annotations.Service; +import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * Implements ReadableArchive for the http (and https) protocol to support diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/HTTPSInputArchive.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/HTTPSInputArchive.java index 789e68135c9..ff985e922fe 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/HTTPSInputArchive.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/HTTPSInputArchive.java @@ -17,8 +17,8 @@ package org.glassfish.appclient.client.acc; -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * Implements ReadableArchive for the https protocol to support diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/HttpAuthenticator.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/HttpAuthenticator.java index 7b696dbd9ba..a32b211a76e 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/HttpAuthenticator.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/HttpAuthenticator.java @@ -20,14 +20,14 @@ import com.sun.enterprise.security.auth.login.common.PasswordCredential; import com.sun.enterprise.security.common.ClientSecurityContext; - import java.net.Authenticator; import java.net.PasswordAuthentication; import java.security.Principal; import java.util.Iterator; import java.util.Set; -import java.util.logging.Logger; import java.util.logging.Level; +import java.util.logging.Logger; + import javax.security.auth.Subject; /** * This is the callback object that gets called when a protected resource diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/JWSFacadeLaunchable.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/JWSFacadeLaunchable.java index 02cfaef91f2..2e50fe3df0c 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/JWSFacadeLaunchable.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/JWSFacadeLaunchable.java @@ -19,6 +19,7 @@ import java.io.IOException; import java.net.URISyntaxException; import java.util.jar.Attributes; + import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.hk2.api.ServiceLocator; diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/Launchable.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/Launchable.java index 0e5eca01321..6632b10c2db 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/Launchable.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/Launchable.java @@ -22,6 +22,7 @@ import com.sun.enterprise.module.bootstrap.BootException; import com.sun.enterprise.util.LocalStringManager; import com.sun.enterprise.util.LocalStringManagerImpl; + import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; @@ -29,7 +30,9 @@ import java.net.URLClassLoader; import java.security.AccessController; import java.security.PrivilegedAction; + import javax.xml.stream.XMLStreamException; + import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.hk2.api.ServiceLocator; import org.xml.sax.SAXException; diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/NestedAppClientInfo.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/NestedAppClientInfo.java index a576c5dd48d..effe31f4798 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/NestedAppClientInfo.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/NestedAppClientInfo.java @@ -20,13 +20,15 @@ import com.sun.enterprise.deployment.ApplicationClientDescriptor; import com.sun.enterprise.deployment.archivist.Archivist; import com.sun.enterprise.util.io.FileUtils; + import java.io.File; +import java.util.ArrayList; import java.util.Enumeration; import java.util.Iterator; -import java.util.Set; -import java.util.ArrayList; import java.util.List; +import java.util.Set; import java.util.logging.Logger; + import org.glassfish.api.deployment.archive.ReadableArchive; /** diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/TargetServerHelper.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/TargetServerHelper.java index 278db8684f9..4d005ff89b3 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/TargetServerHelper.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/TargetServerHelper.java @@ -18,6 +18,7 @@ import java.util.ArrayList; import java.util.List; + import org.glassfish.appclient.client.acc.config.ClientContainer; import org.glassfish.appclient.client.acc.config.Property; import org.glassfish.appclient.client.acc.config.Security; diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/Util.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/Util.java index bcef290c396..ed56266cc92 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/Util.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/Util.java @@ -21,6 +21,7 @@ import com.sun.enterprise.deployment.archivist.ArchivistFactory; import com.sun.enterprise.util.LocalStringManager; import com.sun.enterprise.util.LocalStringManagerImpl; + import java.io.BufferedWriter; import java.io.File; import java.io.FileNotFoundException; diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/callbackhandler/CallbackGUIBindings.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/callbackhandler/CallbackGUIBindings.java index 9ac3b221cc0..73893f777fd 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/callbackhandler/CallbackGUIBindings.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/callbackhandler/CallbackGUIBindings.java @@ -24,6 +24,7 @@ import java.util.Locale; import java.util.Map; import java.util.Vector; + import javax.security.auth.callback.Callback; import javax.security.auth.callback.ChoiceCallback; import javax.security.auth.callback.ConfirmationCallback; @@ -45,6 +46,7 @@ import javax.swing.JTextField; import javax.swing.ListSelectionModel; import javax.swing.border.EtchedBorder; + import org.glassfish.appclient.client.acc.callbackhandler.CallbackBinding.GUI; /** diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/callbackhandler/DefaultGUICallbackHandler.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/callbackhandler/DefaultGUICallbackHandler.java index 8346996657c..7127d412357 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/callbackhandler/DefaultGUICallbackHandler.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/callbackhandler/DefaultGUICallbackHandler.java @@ -18,9 +18,12 @@ import com.sun.enterprise.security.GUILoginDialog; import com.sun.enterprise.universal.i18n.LocalStringsImpl; + import java.io.IOException; + import javax.security.auth.callback.Callback; import javax.security.auth.callback.UnsupportedCallbackException; + import org.glassfish.appclient.client.acc.callbackhandler.CallbackGUIBindings.MessageType; /** diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/callbackhandler/DefaultTextCallbackHandler.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/callbackhandler/DefaultTextCallbackHandler.java index 738049d44e4..77266425494 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/callbackhandler/DefaultTextCallbackHandler.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/callbackhandler/DefaultTextCallbackHandler.java @@ -17,7 +17,9 @@ package org.glassfish.appclient.client.acc.callbackhandler; import com.sun.enterprise.security.TextLoginDialog; + import java.io.IOException; + import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/jws/boot/ErrorDisplayDialog.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/jws/boot/ErrorDisplayDialog.java index 4818871fceb..677cdeb5d41 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/jws/boot/ErrorDisplayDialog.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/jws/boot/ErrorDisplayDialog.java @@ -22,11 +22,13 @@ import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.util.ResourceBundle; + import javax.swing.JCheckBox; import javax.swing.JDialog; import javax.swing.JOptionPane; import javax.swing.JScrollPane; import javax.swing.JTextArea; + import org.glassfish.appclient.client.acc.UserError; /** diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/jws/boot/LaunchSecurityHelper.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/jws/boot/LaunchSecurityHelper.java index a7dd8d1ff15..d72b6074845 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/jws/boot/LaunchSecurityHelper.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/jws/boot/LaunchSecurityHelper.java @@ -23,6 +23,7 @@ import java.io.InputStreamReader; import java.net.URI; import java.security.Policy; + import org.glassfish.appclient.client.acc.AppClientContainer; import org.glassfish.appclient.client.acc.Util; diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/common/ClientClassLoaderDelegate.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/common/ClientClassLoaderDelegate.java index adbcb3146f1..ed04f73c3ac 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/common/ClientClassLoaderDelegate.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/common/ClientClassLoaderDelegate.java @@ -15,12 +15,13 @@ */ package org.glassfish.appclient.common; +import com.sun.enterprise.security.ee.perms.SMGlobalPolicyUtil; +import com.sun.enterprise.security.integration.PermsHolder; + import java.io.IOException; +import java.net.URLClassLoader; import java.security.CodeSource; import java.security.PermissionCollection; -import java.net.URLClassLoader; -import com.sun.enterprise.security.ee.perms.SMGlobalPolicyUtil; -import com.sun.enterprise.security.integration.PermsHolder; public class ClientClassLoaderDelegate { diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/common/PermissionsUtil.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/common/PermissionsUtil.java index 84be1380df2..9f58dba1457 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/common/PermissionsUtil.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/common/PermissionsUtil.java @@ -15,10 +15,8 @@ */ package org.glassfish.appclient.common; -import static com.sun.enterprise.security.ee.perms.SMGlobalPolicyUtil.CLIENT_TYPE_CODESOURCE; -import static com.sun.enterprise.security.ee.perms.SMGlobalPolicyUtil.CommponentType.car; - import com.sun.enterprise.security.ee.perms.XMLPermissionsHandler; + import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -34,6 +32,9 @@ import javax.xml.stream.XMLStreamException; +import static com.sun.enterprise.security.ee.perms.SMGlobalPolicyUtil.CLIENT_TYPE_CODESOURCE; +import static com.sun.enterprise.security.ee.perms.SMGlobalPolicyUtil.CommponentType.car; + public class PermissionsUtil { protected static final String PERMISSIONS_XML = "META-INF/permissions.xml"; diff --git a/appserver/appclient/client/acc/src/test/java/org/glassfish/appclient/client/CLIBootstrapTest.java b/appserver/appclient/client/acc/src/test/java/org/glassfish/appclient/client/CLIBootstrapTest.java index b00174ad6d2..09324219171 100644 --- a/appserver/appclient/client/acc/src/test/java/org/glassfish/appclient/client/CLIBootstrapTest.java +++ b/appserver/appclient/client/acc/src/test/java/org/glassfish/appclient/client/CLIBootstrapTest.java @@ -17,20 +17,20 @@ package org.glassfish.appclient.client; +import java.lang.reflect.Method; +import java.util.regex.Pattern; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; import static org.junit.jupiter.api.Assertions.assertAll; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; - -import java.lang.reflect.Method; -import java.util.regex.Pattern; /** * diff --git a/appserver/appclient/server/connector/src/main/java/org/glassfish/appclient/server/connector/AppClientSniffer.java b/appserver/appclient/server/connector/src/main/java/org/glassfish/appclient/server/connector/AppClientSniffer.java index 9c3abf254f4..4fef8b66f3c 100644 --- a/appserver/appclient/server/connector/src/main/java/org/glassfish/appclient/server/connector/AppClientSniffer.java +++ b/appserver/appclient/server/connector/src/main/java/org/glassfish/appclient/server/connector/AppClientSniffer.java @@ -16,21 +16,19 @@ package org.glassfish.appclient.server.connector; -import java.util.jar.Manifest; -import org.glassfish.internal.deployment.GenericSniffer; import jakarta.inject.Inject; - -import org.glassfish.api.deployment.archive.ReadableArchive; -import org.glassfish.api.deployment.archive.ArchiveType; - - -import org.jvnet.hk2.annotations.Service; import jakarta.inject.Singleton; import java.io.IOException; -import java.util.jar.Attributes; -import java.util.List; import java.util.ArrayList; +import java.util.List; +import java.util.jar.Attributes; +import java.util.jar.Manifest; + +import org.glassfish.api.deployment.archive.ArchiveType; +import org.glassfish.api.deployment.archive.ReadableArchive; +import org.glassfish.internal.deployment.GenericSniffer; +import org.jvnet.hk2.annotations.Service; @Service(name = "AppClient") @Singleton diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/admin/GetRelativeJWSURICommand.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/admin/GetRelativeJWSURICommand.java index 016605f6990..ec66f33f507 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/admin/GetRelativeJWSURICommand.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/admin/GetRelativeJWSURICommand.java @@ -21,14 +21,22 @@ import com.sun.enterprise.config.serverbeans.Module; import com.sun.enterprise.util.LocalStringManager; import com.sun.enterprise.util.LocalStringManagerImpl; + import jakarta.inject.Inject; + import org.glassfish.api.ActionReport; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.appclient.server.core.AppClientDeployer; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * Returns the path part (not host or port) of the URI for launching diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/AppClientContainerStarter.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/AppClientContainerStarter.java index 2978deb42d9..ae5978663b9 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/AppClientContainerStarter.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/AppClientContainerStarter.java @@ -17,9 +17,8 @@ package org.glassfish.appclient.server.core; import org.glassfish.api.container.Container; -import org.jvnet.hk2.annotations.Service; - import org.glassfish.api.deployment.Deployer; +import org.jvnet.hk2.annotations.Service; @Service(name="appclient") public class AppClientContainerStarter implements Container { diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/ApplicationSignedJARManager.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/ApplicationSignedJARManager.java index ca0bd47fa08..e203126d684 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/ApplicationSignedJARManager.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/ApplicationSignedJARManager.java @@ -17,6 +17,7 @@ package org.glassfish.appclient.server.core; import com.sun.enterprise.deploy.shared.ArchiveFactory; + import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -31,6 +32,7 @@ import java.util.Set; import java.util.jar.Attributes; import java.util.jar.Manifest; + import org.glassfish.api.deployment.DeploymentContext; import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.appclient.server.core.jws.JavaWebStartInfo; diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/CarHandler.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/CarHandler.java index e37b492cfa1..8856301bb52 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/CarHandler.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/CarHandler.java @@ -21,6 +21,7 @@ import com.sun.enterprise.loader.ASURLClassLoader; import com.sun.enterprise.security.ee.perms.PermsArchiveDelegate; import com.sun.enterprise.security.ee.perms.SMGlobalPolicyUtil; + import jakarta.inject.Inject; import jakarta.inject.Named; diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/NestedAppClientDeployerHelper.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/NestedAppClientDeployerHelper.java index 6df390367f6..1da5b829fdf 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/NestedAppClientDeployerHelper.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/NestedAppClientDeployerHelper.java @@ -20,11 +20,11 @@ import com.sun.enterprise.deployment.Application; import com.sun.enterprise.deployment.ApplicationClientDescriptor; import com.sun.enterprise.deployment.BundleDescriptor; -import com.sun.enterprise.deployment.util.DOLUtils; import com.sun.enterprise.deployment.archivist.AppClientArchivist; import com.sun.enterprise.deployment.deploy.shared.OutputJarArchive; import com.sun.enterprise.deployment.deploy.shared.Util; -import org.glassfish.deployment.common.ModuleDescriptor; +import com.sun.enterprise.deployment.util.DOLUtils; + import java.io.File; import java.io.FileFilter; import java.io.IOException; @@ -41,6 +41,7 @@ import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; + import org.glassfish.api.admin.ProcessEnvironment; import org.glassfish.api.deployment.DeploymentContext; import org.glassfish.appclient.server.core.jws.JWSAdapterManager; @@ -54,6 +55,7 @@ import org.glassfish.deployment.common.Artifacts.FullAndPartURIs; import org.glassfish.deployment.common.ClientArtifactsManager; import org.glassfish.deployment.common.DeploymentUtils; +import org.glassfish.deployment.common.ModuleDescriptor; import org.glassfish.deployment.versioning.VersioningSyntaxException; import org.glassfish.deployment.versioning.VersioningUtils; import org.glassfish.hk2.api.ServiceLocator; diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/ClientJNLPConfigData.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/ClientJNLPConfigData.java index 76ffaa27cf7..3ba771a0583 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/ClientJNLPConfigData.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/ClientJNLPConfigData.java @@ -27,6 +27,7 @@ import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; + import org.glassfish.logging.annotation.LogMessageInfo; /** diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/CombinedXPath.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/CombinedXPath.java index 2e5370243a7..be19e2794cd 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/CombinedXPath.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/CombinedXPath.java @@ -23,11 +23,13 @@ import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; + import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; + import org.w3c.dom.Attr; import org.w3c.dom.DOMImplementation; import org.w3c.dom.Document; diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/DeveloperContentService.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/DeveloperContentService.java index 323ff2a018a..7b80a965d2a 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/DeveloperContentService.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/DeveloperContentService.java @@ -17,14 +17,16 @@ package org.glassfish.appclient.server.core.jws; import com.sun.enterprise.module.bootstrap.StartupContext; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import java.io.File; import java.util.List; -import jakarta.inject.Inject; -import org.glassfish.api.admin.ServerEnvironment; -import org.jvnet.hk2.annotations.Service; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.hk2.api.PostConstruct; -import jakarta.inject.Singleton; +import org.jvnet.hk2.annotations.Service; /** * Maintains the in-memory representation for the customization points of diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/RestrictedContentAdapter.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/RestrictedContentAdapter.java index 5961f783278..d76a04702f5 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/RestrictedContentAdapter.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/RestrictedContentAdapter.java @@ -16,15 +16,16 @@ package org.glassfish.appclient.server.core.jws; +import jakarta.servlet.http.HttpServletResponse; + import java.io.File; import java.io.IOException; +import java.net.URI; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.servlet.http.HttpServletResponse; -import java.net.URI; import org.glassfish.appclient.server.core.jws.servedcontent.Content; import org.glassfish.appclient.server.core.jws.servedcontent.StaticContent; import org.glassfish.grizzly.http.server.HttpHandler; diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/Util.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/Util.java index b9c3c6c22f3..e70eb8505e6 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/Util.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/Util.java @@ -20,6 +20,7 @@ import java.util.Properties; import java.util.regex.Matcher; import java.util.regex.Pattern; + import org.glassfish.grizzly.http.server.Request; /** diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/XPathToDeveloperProvidedContentRefs.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/XPathToDeveloperProvidedContentRefs.java index 3401b7464b1..ee55afee78f 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/XPathToDeveloperProvidedContentRefs.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/XPathToDeveloperProvidedContentRefs.java @@ -27,9 +27,11 @@ import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; + import javax.xml.xpath.XPath; import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathFactory; + import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.appclient.server.core.AppClientDeployerHelper; import org.glassfish.appclient.server.core.ApplicationSignedJARManager; diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/ACCConfigContent.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/ACCConfigContent.java index 825f5006868..8bec0b6a8fc 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/ACCConfigContent.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/ACCConfigContent.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.util.regex.Matcher; import java.util.regex.Pattern; + import org.glassfish.appclient.server.core.jws.Util; /** diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/CachingDynamicContentImpl.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/CachingDynamicContentImpl.java index 44ac4988d21..bfeaa8a7c11 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/CachingDynamicContentImpl.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/CachingDynamicContentImpl.java @@ -18,6 +18,7 @@ import java.util.LinkedList; import java.util.Properties; + import org.glassfish.appclient.server.core.jws.Util; /** diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/FixedContent.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/FixedContent.java index 0570a8f375f..b6b4ab671d1 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/FixedContent.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/FixedContent.java @@ -16,11 +16,13 @@ package org.glassfish.appclient.server.core.jws.servedcontent; +import jakarta.servlet.http.HttpServletResponse; + import java.io.File; import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.servlet.http.HttpServletResponse; + import org.glassfish.appclient.server.core.AppClientDeployerHelper; import org.glassfish.appclient.server.core.jws.RestrictedContentAdapter; import org.glassfish.grizzly.http.server.Request; diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/SimpleDynamicContentImpl.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/SimpleDynamicContentImpl.java index 4940f6587b4..ebad180be29 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/SimpleDynamicContentImpl.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/SimpleDynamicContentImpl.java @@ -17,6 +17,7 @@ package org.glassfish.appclient.server.core.jws.servedcontent; import java.util.Properties; + import org.glassfish.appclient.server.core.jws.Util; /** diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/StaticContent.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/StaticContent.java index 66a0a811f78..0b9c7c69157 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/StaticContent.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/StaticContent.java @@ -18,6 +18,7 @@ import java.io.File; import java.io.IOException; + import org.glassfish.grizzly.http.server.Request; import org.glassfish.grizzly.http.server.Response; diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/StreamedAutoSignedStaticContent.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/StreamedAutoSignedStaticContent.java index bfbebc699a4..a1e50a3bb58 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/StreamedAutoSignedStaticContent.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/StreamedAutoSignedStaticContent.java @@ -29,16 +29,18 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; + import org.glassfish.appclient.server.core.AppClientDeployerHelper; import org.glassfish.appclient.server.core.jws.AppClientHTTPAdapter; -import static org.glassfish.appclient.server.core.jws.RestrictedContentAdapter.DATE_HEADER_NAME; -import static org.glassfish.appclient.server.core.jws.RestrictedContentAdapter.LAST_MODIFIED_HEADER_NAME; import org.glassfish.grizzly.http.server.Request; import org.glassfish.grizzly.http.server.Response; import org.glassfish.grizzly.http.server.Session; import org.glassfish.grizzly.http.util.HttpStatus; import org.glassfish.grizzly.http.util.MimeType; +import static org.glassfish.appclient.server.core.jws.RestrictedContentAdapter.DATE_HEADER_NAME; +import static org.glassfish.appclient.server.core.jws.RestrictedContentAdapter.LAST_MODIFIED_HEADER_NAME; + /** * Auto-signed content that is delivered not as an on-disk file but as an * output stream. diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/TokenHelper.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/TokenHelper.java index 77881ce9ce7..6a7119b3896 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/TokenHelper.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/TokenHelper.java @@ -18,8 +18,10 @@ import com.sun.enterprise.deployment.ApplicationClientDescriptor; import com.sun.enterprise.universal.i18n.LocalStringsImpl; + import java.net.URI; import java.util.Properties; + import org.glassfish.appclient.server.core.AppClientDeployerHelper; import org.glassfish.appclient.server.core.NestedAppClientDeployerHelper; import org.glassfish.appclient.server.core.StandaloneAppClientDeployerHelper; From ccf16b428c2388e36d9bde6c7e3597c469ed07e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 01:48:28 +0200 Subject: [PATCH 20/40] Imports: jts module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../java/com/sun/jts/CosTransactions/CoordinatorLog.java | 1 - .../jts/CosTransactions/DefaultTransactionService.java | 3 +-- .../src/main/java/com/sun/jts/CosTransactions/Log.java | 2 -- .../main/java/com/sun/jts/CosTransactions/LogControl.java | 1 - .../java/com/sun/jts/CosTransactions/SenderReceiver.java | 3 ++- .../java/com/sun/jts/CosTransactions/TopCoordinator.java | 8 -------- .../main/java/com/sun/jts/jta/TransactionManagerImpl.java | 2 +- .../src/main/java/com/sun/jts/jtsxa/OTSResourceImpl.java | 5 ++--- .../src/main/java/com/sun/jts/pi/IORInterceptorImpl.java | 2 +- .../jts/src/main/java/com/sun/jts/pi/InterceptorImpl.java | 4 ++-- .../src/main/java/com/sun/jts/pi/ORBInitializerImpl.java | 5 ++--- 11 files changed, 11 insertions(+), 25 deletions(-) diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorLog.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorLog.java index 706e3006c56..97f4e6411ca 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorLog.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorLog.java @@ -38,7 +38,6 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; - import java.util.Enumeration; import java.util.Hashtable; import java.util.Stack; diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DefaultTransactionService.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DefaultTransactionService.java index b27d60c5a9b..9c26e6c76d2 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DefaultTransactionService.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DefaultTransactionService.java @@ -35,7 +35,6 @@ import java.net.InetAddress; import java.net.UnknownHostException; - import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; @@ -44,9 +43,9 @@ import org.omg.CORBA.INTERNAL; import org.omg.CORBA.LocalObject; import org.omg.CORBA.ORB; +import org.omg.CORBA.ORBPackage.InvalidName; import org.omg.CORBA.Policy; import org.omg.CORBA.TSIdentification; -import org.omg.CORBA.ORBPackage.InvalidName; import org.omg.CosNaming.NameComponent; import org.omg.CosNaming.NamingContext; import org.omg.CosNaming.NamingContextHelper; diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/Log.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/Log.java index 5d939a77b48..d8b425a00ba 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/Log.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/Log.java @@ -34,8 +34,6 @@ import com.sun.logging.LogDomains; import java.util.logging.Level; - - import java.util.logging.Logger; diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogControl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogControl.java index c45110d7527..150b1c759f4 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogControl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogControl.java @@ -34,7 +34,6 @@ import com.sun.logging.LogDomains; import java.io.File; - import java.util.Vector; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/SenderReceiver.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/SenderReceiver.java index 7ddc20eae77..878b71b6c6a 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/SenderReceiver.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/SenderReceiver.java @@ -39,13 +39,14 @@ import org.omg.CORBA.TRANSACTION_REQUIRED; import org.omg.CORBA.TRANSACTION_ROLLEDBACK; import org.omg.CORBA.TSIdentification; -import org.omg.CORBA.WrongTransaction; import org.omg.CORBA.TSIdentificationPackage.AlreadyIdentified; import org.omg.CORBA.TSIdentificationPackage.NotAvailable; +import org.omg.CORBA.WrongTransaction; import org.omg.CosTSPortability.Receiver; import org.omg.CosTSPortability.Sender; import org.omg.CosTransactions.PropagationContext; import org.omg.CosTransactions.PropagationContextHolder; + /** * The SenderRecevier class is our implemention of the OTS Sender and Receiver * classes. diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TopCoordinator.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TopCoordinator.java index 7439ad5720d..5ec970a183d 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TopCoordinator.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TopCoordinator.java @@ -35,19 +35,11 @@ import com.sun.jts.codegen.otsidl.JCoordinator; import com.sun.jts.codegen.otsidl.JCoordinatorHelper; import com.sun.jts.jtsxa.OTSResourceImpl; -//import com.sun.jts.codegen.otsidl.JCoordinatorHelper; -//import com.sun.jts.codegen.otsidl.JCoordinatorOperations; -//import java.io.PrintStream; -//import java.util.Vector; import com.sun.jts.utils.LogFormatter; import com.sun.logging.LogDomains; import java.util.Vector; import java.util.logging.Level; - -//import com.sun.enterprise.transaction.OTSResourceImpl; -//import com.sun.enterprise.transaction.SynchronizationImpl; - import java.util.logging.Logger; import org.omg.CORBA.Any; diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/jta/TransactionManagerImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/jta/TransactionManagerImpl.java index 56eb8b06ae2..9846427a805 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/jta/TransactionManagerImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/jta/TransactionManagerImpl.java @@ -53,8 +53,8 @@ import org.omg.CORBA.INVALID_TRANSACTION; import org.omg.CORBA.NO_PERMISSION; import org.omg.CORBA.ORB; -import org.omg.CORBA.TRANSACTION_ROLLEDBACK; import org.omg.CORBA.ORBPackage.InvalidName; +import org.omg.CORBA.TRANSACTION_ROLLEDBACK; import org.omg.CosTransactions.Control; import org.omg.CosTransactions.Current; import org.omg.CosTransactions.HeuristicHazard; diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/OTSResourceImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/OTSResourceImpl.java index d508bb457d8..07297ef720d 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/OTSResourceImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/OTSResourceImpl.java @@ -20,7 +20,6 @@ import com.sun.jts.codegen.jtsxa.OTSResource; import com.sun.jts.codegen.jtsxa.OTSResourceHelper; import com.sun.jts.codegen.jtsxa.OTSResourcePOA; -//import com.sun.jts.etsjdbc.odbc.NativeXAResourceImpl; import com.sun.jts.jta.TransactionState; import com.sun.jts.utils.LogFormatter; import com.sun.logging.LogDomains; @@ -52,10 +51,10 @@ import org.omg.CosTransactions.otid_t; import org.omg.PortableServer.POA; - /* An implementation of org.omg.CosTransactions.Resource to support +/** + * An implementation of org.omg.CosTransactions.Resource to support * X/Open XA compliant resource managers. */ - public class OTSResourceImpl extends OTSResourcePOA implements OTSResource { private static POA poa = null; diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/pi/IORInterceptorImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/pi/IORInterceptorImpl.java index acf61ba68c4..0fa9c10b61e 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/pi/IORInterceptorImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/pi/IORInterceptorImpl.java @@ -30,8 +30,8 @@ import org.omg.CosTransactions.OTSPolicy; import org.omg.CosTransactions.OTS_POLICY_TYPE; import org.omg.IOP.Codec; -import org.omg.IOP.TaggedComponent; import org.omg.IOP.CodecPackage.InvalidTypeForEncoding; +import org.omg.IOP.TaggedComponent; import org.omg.PortableInterceptor.IORInfo; import org.omg.PortableInterceptor.IORInterceptor; diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/pi/InterceptorImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/pi/InterceptorImpl.java index 3f4dc8914fc..3151866913e 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/pi/InterceptorImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/pi/InterceptorImpl.java @@ -57,11 +57,11 @@ import org.omg.CosTransactions.TransIdentity; import org.omg.CosTransactions.otid_t; import org.omg.IOP.Codec; -import org.omg.IOP.ServiceContext; -import org.omg.IOP.TaggedComponent; import org.omg.IOP.CodecPackage.FormatMismatch; import org.omg.IOP.CodecPackage.InvalidTypeForEncoding; import org.omg.IOP.CodecPackage.TypeMismatch; +import org.omg.IOP.ServiceContext; +import org.omg.IOP.TaggedComponent; import org.omg.PortableInterceptor.ClientRequestInfo; import org.omg.PortableInterceptor.ClientRequestInterceptor; import org.omg.PortableInterceptor.Current; diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/pi/ORBInitializerImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/pi/ORBInitializerImpl.java index 75311b2ee37..0634d494f44 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/pi/ORBInitializerImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/pi/ORBInitializerImpl.java @@ -27,15 +27,14 @@ import org.omg.CosTransactions.OTS_POLICY_TYPE; import org.omg.IOP.Codec; import org.omg.IOP.CodecFactory; +import org.omg.IOP.CodecFactoryPackage.UnknownEncoding; import org.omg.IOP.ENCODING_CDR_ENCAPS; import org.omg.IOP.Encoding; -import org.omg.IOP.CodecFactoryPackage.UnknownEncoding; import org.omg.PortableInterceptor.Current; import org.omg.PortableInterceptor.ORBInitInfo; -import org.omg.PortableInterceptor.ORBInitializer; import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName; -//import org.omg.CORBA.ORBPackage.InvalidName; import org.omg.PortableInterceptor.ORBInitInfoPackage.InvalidName; +import org.omg.PortableInterceptor.ORBInitializer; /** * This class implements the ORBInitializer for JTS. When an instance of this From 8ada3ca750ad134404cf5e5b65ef78a0bb800dd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 01:53:27 +0200 Subject: [PATCH 21/40] Imports: jdbc modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../admin/cli/CreateJdbcConnectionPool.java | 19 +++++--- .../jdbc/admin/cli/CreateJdbcResource.java | 1 + .../admin/cli/JDBCConnectionPoolManager.java | 37 +++++++++++++- .../admin/cli/ListJdbcConnectionPools.java | 21 ++++---- .../jdbc/admin/cli/ListJdbcResources.java | 24 ++++++++-- .../cli/internal/GetDatabaseVendorNames.java | 16 +++---- .../cli/internal/GetJdbcDriverClassNames.java | 16 ++++--- .../cli/internal/GetValidationClassNames.java | 20 ++++---- .../admin/cli/CreateJdbcResourceTest.java | 4 +- .../jdbc/admin/cli/ListJdbcResourcesTest.java | 4 +- .../config/ConcurrentModificationsTest.java | 4 +- .../JdbcConnectionPoolDefaultsTest.java | 4 +- .../JdbcConnectionPoolValidationTest.java | 8 ++-- .../JdbcConnectionPoolConstraint.java | 6 ++- .../JdbcConnectionPoolValidator.java | 8 ++-- .../gjc/common/DataSourceObjectBuilder.java | 36 +++++++------- .../gjc/spi/CPManagedConnectionFactory.java | 28 +++++------ .../gjc/spi/ConnectionRequestInfoImpl.java | 4 +- .../gjc/spi/DMManagedConnectionFactory.java | 42 ++++++++-------- .../gjc/spi/DSManagedConnectionFactory.java | 24 +++++----- .../com/sun/gjc/spi/JdbcObjectsFactory.java | 16 +++---- .../com/sun/gjc/spi/LocalTransactionImpl.java | 10 ++-- .../sun/gjc/spi/ManagedConnectionImpl.java | 48 +++++++++---------- .../spi/ManagedConnectionMetaDataImpl.java | 12 ++--- .../com/sun/gjc/spi/ResourceAdapterImpl.java | 16 +++---- .../gjc/spi/XAManagedConnectionFactory.java | 30 ++++++------ .../sun/gjc/spi/base/ConnectionHolder.java | 24 +++++----- .../gjc/spi/base/DatabaseMetaDataWrapper.java | 6 +-- .../spi/base/PreparedStatementWrapper.java | 4 +- .../sun/gjc/spi/base/ResultSetWrapper.java | 8 ++-- .../sun/gjc/spi/base/StatementWrapper.java | 14 +++--- .../spi/base/datastructure/CacheFactory.java | 14 +++--- .../base/datastructure/FIXEDCacheImpl.java | 4 +- .../java/com/sun/gjc/util/MethodExecutor.java | 12 ++--- .../java/com/sun/gjc/util/SQLTraceLogger.java | 4 +- .../java/com/sun/gjc/util/SecurityUtils.java | 16 +++---- .../jdbc40/CallableStatementWrapper40.java | 8 ++-- .../gjc/spi/jdbc40/ConnectionHolder40.java | 20 ++++---- .../gjc/spi/jdbc40/ConnectionWrapper40.java | 12 ++--- .../com/sun/gjc/spi/jdbc40/DataSource40.java | 16 +++---- .../spi/jdbc40/DatabaseMetaDataWrapper40.java | 8 ++-- .../gjc/spi/jdbc40/Jdbc40ObjectsFactory.java | 16 +++---- .../jdbc40/PreparedStatementWrapper40.java | 4 +- .../jdbc40/ProfiledConnectionWrapper40.java | 14 +++--- .../gjc/spi/jdbc40/ResultSetWrapper40.java | 12 ++--- .../gjc/spi/jdbc40/StatementWrapper40.java | 8 ++-- .../monitor/JdbcConnPoolAppProbeProvider.java | 4 +- .../monitor/JdbcConnPoolProbeProvider.java | 4 +- .../jdbcruntime/JdbcRuntimeExtension.java | 1 + .../jdbcruntime/service/JdbcDataSource.java | 1 + .../validation/ReferenceConstrainTest.java | 6 +-- 51 files changed, 383 insertions(+), 315 deletions(-) diff --git a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/CreateJdbcConnectionPool.java b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/CreateJdbcConnectionPool.java index 28ba431892d..a74eb3f8d85 100644 --- a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/CreateJdbcConnectionPool.java +++ b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/CreateJdbcConnectionPool.java @@ -20,19 +20,26 @@ import com.sun.enterprise.config.serverbeans.ServerTags; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + +import java.util.HashMap; +import java.util.Properties; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandRunner; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.hk2.api.PerLookup; -import org.glassfish.resources.admin.cli.ResourceConstants; import org.glassfish.resourcebase.resources.api.ResourceStatus; +import org.glassfish.resources.admin.cli.ResourceConstants; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import java.util.HashMap; -import java.util.Properties; - /** * Create JDBC Connection Pool Command * diff --git a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/CreateJdbcResource.java b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/CreateJdbcResource.java index 3c8d83700e7..245a1c9ca62 100644 --- a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/CreateJdbcResource.java +++ b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/CreateJdbcResource.java @@ -20,6 +20,7 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Resources; import com.sun.enterprise.util.LocalStringManagerImpl; + import jakarta.inject.Inject; import java.util.HashMap; diff --git a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/JDBCConnectionPoolManager.java b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/JDBCConnectionPoolManager.java index 8ade6df966b..09a03cda915 100644 --- a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/JDBCConnectionPoolManager.java +++ b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/JDBCConnectionPoolManager.java @@ -27,6 +27,7 @@ import com.sun.enterprise.util.LocalStringManagerImpl; import jakarta.resource.ResourceException; + import java.beans.PropertyVetoException; import java.util.Collection; import java.util.HashMap; @@ -45,7 +46,41 @@ import org.jvnet.hk2.config.TransactionFailure; import org.jvnet.hk2.config.types.Property; -import static org.glassfish.resources.admin.cli.ResourceConstants.*; +import static org.glassfish.resources.admin.cli.ResourceConstants.ALLOW_NON_COMPONENT_CALLERS; +import static org.glassfish.resources.admin.cli.ResourceConstants.ASSOCIATE_WITH_THREAD; +import static org.glassfish.resources.admin.cli.ResourceConstants.CONNECTION_CREATION_RETRY_ATTEMPTS; +import static org.glassfish.resources.admin.cli.ResourceConstants.CONNECTION_CREATION_RETRY_INTERVAL_IN_SECONDS; +import static org.glassfish.resources.admin.cli.ResourceConstants.CONNECTION_LEAK_RECLAIM; +import static org.glassfish.resources.admin.cli.ResourceConstants.CONNECTION_LEAK_TIMEOUT_IN_SECONDS; +import static org.glassfish.resources.admin.cli.ResourceConstants.CONNECTION_POOL_NAME; +import static org.glassfish.resources.admin.cli.ResourceConstants.CONNECTION_VALIDATION_METHOD; +import static org.glassfish.resources.admin.cli.ResourceConstants.DATASOURCE_CLASS; +import static org.glassfish.resources.admin.cli.ResourceConstants.DRIVER_CLASSNAME; +import static org.glassfish.resources.admin.cli.ResourceConstants.FAIL_ALL_CONNECTIONS; +import static org.glassfish.resources.admin.cli.ResourceConstants.IDLE_TIME_OUT_IN_SECONDS; +import static org.glassfish.resources.admin.cli.ResourceConstants.INIT_SQL; +import static org.glassfish.resources.admin.cli.ResourceConstants.IS_CONNECTION_VALIDATION_REQUIRED; +import static org.glassfish.resources.admin.cli.ResourceConstants.IS_ISOLATION_LEVEL_GUARANTEED; +import static org.glassfish.resources.admin.cli.ResourceConstants.LAZY_CONNECTION_ASSOCIATION; +import static org.glassfish.resources.admin.cli.ResourceConstants.LAZY_CONNECTION_ENLISTMENT; +import static org.glassfish.resources.admin.cli.ResourceConstants.MATCH_CONNECTIONS; +import static org.glassfish.resources.admin.cli.ResourceConstants.MAX_CONNECTION_USAGE_COUNT; +import static org.glassfish.resources.admin.cli.ResourceConstants.MAX_POOL_SIZE; +import static org.glassfish.resources.admin.cli.ResourceConstants.MAX_WAIT_TIME_IN_MILLIS; +import static org.glassfish.resources.admin.cli.ResourceConstants.NON_TRANSACTIONAL_CONNECTIONS; +import static org.glassfish.resources.admin.cli.ResourceConstants.PING; +import static org.glassfish.resources.admin.cli.ResourceConstants.POOLING; +import static org.glassfish.resources.admin.cli.ResourceConstants.POOL_SIZE_QUANTITY; +import static org.glassfish.resources.admin.cli.ResourceConstants.RES_TYPE; +import static org.glassfish.resources.admin.cli.ResourceConstants.SQL_TRACE_LISTENERS; +import static org.glassfish.resources.admin.cli.ResourceConstants.STATEMENT_CACHE_SIZE; +import static org.glassfish.resources.admin.cli.ResourceConstants.STATEMENT_TIMEOUT_IN_SECONDS; +import static org.glassfish.resources.admin.cli.ResourceConstants.STEADY_POOL_SIZE; +import static org.glassfish.resources.admin.cli.ResourceConstants.TRANS_ISOLATION_LEVEL; +import static org.glassfish.resources.admin.cli.ResourceConstants.VALIDATE_ATMOST_ONCE_PERIOD_IN_SECONDS; +import static org.glassfish.resources.admin.cli.ResourceConstants.VALIDATION_CLASSNAME; +import static org.glassfish.resources.admin.cli.ResourceConstants.VALIDATION_TABLE_NAME; +import static org.glassfish.resources.admin.cli.ResourceConstants.WRAP_JDBC_OBJECTS; /** diff --git a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/ListJdbcConnectionPools.java b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/ListJdbcConnectionPools.java index 6321e2c7e90..3bb3b311b4d 100644 --- a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/ListJdbcConnectionPools.java +++ b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/ListJdbcConnectionPools.java @@ -18,26 +18,27 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Resources; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + +import java.util.Collection; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.I18n; import org.glassfish.api.Param; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandLock; -import org.glassfish.api.I18n; -import org.glassfish.api.ActionReport; import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; -import org.jvnet.hk2.annotations.Service; - import org.glassfish.hk2.api.PerLookup; import org.glassfish.jdbc.config.JdbcConnectionPool; -import com.sun.enterprise.util.LocalStringManagerImpl; -import java.util.Collection; -import org.glassfish.api.admin.RestEndpoint; -import org.glassfish.api.admin.RestEndpoints; - -import jakarta.inject.Inject; +import org.jvnet.hk2.annotations.Service; /** * List JDBC Connection Pools command diff --git a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/ListJdbcResources.java b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/ListJdbcResources.java index c7237041580..c8e0e5626a7 100644 --- a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/ListJdbcResources.java +++ b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/ListJdbcResources.java @@ -16,13 +16,30 @@ package org.glassfish.jdbc.admin.cli; -import com.sun.enterprise.config.serverbeans.*; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Resources; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.api.naming.DefaultResourceProxy; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; @@ -32,9 +49,6 @@ import org.glassfish.resourcebase.resources.util.BindableResourcesHelper; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import java.util.*; - /** * List JDBC Resources command * diff --git a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetDatabaseVendorNames.java b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetDatabaseVendorNames.java index b314d88fdac..d38cf2fb67d 100644 --- a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetDatabaseVendorNames.java +++ b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetDatabaseVendorNames.java @@ -18,21 +18,21 @@ import com.sun.appserv.connectors.internal.api.ConnectorRuntime; import com.sun.enterprise.config.serverbeans.Resources; -import org.glassfish.api.ActionReport; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.admin.CommandLock; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.Properties; import java.util.Set; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; - -import jakarta.inject.Inject; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * @author Jagadish Ramu diff --git a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetJdbcDriverClassNames.java b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetJdbcDriverClassNames.java index e2e0d72d166..650dd7922a6 100644 --- a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetJdbcDriverClassNames.java +++ b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetJdbcDriverClassNames.java @@ -18,20 +18,22 @@ import com.sun.appserv.connectors.internal.api.ConnectorRuntime; import com.sun.enterprise.config.serverbeans.Resources; + +import jakarta.inject.Inject; + +import java.util.ArrayList; +import java.util.Properties; +import java.util.Set; + import org.glassfish.api.ActionReport; import org.glassfish.api.Param; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandLock; - -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; - -import java.util.*; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; - -import jakarta.inject.Inject; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * @author Jagadish Ramu diff --git a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetValidationClassNames.java b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetValidationClassNames.java index 41d5b82fb6a..93d7bfa4097 100644 --- a/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetValidationClassNames.java +++ b/appserver/jdbc/admin/src/main/java/org/glassfish/jdbc/admin/cli/internal/GetValidationClassNames.java @@ -17,23 +17,23 @@ package org.glassfish.jdbc.admin.cli.internal; import com.sun.enterprise.config.serverbeans.Resources; -import org.glassfish.jdbcruntime.service.JdbcAdminServiceImpl; -import org.glassfish.api.ActionReport; -import org.glassfish.api.Param; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.admin.CommandLock; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.Properties; import java.util.Set; + +import org.glassfish.api.ActionReport; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; import org.glassfish.api.admin.RestEndpoint; import org.glassfish.api.admin.RestEndpoints; - -import jakarta.inject.Inject; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.jdbcruntime.service.JdbcAdminServiceImpl; +import org.jvnet.hk2.annotations.Service; /** * @author Jagadish Ramu diff --git a/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/admin/cli/CreateJdbcResourceTest.java b/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/admin/cli/CreateJdbcResourceTest.java index 6aae9ea9fe3..f61f865eca8 100644 --- a/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/admin/cli/CreateJdbcResourceTest.java +++ b/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/admin/cli/CreateJdbcResourceTest.java @@ -27,6 +27,8 @@ import com.sun.enterprise.v3.common.PropsFileActionReporter; import com.sun.logging.LogDomains; +import jakarta.inject.Inject; + import java.util.logging.Logger; import javax.security.auth.Subject; @@ -48,8 +50,6 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/admin/cli/ListJdbcResourcesTest.java b/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/admin/cli/ListJdbcResourcesTest.java index e528ef1d0ba..64f0d3c09d0 100644 --- a/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/admin/cli/ListJdbcResourcesTest.java +++ b/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/admin/cli/ListJdbcResourcesTest.java @@ -22,6 +22,8 @@ import com.sun.enterprise.v3.common.PropsFileActionReporter; import com.sun.logging.LogDomains; +import jakarta.inject.Inject; + import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; @@ -42,8 +44,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import jakarta.inject.Inject; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/config/ConcurrentModificationsTest.java b/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/config/ConcurrentModificationsTest.java index e95a8a418f5..e529d6ffef6 100644 --- a/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/config/ConcurrentModificationsTest.java +++ b/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/config/ConcurrentModificationsTest.java @@ -21,6 +21,8 @@ import com.sun.enterprise.config.serverbeans.Resource; import com.sun.enterprise.config.serverbeans.Resources; +import jakarta.inject.Inject; + import java.util.List; import org.glassfish.hk2.api.ServiceLocator; @@ -31,8 +33,6 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/config/JdbcConnectionPoolDefaultsTest.java b/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/config/JdbcConnectionPoolDefaultsTest.java index cfd98cd1437..f003df65987 100644 --- a/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/config/JdbcConnectionPoolDefaultsTest.java +++ b/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/config/JdbcConnectionPoolDefaultsTest.java @@ -17,13 +17,13 @@ package org.glassfish.jdbc.config; +import jakarta.inject.Inject; + import org.glassfish.jdbc.admin.cli.test.JdbcAdminJunit5Extension; import org.glassfish.tests.utils.junit.DomainXml; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/config/JdbcConnectionPoolValidationTest.java b/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/config/JdbcConnectionPoolValidationTest.java index cba10733be4..36e2d8779c2 100644 --- a/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/config/JdbcConnectionPoolValidationTest.java +++ b/appserver/jdbc/admin/src/test/java/org/glassfish/jdbc/config/JdbcConnectionPoolValidationTest.java @@ -17,6 +17,10 @@ package org.glassfish.jdbc.config; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.validation.ConstraintViolationException; + import java.beans.PropertyVetoException; import org.glassfish.hk2.api.ServiceLocator; @@ -28,10 +32,6 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; -import jakarta.inject.Named; -import jakarta.validation.ConstraintViolationException; - import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/appserver/jdbc/jdbc-config/src/main/java/org/glassfish/jdbc/config/validators/JdbcConnectionPoolConstraint.java b/appserver/jdbc/jdbc-config/src/main/java/org/glassfish/jdbc/config/validators/JdbcConnectionPoolConstraint.java index 2133a5c1920..948d04dfac9 100644 --- a/appserver/jdbc/jdbc-config/src/main/java/org/glassfish/jdbc/config/validators/JdbcConnectionPoolConstraint.java +++ b/appserver/jdbc/jdbc-config/src/main/java/org/glassfish/jdbc/config/validators/JdbcConnectionPoolConstraint.java @@ -18,12 +18,16 @@ import jakarta.validation.Constraint; import jakarta.validation.Payload; + import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import org.glassfish.connectors.config.validators.ConnectionPoolErrorMessages; -import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; /** diff --git a/appserver/jdbc/jdbc-config/src/main/java/org/glassfish/jdbc/config/validators/JdbcConnectionPoolValidator.java b/appserver/jdbc/jdbc-config/src/main/java/org/glassfish/jdbc/config/validators/JdbcConnectionPoolValidator.java index 23d821a1391..419ee34c583 100644 --- a/appserver/jdbc/jdbc-config/src/main/java/org/glassfish/jdbc/config/validators/JdbcConnectionPoolValidator.java +++ b/appserver/jdbc/jdbc-config/src/main/java/org/glassfish/jdbc/config/validators/JdbcConnectionPoolValidator.java @@ -17,12 +17,14 @@ package org.glassfish.jdbc.config.validators; import com.sun.enterprise.config.serverbeans.ResourcePool; -import org.glassfish.config.support.Constants; -import org.glassfish.jdbc.config.JdbcConnectionPool; -import org.glassfish.connectors.config.validators.ConnectionPoolErrorMessages; + import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; +import org.glassfish.config.support.Constants; +import org.glassfish.connectors.config.validators.ConnectionPoolErrorMessages; +import org.glassfish.jdbc.config.JdbcConnectionPool; + /** * Implementation for Connection Pool validation. * Following validations are done : diff --git a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/common/DataSourceObjectBuilder.java b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/common/DataSourceObjectBuilder.java index 324d555acf4..b850c97d87c 100644 --- a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/common/DataSourceObjectBuilder.java +++ b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/common/DataSourceObjectBuilder.java @@ -17,6 +17,24 @@ package com.sun.gjc.common; +import com.sun.enterprise.util.i18n.StringManager; +import com.sun.gjc.util.MethodExecutor; +import com.sun.logging.LogDomains; + +import jakarta.resource.ResourceException; + +import java.io.Serializable; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.logging.Logger; + +import org.glassfish.internal.api.ClassLoaderHierarchy; +import org.glassfish.internal.api.Globals; + import static com.sun.gjc.common.DataSourceSpec.CLASSNAME; import static com.sun.gjc.common.DataSourceSpec.DATABASENAME; import static com.sun.gjc.common.DataSourceSpec.DATASOURCENAME; @@ -41,24 +59,6 @@ import static java.util.Arrays.asList; import static java.util.logging.Level.SEVERE; -import java.io.Serializable; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.logging.Logger; - -import org.glassfish.internal.api.ClassLoaderHierarchy; -import org.glassfish.internal.api.Globals; - -import com.sun.enterprise.util.i18n.StringManager; -import com.sun.gjc.util.MethodExecutor; -import com.sun.logging.LogDomains; - -import jakarta.resource.ResourceException; - /** * Utility class, which would create necessary Datasource object according to * the specification. diff --git a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/CPManagedConnectionFactory.java b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/CPManagedConnectionFactory.java index f8b2f6c19b0..92a650ce3ca 100644 --- a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/CPManagedConnectionFactory.java +++ b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/CPManagedConnectionFactory.java @@ -16,20 +16,6 @@ package com.sun.gjc.spi; -import static com.sun.gjc.util.SecurityUtils.getPasswordCredential; -import static java.util.logging.Level.FINEST; -import static java.util.logging.Level.SEVERE; - -import java.sql.Connection; -import java.sql.SQLException; -import java.util.logging.Level; -import java.util.logging.Logger; - -import javax.security.auth.Subject; -import javax.sql.ConnectionPoolDataSource; -import javax.sql.DataSource; -import javax.sql.PooledConnection; - import com.sun.enterprise.util.i18n.StringManager; import com.sun.gjc.common.DataSourceObjectBuilder; import com.sun.gjc.common.DataSourceSpec; @@ -44,6 +30,20 @@ import jakarta.resource.spi.ResourceAllocationException; import jakarta.resource.spi.security.PasswordCredential; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.security.auth.Subject; +import javax.sql.ConnectionPoolDataSource; +import javax.sql.DataSource; +import javax.sql.PooledConnection; + +import static com.sun.gjc.util.SecurityUtils.getPasswordCredential; +import static java.util.logging.Level.FINEST; +import static java.util.logging.Level.SEVERE; + /** * Connection Pool ManagedConnectionFactory implementation for Generic JDBC Connector. diff --git a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/ConnectionRequestInfoImpl.java b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/ConnectionRequestInfoImpl.java index 385cdbf245e..7f89ebf2179 100644 --- a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/ConnectionRequestInfoImpl.java +++ b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/ConnectionRequestInfoImpl.java @@ -16,10 +16,10 @@ package com.sun.gjc.spi; -import java.util.Arrays; - import jakarta.resource.spi.ConnectionRequestInfo; +import java.util.Arrays; + /** * ConnectionRequestInfo implementation for Generic JDBC Connector. * diff --git a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/DMManagedConnectionFactory.java b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/DMManagedConnectionFactory.java index feadb2c032b..3040ec6194b 100644 --- a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/DMManagedConnectionFactory.java +++ b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/DMManagedConnectionFactory.java @@ -17,27 +17,6 @@ package com.sun.gjc.spi; -import static com.sun.gjc.common.DataSourceSpec.CLASSNAME; -import static com.sun.gjc.common.DataSourceSpec.LOGINTIMEOUT; -import static com.sun.gjc.common.DataSourceSpec.PASSWORD; -import static com.sun.gjc.common.DataSourceSpec.URL; -import static com.sun.gjc.common.DataSourceSpec.USERNAME; -import static com.sun.gjc.util.SecurityUtils.getPasswordCredential; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.FINEST; -import static java.util.logging.Level.SEVERE; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.logging.Logger; - -import javax.security.auth.Subject; -import javax.sql.DataSource; - import com.sun.gjc.common.DataSourceObjectBuilder; import com.sun.gjc.spi.base.AbstractDataSource; import com.sun.gjc.spi.base.ConnectionHolder; @@ -51,6 +30,27 @@ import jakarta.resource.spi.ResourceAllocationException; import jakarta.resource.spi.security.PasswordCredential; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.logging.Logger; + +import javax.security.auth.Subject; +import javax.sql.DataSource; + +import static com.sun.gjc.common.DataSourceSpec.CLASSNAME; +import static com.sun.gjc.common.DataSourceSpec.LOGINTIMEOUT; +import static com.sun.gjc.common.DataSourceSpec.PASSWORD; +import static com.sun.gjc.common.DataSourceSpec.URL; +import static com.sun.gjc.common.DataSourceSpec.USERNAME; +import static com.sun.gjc.util.SecurityUtils.getPasswordCredential; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.FINEST; +import static java.util.logging.Level.SEVERE; + /** * Driver Manager ManagedConnectionFactory implementation for * Generic JDBC Connector. diff --git a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/DSManagedConnectionFactory.java b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/DSManagedConnectionFactory.java index 90cc252b68d..483560fdfca 100644 --- a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/DSManagedConnectionFactory.java +++ b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/DSManagedConnectionFactory.java @@ -16,18 +16,6 @@ package com.sun.gjc.spi; -import static com.sun.gjc.util.SecurityUtils.getPasswordCredential; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.FINEST; -import static java.util.logging.Level.SEVERE; - -import java.sql.Connection; -import java.sql.SQLException; -import java.util.logging.Logger; - -import javax.security.auth.Subject; -import javax.sql.DataSource; - import com.sun.enterprise.util.i18n.StringManager; import com.sun.gjc.common.DataSourceObjectBuilder; import com.sun.gjc.spi.base.AbstractDataSource; @@ -41,6 +29,18 @@ import jakarta.resource.spi.ResourceAllocationException; import jakarta.resource.spi.security.PasswordCredential; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.logging.Logger; + +import javax.security.auth.Subject; +import javax.sql.DataSource; + +import static com.sun.gjc.util.SecurityUtils.getPasswordCredential; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.FINEST; +import static java.util.logging.Level.SEVERE; + /** * Data Source ManagedConnectionFactory implementation for Generic JDBC Connector. * diff --git a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/JdbcObjectsFactory.java b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/JdbcObjectsFactory.java index d65144f0f9b..3db381b569b 100644 --- a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/JdbcObjectsFactory.java +++ b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/JdbcObjectsFactory.java @@ -17,8 +17,12 @@ package com.sun.gjc.spi; -import static java.util.logging.Level.SEVERE; -import static java.util.logging.Level.WARNING; +import com.sun.gjc.spi.base.ConnectionHolder; +import com.sun.gjc.util.SQLTraceDelegator; +import com.sun.logging.LogDomains; + +import jakarta.resource.spi.ConnectionManager; +import jakarta.resource.spi.ConnectionRequestInfo; import java.io.Serializable; import java.lang.reflect.InvocationHandler; @@ -31,12 +35,8 @@ import org.glassfish.api.jdbc.SQLTraceRecord; -import com.sun.gjc.spi.base.ConnectionHolder; -import com.sun.gjc.util.SQLTraceDelegator; -import com.sun.logging.LogDomains; - -import jakarta.resource.spi.ConnectionManager; -import jakarta.resource.spi.ConnectionRequestInfo; +import static java.util.logging.Level.SEVERE; +import static java.util.logging.Level.WARNING; /** * Factory to create JDBC objects diff --git a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/LocalTransactionImpl.java b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/LocalTransactionImpl.java index f3501ebf892..382fc9832ff 100644 --- a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/LocalTransactionImpl.java +++ b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/LocalTransactionImpl.java @@ -16,16 +16,16 @@ package com.sun.gjc.spi; -import static java.util.logging.Level.FINEST; - -import java.sql.SQLException; -import java.util.logging.Logger; - import com.sun.logging.LogDomains; import jakarta.resource.ResourceException; import jakarta.resource.spi.LocalTransactionException; +import java.sql.SQLException; +import java.util.logging.Logger; + +import static java.util.logging.Level.FINEST; + /** * LocalTransactionImpl implementation for Generic JDBC Connector. * diff --git a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/ManagedConnectionImpl.java b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/ManagedConnectionImpl.java index 1ba41537381..4cae1c32d60 100644 --- a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/ManagedConnectionImpl.java +++ b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/ManagedConnectionImpl.java @@ -16,30 +16,6 @@ package com.sun.gjc.spi; -import static jakarta.resource.spi.ConnectionEvent.CONNECTION_ERROR_OCCURRED; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.INFO; -import static java.util.logging.Level.WARNING; - -import java.io.PrintWriter; -import java.sql.CallableStatement; -import java.sql.Connection; -import java.sql.DatabaseMetaData; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.NoSuchElementException; -import java.util.Set; -import java.util.logging.Logger; - -import javax.security.auth.Subject; -import javax.sql.PooledConnection; -import javax.sql.XAConnection; -import javax.transaction.xa.XAResource; - -import org.glassfish.resourcebase.resources.api.PoolInfo; - import com.sun.appserv.connectors.internal.spi.BadConnectionEventListener; import com.sun.enterprise.util.i18n.StringManager; import com.sun.gjc.common.DataSourceObjectBuilder; @@ -66,6 +42,30 @@ import jakarta.resource.spi.ManagedConnectionMetaData; import jakarta.resource.spi.security.PasswordCredential; +import java.io.PrintWriter; +import java.sql.CallableStatement; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.NoSuchElementException; +import java.util.Set; +import java.util.logging.Logger; + +import javax.security.auth.Subject; +import javax.sql.PooledConnection; +import javax.sql.XAConnection; +import javax.transaction.xa.XAResource; + +import org.glassfish.resourcebase.resources.api.PoolInfo; + +import static jakarta.resource.spi.ConnectionEvent.CONNECTION_ERROR_OCCURRED; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.INFO; +import static java.util.logging.Level.WARNING; + /** * ManagedConnection implementation for Generic JDBC Connector. * diff --git a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/ManagedConnectionMetaDataImpl.java b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/ManagedConnectionMetaDataImpl.java index f12cd204a90..aa13c569de8 100644 --- a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/ManagedConnectionMetaDataImpl.java +++ b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/ManagedConnectionMetaDataImpl.java @@ -16,18 +16,18 @@ package com.sun.gjc.spi; -import static java.util.logging.Level.SEVERE; - -import java.sql.DatabaseMetaData; -import java.sql.SQLException; -import java.util.logging.Logger; - import com.sun.logging.LogDomains; import jakarta.resource.ResourceException; import jakarta.resource.spi.ManagedConnectionMetaData; import jakarta.resource.spi.security.PasswordCredential; +import java.sql.DatabaseMetaData; +import java.sql.SQLException; +import java.util.logging.Logger; + +import static java.util.logging.Level.SEVERE; + /** * ManagedConnectionMetaData implementation for Generic JDBC * Connector. diff --git a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/ResourceAdapterImpl.java b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/ResourceAdapterImpl.java index 4cf1148763e..62f2f54e868 100644 --- a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/ResourceAdapterImpl.java +++ b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/ResourceAdapterImpl.java @@ -16,14 +16,6 @@ package com.sun.gjc.spi; -import static jakarta.resource.spi.AuthenticationMechanism.CredentialInterface.PasswordCredential; -import static java.util.logging.Level.SEVERE; - -import java.util.Timer; -import java.util.logging.Logger; - -import javax.transaction.xa.XAResource; - import com.sun.logging.LogDomains; import jakarta.resource.NotSupportedException; @@ -35,6 +27,14 @@ import jakarta.resource.spi.UnavailableException; import jakarta.resource.spi.endpoint.MessageEndpointFactory; +import java.util.Timer; +import java.util.logging.Logger; + +import javax.transaction.xa.XAResource; + +import static jakarta.resource.spi.AuthenticationMechanism.CredentialInterface.PasswordCredential; +import static java.util.logging.Level.SEVERE; + /** * ResourceAdapterImpl implementation for Generic JDBC Connector. * diff --git a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/XAManagedConnectionFactory.java b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/XAManagedConnectionFactory.java index 814239b1a70..56ad7543221 100644 --- a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/XAManagedConnectionFactory.java +++ b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/XAManagedConnectionFactory.java @@ -16,21 +16,6 @@ package com.sun.gjc.spi; -import static com.sun.gjc.spi.ManagedConnectionImpl.ISXACONNECTION; -import static com.sun.gjc.util.SecurityUtils.getPasswordCredential; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.FINEST; -import static java.util.logging.Level.SEVERE; - -import java.sql.Connection; -import java.sql.SQLException; -import java.util.logging.Logger; - -import javax.security.auth.Subject; -import javax.sql.DataSource; -import javax.sql.XAConnection; -import javax.sql.XADataSource; - import com.sun.enterprise.util.i18n.StringManager; import com.sun.gjc.common.DataSourceObjectBuilder; import com.sun.gjc.common.DataSourceSpec; @@ -45,6 +30,21 @@ import jakarta.resource.spi.ResourceAllocationException; import jakarta.resource.spi.security.PasswordCredential; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.logging.Logger; + +import javax.security.auth.Subject; +import javax.sql.DataSource; +import javax.sql.XAConnection; +import javax.sql.XADataSource; + +import static com.sun.gjc.spi.ManagedConnectionImpl.ISXACONNECTION; +import static com.sun.gjc.util.SecurityUtils.getPasswordCredential; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.FINEST; +import static java.util.logging.Level.SEVERE; + /** * XA ManagedConnectionFactory implementation for Generic JDBC * Connector. diff --git a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/ConnectionHolder.java b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/ConnectionHolder.java index f110bab0aed..92f5dbde5b2 100644 --- a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/ConnectionHolder.java +++ b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/ConnectionHolder.java @@ -16,18 +16,6 @@ package com.sun.gjc.spi.base; -import java.sql.CallableStatement; -import java.sql.Connection; -import java.sql.DatabaseMetaData; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.SQLWarning; -import java.sql.Savepoint; -import java.sql.Statement; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; - import com.sun.enterprise.util.i18n.StringManager; import com.sun.gjc.common.DataSourceObjectBuilder; import com.sun.gjc.spi.ManagedConnectionImpl; @@ -40,6 +28,18 @@ import jakarta.resource.spi.LazyEnlistableConnectionManager; import jakarta.resource.spi.ManagedConnectionFactory; +import java.sql.CallableStatement; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.SQLWarning; +import java.sql.Savepoint; +import java.sql.Statement; +import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; + /** * Holds the java.sql.Connection object, which is to be passed to the * application program. diff --git a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/DatabaseMetaDataWrapper.java b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/DatabaseMetaDataWrapper.java index f9f56fe3f53..7a8fd868dd5 100644 --- a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/DatabaseMetaDataWrapper.java +++ b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/DatabaseMetaDataWrapper.java @@ -16,15 +16,15 @@ package com.sun.gjc.spi.base; +import com.sun.gjc.util.MethodExecutor; +import com.sun.logging.LogDomains; + import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.ResultSet; import java.sql.SQLException; import java.util.logging.Logger; -import com.sun.gjc.util.MethodExecutor; -import com.sun.logging.LogDomains; - /** * Abstract class for wrapping DatabaseMetaData
      */ diff --git a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/PreparedStatementWrapper.java b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/PreparedStatementWrapper.java index cb8a529073c..df5895a91cd 100644 --- a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/PreparedStatementWrapper.java +++ b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/PreparedStatementWrapper.java @@ -18,6 +18,8 @@ package com.sun.gjc.spi.base; +import com.sun.gjc.util.ResultSetClosedEventListener; + import java.io.InputStream; import java.io.Reader; import java.math.BigDecimal; @@ -37,8 +39,6 @@ import java.util.Calendar; import java.util.logging.Level; -import com.sun.gjc.util.ResultSetClosedEventListener; - /** * Abstract class for wrapping PreparedStatement
      */ diff --git a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/ResultSetWrapper.java b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/ResultSetWrapper.java index 23c0e314109..89bfd8c3961 100644 --- a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/ResultSetWrapper.java +++ b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/ResultSetWrapper.java @@ -16,6 +16,10 @@ package com.sun.gjc.spi.base; +import com.sun.gjc.util.MethodExecutor; +import com.sun.gjc.util.ResultSetClosedEventListener; +import com.sun.logging.LogDomains; + import java.io.InputStream; import java.io.Reader; import java.math.BigDecimal; @@ -36,10 +40,6 @@ import java.util.Map; import java.util.logging.Logger; -import com.sun.gjc.util.MethodExecutor; -import com.sun.gjc.util.ResultSetClosedEventListener; -import com.sun.logging.LogDomains; - /** * Abstract class for ResultSet Wrapper
      */ diff --git a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/StatementWrapper.java b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/StatementWrapper.java index a81f81e4d61..10fbf4f73e3 100644 --- a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/StatementWrapper.java +++ b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/StatementWrapper.java @@ -17,6 +17,13 @@ package com.sun.gjc.spi.base; +import com.sun.gjc.util.MethodExecutor; +import com.sun.gjc.util.StatementLeakDetector; +import com.sun.gjc.util.StatementLeakListener; +import com.sun.logging.LogDomains; + +import jakarta.resource.ResourceException; + import java.sql.CallableStatement; import java.sql.Connection; import java.sql.PreparedStatement; @@ -27,13 +34,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.gjc.util.MethodExecutor; -import com.sun.gjc.util.StatementLeakDetector; -import com.sun.gjc.util.StatementLeakListener; -import com.sun.logging.LogDomains; - -import jakarta.resource.ResourceException; - /** * Abstract class for wrapping Statement
      */ diff --git a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/datastructure/CacheFactory.java b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/datastructure/CacheFactory.java index 6cecdc3459d..9981b2988b4 100644 --- a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/datastructure/CacheFactory.java +++ b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/datastructure/CacheFactory.java @@ -16,8 +16,11 @@ package com.sun.gjc.spi.base.datastructure; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.WARNING; +import com.sun.enterprise.util.i18n.StringManager; +import com.sun.gjc.common.DataSourceObjectBuilder; +import com.sun.logging.LogDomains; + +import jakarta.resource.ResourceException; import java.security.AccessController; import java.security.PrivilegedAction; @@ -25,11 +28,8 @@ import org.glassfish.resourcebase.resources.api.PoolInfo; -import com.sun.enterprise.util.i18n.StringManager; -import com.sun.gjc.common.DataSourceObjectBuilder; -import com.sun.logging.LogDomains; - -import jakarta.resource.ResourceException; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.WARNING; /** * Creates an appropriate statement cache datastructure used in the Resource diff --git a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/datastructure/FIXEDCacheImpl.java b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/datastructure/FIXEDCacheImpl.java index 20696a11771..93f11fda0b1 100644 --- a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/datastructure/FIXEDCacheImpl.java +++ b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/spi/base/datastructure/FIXEDCacheImpl.java @@ -16,11 +16,11 @@ package com.sun.gjc.spi.base.datastructure; -import org.glassfish.resourcebase.resources.api.PoolInfo; - import com.sun.gjc.spi.base.CacheObjectKey; import com.sun.gjc.spi.base.PreparedStatementWrapper; +import org.glassfish.resourcebase.resources.api.PoolInfo; + /** * This ia a FIXED size cache implementation. *

      diff --git a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/util/MethodExecutor.java b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/util/MethodExecutor.java index c7d79513993..6ed9513a057 100644 --- a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/util/MethodExecutor.java +++ b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/util/MethodExecutor.java @@ -17,7 +17,11 @@ package com.sun.gjc.util; -import static java.util.logging.Level.FINEST; +import com.sun.enterprise.util.i18n.StringManager; +import com.sun.gjc.common.DataSourceObjectBuilder; +import com.sun.logging.LogDomains; + +import jakarta.resource.ResourceException; import java.io.IOException; import java.io.Serializable; @@ -34,11 +38,7 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.util.i18n.StringManager; -import com.sun.gjc.common.DataSourceObjectBuilder; -import com.sun.logging.LogDomains; - -import jakarta.resource.ResourceException; +import static java.util.logging.Level.FINEST; /** * Execute the methods based on the parameters. diff --git a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/util/SQLTraceLogger.java b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/util/SQLTraceLogger.java index f70cce8fe77..ce8d32a3aaa 100644 --- a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/util/SQLTraceLogger.java +++ b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/util/SQLTraceLogger.java @@ -16,14 +16,14 @@ package com.sun.gjc.util; +import com.sun.logging.LogDomains; + import java.util.logging.Level; import java.util.logging.Logger; import org.glassfish.api.jdbc.SQLTraceListener; import org.glassfish.api.jdbc.SQLTraceRecord; -import com.sun.logging.LogDomains; - /** * Implementation of SQLTraceListener to listen to events related to a sql * record tracing. diff --git a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/util/SecurityUtils.java b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/util/SecurityUtils.java index 39966fbb4ee..ec91ff7fbf3 100644 --- a/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/util/SecurityUtils.java +++ b/appserver/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/util/SecurityUtils.java @@ -16,14 +16,6 @@ package com.sun.gjc.util; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.util.Arrays; -import java.util.Iterator; -import java.util.Set; - -import javax.security.auth.Subject; - import com.sun.enterprise.util.i18n.StringManager; import com.sun.gjc.common.DataSourceObjectBuilder; import com.sun.gjc.spi.ConnectionRequestInfoImpl; @@ -33,6 +25,14 @@ import jakarta.resource.spi.ManagedConnectionFactory; import jakarta.resource.spi.security.PasswordCredential; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.Arrays; +import java.util.Iterator; +import java.util.Set; + +import javax.security.auth.Subject; + /** * SecurityUtils for Generic JDBC Connector. * diff --git a/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/CallableStatementWrapper40.java b/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/CallableStatementWrapper40.java index 19b7a4f7918..d20d81e0b53 100644 --- a/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/CallableStatementWrapper40.java +++ b/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/CallableStatementWrapper40.java @@ -17,7 +17,9 @@ package com.sun.gjc.spi.jdbc40; -import static java.util.logging.Level.SEVERE; +import com.sun.gjc.spi.base.CallableStatementWrapper; + +import jakarta.resource.ResourceException; import java.io.InputStream; import java.io.Reader; @@ -32,9 +34,7 @@ import java.sql.SQLFeatureNotSupportedException; import java.sql.SQLXML; -import com.sun.gjc.spi.base.CallableStatementWrapper; - -import jakarta.resource.ResourceException; +import static java.util.logging.Level.SEVERE; /** * Wrapper for JDBC 4.0 CallableStatement diff --git a/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/ConnectionHolder40.java b/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/ConnectionHolder40.java index 3390a5e1da0..1cb62e40bd4 100644 --- a/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/ConnectionHolder40.java +++ b/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/ConnectionHolder40.java @@ -17,9 +17,13 @@ package com.sun.gjc.spi.jdbc40; -import static java.util.logging.Level.FINE; -import static java.util.logging.Level.FINEST; -import static java.util.logging.Level.SEVERE; +import com.sun.enterprise.util.i18n.StringManager; +import com.sun.gjc.spi.ManagedConnectionFactoryImpl; +import com.sun.gjc.spi.ManagedConnectionImpl; +import com.sun.gjc.spi.base.ConnectionHolder; + +import jakarta.resource.ResourceException; +import jakarta.resource.spi.ConnectionRequestInfo; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; @@ -38,13 +42,9 @@ import java.util.Properties; import java.util.concurrent.Executor; -import com.sun.enterprise.util.i18n.StringManager; -import com.sun.gjc.spi.ManagedConnectionFactoryImpl; -import com.sun.gjc.spi.ManagedConnectionImpl; -import com.sun.gjc.spi.base.ConnectionHolder; - -import jakarta.resource.ResourceException; -import jakarta.resource.spi.ConnectionRequestInfo; +import static java.util.logging.Level.FINE; +import static java.util.logging.Level.FINEST; +import static java.util.logging.Level.SEVERE; /** * Holds the java.sql.Connection object, which is to be passed to the diff --git a/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/ConnectionWrapper40.java b/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/ConnectionWrapper40.java index a3371636f03..13eea268c9e 100644 --- a/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/ConnectionWrapper40.java +++ b/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/ConnectionWrapper40.java @@ -16,8 +16,10 @@ package com.sun.gjc.spi.jdbc40; -import static java.sql.ResultSet.CONCUR_READ_ONLY; -import static java.sql.ResultSet.TYPE_FORWARD_ONLY; +import com.sun.gjc.spi.ManagedConnectionImpl; +import com.sun.gjc.spi.base.ConnectionWrapper; + +import jakarta.resource.spi.ConnectionRequestInfo; import java.sql.CallableStatement; import java.sql.Connection; @@ -26,10 +28,8 @@ import java.sql.SQLException; import java.sql.Statement; -import com.sun.gjc.spi.ManagedConnectionImpl; -import com.sun.gjc.spi.base.ConnectionWrapper; - -import jakarta.resource.spi.ConnectionRequestInfo; +import static java.sql.ResultSet.CONCUR_READ_ONLY; +import static java.sql.ResultSet.TYPE_FORWARD_ONLY; /** * Wrapper class that aids to provide wrapper for the following JDBC objects : diff --git a/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/DataSource40.java b/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/DataSource40.java index 7a43fb9c04f..bf3355bc03a 100644 --- a/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/DataSource40.java +++ b/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/DataSource40.java @@ -17,14 +17,6 @@ package com.sun.gjc.spi.jdbc40; -import static java.util.logging.Level.SEVERE; -import static java.util.logging.Level.WARNING; - -import java.sql.SQLException; -import java.sql.SQLFeatureNotSupportedException; -import java.sql.Wrapper; -import java.util.logging.Logger; - import com.sun.enterprise.util.i18n.StringManager; import com.sun.gjc.spi.ManagedConnectionFactoryImpl; import com.sun.gjc.spi.base.AbstractDataSource; @@ -32,6 +24,14 @@ import jakarta.resource.ResourceException; import jakarta.resource.spi.ConnectionManager; +import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; +import java.sql.Wrapper; +import java.util.logging.Logger; + +import static java.util.logging.Level.SEVERE; +import static java.util.logging.Level.WARNING; + /** * Holds the java.sql.Connection object, which is to be passed to * the application program. diff --git a/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/DatabaseMetaDataWrapper40.java b/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/DatabaseMetaDataWrapper40.java index cc33230ba41..6c3d283e926 100644 --- a/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/DatabaseMetaDataWrapper40.java +++ b/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/DatabaseMetaDataWrapper40.java @@ -17,6 +17,10 @@ package com.sun.gjc.spi.jdbc40; +import com.sun.gjc.spi.base.DatabaseMetaDataWrapper; + +import jakarta.resource.ResourceException; + import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.ResultSet; @@ -24,10 +28,6 @@ import java.sql.SQLException; import java.util.logging.Level; -import com.sun.gjc.spi.base.DatabaseMetaDataWrapper; - -import jakarta.resource.ResourceException; - /** * Wrapper class for DatabaseMetaData for JDBC 4.0
      */ diff --git a/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/Jdbc40ObjectsFactory.java b/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/Jdbc40ObjectsFactory.java index 860d2306dfb..16538c8aca1 100644 --- a/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/Jdbc40ObjectsFactory.java +++ b/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/Jdbc40ObjectsFactory.java @@ -16,14 +16,6 @@ package com.sun.gjc.spi.jdbc40; -import static java.lang.reflect.Modifier.isAbstract; - -import java.lang.reflect.Method; -import java.sql.Connection; -import java.util.logging.Level; - -import javax.sql.DataSource; - import com.sun.gjc.spi.JdbcObjectsFactory; import com.sun.gjc.spi.ManagedConnectionFactoryImpl; import com.sun.gjc.spi.ManagedConnectionImpl; @@ -32,6 +24,14 @@ import jakarta.resource.spi.ConnectionManager; +import java.lang.reflect.Method; +import java.sql.Connection; +import java.util.logging.Level; + +import javax.sql.DataSource; + +import static java.lang.reflect.Modifier.isAbstract; + /** * Factory to create jdbc40 connection & datasource */ diff --git a/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/PreparedStatementWrapper40.java b/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/PreparedStatementWrapper40.java index 84f1fb96e16..7885b0a7b94 100644 --- a/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/PreparedStatementWrapper40.java +++ b/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/PreparedStatementWrapper40.java @@ -16,6 +16,8 @@ package com.sun.gjc.spi.jdbc40; +import com.sun.gjc.spi.base.PreparedStatementWrapper; + import java.io.InputStream; import java.io.Reader; import java.sql.Connection; @@ -27,8 +29,6 @@ import java.sql.SQLFeatureNotSupportedException; import java.sql.SQLXML; -import com.sun.gjc.spi.base.PreparedStatementWrapper; - /** * Wrapper for JDBC 4.0 PreparedStatement */ diff --git a/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/ProfiledConnectionWrapper40.java b/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/ProfiledConnectionWrapper40.java index 3a1d2224639..568231ac8dc 100644 --- a/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/ProfiledConnectionWrapper40.java +++ b/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/ProfiledConnectionWrapper40.java @@ -16,8 +16,11 @@ package com.sun.gjc.spi.jdbc40; -import static java.sql.ResultSet.CONCUR_READ_ONLY; -import static java.sql.ResultSet.TYPE_FORWARD_ONLY; +import com.sun.gjc.spi.ManagedConnectionImpl; +import com.sun.gjc.spi.base.ConnectionWrapper; +import com.sun.gjc.util.SQLTraceDelegator; + +import jakarta.resource.spi.ConnectionRequestInfo; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; @@ -31,11 +34,8 @@ import org.glassfish.api.jdbc.SQLTraceRecord; -import com.sun.gjc.spi.ManagedConnectionImpl; -import com.sun.gjc.spi.base.ConnectionWrapper; -import com.sun.gjc.util.SQLTraceDelegator; - -import jakarta.resource.spi.ConnectionRequestInfo; +import static java.sql.ResultSet.CONCUR_READ_ONLY; +import static java.sql.ResultSet.TYPE_FORWARD_ONLY; /** * Wrapper class that aids to provide wrapper for Statement, PreparedStatement, diff --git a/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/ResultSetWrapper40.java b/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/ResultSetWrapper40.java index a42af0844c7..8ae2a09f575 100644 --- a/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/ResultSetWrapper40.java +++ b/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/ResultSetWrapper40.java @@ -17,7 +17,11 @@ package com.sun.gjc.spi.jdbc40; -import static java.util.logging.Level.SEVERE; +import com.sun.enterprise.util.i18n.StringManager; +import com.sun.gjc.spi.ManagedConnectionFactoryImpl; +import com.sun.gjc.spi.base.ResultSetWrapper; + +import jakarta.resource.ResourceException; import java.io.InputStream; import java.io.Reader; @@ -29,11 +33,7 @@ import java.sql.SQLXML; import java.sql.Statement; -import com.sun.enterprise.util.i18n.StringManager; -import com.sun.gjc.spi.ManagedConnectionFactoryImpl; -import com.sun.gjc.spi.base.ResultSetWrapper; - -import jakarta.resource.ResourceException; +import static java.util.logging.Level.SEVERE; /** * Wrapper for ResultSet diff --git a/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/StatementWrapper40.java b/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/StatementWrapper40.java index 0be14f17e5f..2578cc779b1 100644 --- a/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/StatementWrapper40.java +++ b/appserver/jdbc/jdbc-ra/jdbc40/src/main/java/com/sun/gjc/spi/jdbc40/StatementWrapper40.java @@ -16,15 +16,15 @@ package com.sun.gjc.spi.jdbc40; +import com.sun.enterprise.util.i18n.StringManager; +import com.sun.gjc.spi.ManagedConnectionFactoryImpl; +import com.sun.gjc.spi.base.StatementWrapper; + import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import com.sun.enterprise.util.i18n.StringManager; -import com.sun.gjc.spi.ManagedConnectionFactoryImpl; -import com.sun.gjc.spi.base.StatementWrapper; - /** * Wrapper for JDBC 4.0 Statement */ diff --git a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/pool/monitor/JdbcConnPoolAppProbeProvider.java b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/pool/monitor/JdbcConnPoolAppProbeProvider.java index 61a210be852..a187bf603fc 100644 --- a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/pool/monitor/JdbcConnPoolAppProbeProvider.java +++ b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/pool/monitor/JdbcConnPoolAppProbeProvider.java @@ -16,12 +16,12 @@ package org.glassfish.jdbc.pool.monitor; +import com.sun.enterprise.resource.pool.monitor.ConnectionPoolAppProbeProvider; + import org.glassfish.external.probe.provider.annotations.Probe; import org.glassfish.external.probe.provider.annotations.ProbeParam; import org.glassfish.external.probe.provider.annotations.ProbeProvider; -import com.sun.enterprise.resource.pool.monitor.ConnectionPoolAppProbeProvider; - /** * Probe provider interface for JDBC connection pool related events to provide * information related to the various objects on jdbc pool monitoring grouped by diff --git a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/pool/monitor/JdbcConnPoolProbeProvider.java b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/pool/monitor/JdbcConnPoolProbeProvider.java index 5dac526d315..639e5ae49eb 100644 --- a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/pool/monitor/JdbcConnPoolProbeProvider.java +++ b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/pool/monitor/JdbcConnPoolProbeProvider.java @@ -16,12 +16,12 @@ package org.glassfish.jdbc.pool.monitor; +import com.sun.enterprise.resource.pool.monitor.ConnectionPoolProbeProvider; + import org.glassfish.external.probe.provider.annotations.Probe; import org.glassfish.external.probe.provider.annotations.ProbeParam; import org.glassfish.external.probe.provider.annotations.ProbeProvider; -import com.sun.enterprise.resource.pool.monitor.ConnectionPoolProbeProvider; - /** * Probe provider interface for JDBC connection pool related events to provide * information related to the various objects on jdbc pool monitoring. diff --git a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/JdbcRuntimeExtension.java b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/JdbcRuntimeExtension.java index 1acf33ad074..9c03a13a240 100644 --- a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/JdbcRuntimeExtension.java +++ b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/JdbcRuntimeExtension.java @@ -31,6 +31,7 @@ import jakarta.inject.Inject; import jakarta.inject.Provider; + import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/service/JdbcDataSource.java b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/service/JdbcDataSource.java index b6ad96076b8..7f10fd44ca1 100644 --- a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/service/JdbcDataSource.java +++ b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbcruntime/service/JdbcDataSource.java @@ -20,6 +20,7 @@ import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; import com.sun.enterprise.connectors.ConnectorRuntime; import com.sun.enterprise.connectors.util.ResourcesUtil; + import java.io.PrintWriter; import java.sql.Connection; import java.sql.SQLException; diff --git a/appserver/jdbc/jdbc-runtime/src/test/java/org/glassfish/jdbcruntime/config/validation/ReferenceConstrainTest.java b/appserver/jdbc/jdbc-runtime/src/test/java/org/glassfish/jdbcruntime/config/validation/ReferenceConstrainTest.java index 30fa0186d62..11a959a92b0 100644 --- a/appserver/jdbc/jdbc-runtime/src/test/java/org/glassfish/jdbcruntime/config/validation/ReferenceConstrainTest.java +++ b/appserver/jdbc/jdbc-runtime/src/test/java/org/glassfish/jdbcruntime/config/validation/ReferenceConstrainTest.java @@ -19,6 +19,9 @@ import com.sun.enterprise.config.serverbeans.Domain; +import jakarta.inject.Inject; +import jakarta.validation.ConstraintViolationException; + import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -34,9 +37,6 @@ import org.jvnet.hk2.config.Dom; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; -import jakarta.validation.ConstraintViolationException; - import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; From 6e119e292439259121ba50a40e95e323e060613d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 02:07:02 +0200 Subject: [PATCH 22/40] Imports: loadbalancer modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../admin/cli/ApplyHttpLbChanges.java | 29 +++++----- .../admin/cli/ConfigureLBWeightCommand.java | 32 ++++++----- .../cli/CreateHTTPHealthCheckerCommand.java | 49 +++++++++-------- .../admin/cli/CreateHTTPLBRefCommand.java | 53 ++++++++++--------- .../cli/CreateHTTPLoadBalancerCommand.java | 51 ++++++++++-------- .../cli/DeleteHTTPHealthCheckerCommand.java | 46 ++++++++-------- .../admin/cli/DeleteHTTPLBRefCommand.java | 48 +++++++++-------- .../cli/DisableHTTPLBApplicationCommand.java | 36 ++++++++----- .../admin/cli/DisableHTTPLBServerCommand.java | 34 ++++++------ .../cli/EnableHTTPLBApplicationCommand.java | 36 ++++++++----- .../admin/cli/EnableHTTPLBServerCommand.java | 32 +++++------ .../admin/cli/ExportHttpLbConfig.java | 39 ++++++-------- .../admin/cli/LBCommandsBase.java | 26 ++++----- .../loadbalancer/admin/cli/LbLogUtil.java | 1 + .../admin/cli/ListLBConfigsCommand.java | 32 +++++------ .../loadbalancer/admin/cli/beans/Cluster.java | 6 ++- .../admin/cli/beans/Loadbalancer.java | 14 +++-- .../admin/cli/beans/Property.java | 5 +- .../admin/cli/beans/WebModule.java | 6 ++- .../cli/connection/ConnectionManager.java | 8 +-- .../cli/connection/SSLHostNameVerifier.java | 9 ++-- .../admin/cli/helper/LbConfigHelper.java | 19 ++++--- .../cli/reader/impl/ClusterReaderHelper.java | 15 +++--- .../cli/reader/impl/ClusterReaderImpl.java | 19 ++++--- .../reader/impl/HealthCheckerReaderImpl.java | 9 ++-- .../impl/IdempotentUrlPatternReaderImpl.java | 5 +- .../cli/reader/impl/InstanceReaderImpl.java | 24 ++++----- .../reader/impl/LoadbalancerReaderImpl.java | 20 ++++--- .../cli/reader/impl/PropertyReaderImpl.java | 14 +++-- .../impl/StandAloneClusterReaderImpl.java | 16 +++--- .../cli/reader/impl/WebModuleReaderImpl.java | 7 ++- .../impl/WebServiceEndpointReaderImpl.java | 7 ++- .../admin/cli/transform/ClusterVisitor.java | 7 ++- .../cli/transform/HealthCheckerVisitor.java | 2 +- .../IdempotentUrlPatternVisitor.java | 3 +- .../admin/cli/transform/InstanceVisitor.java | 3 +- .../cli/transform/LoadbalancerVisitor.java | 9 ++-- .../admin/cli/transform/PropertyVisitor.java | 3 +- .../admin/cli/transform/WebModuleVisitor.java | 7 ++- .../upgrade/LoadBalancerConfigUpgrade.java | 20 +++---- .../loadbalancer/config/LbConfig.java | 2 +- .../loadbalancer/config/LbConfigs.java | 6 +-- .../loadbalancer/config/LoadBalancer.java | 21 ++++---- .../loadbalancer/config/LoadBalancers.java | 6 +-- .../customvalidators/RefConstraint.java | 1 + .../config/customvalidators/RefValidator.java | 6 ++- 46 files changed, 450 insertions(+), 393 deletions(-) diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ApplyHttpLbChanges.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ApplyHttpLbChanges.java index 4bf477f3388..af95926754f 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ApplyHttpLbChanges.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ApplyHttpLbChanges.java @@ -16,32 +16,33 @@ package org.glassfish.loadbalancer.admin.cli; -import java.io.OutputStream; +import com.sun.enterprise.config.serverbeans.Domain; + +import jakarta.inject.Inject; + import java.io.IOException; +import java.io.OutputStream; import java.net.HttpURLConnection; import java.net.UnknownHostException; +import java.util.logging.Level; -import org.glassfish.loadbalancer.admin.cli.connection.ConnectionManager; -import org.glassfish.loadbalancer.admin.cli.reader.api.LoadbalancerReader; - +import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.jvnet.hk2.annotations.Service; - -import org.glassfish.hk2.api.PerLookup; -import com.sun.enterprise.config.serverbeans.Domain; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.loadbalancer.config.LoadBalancer; -import java.util.logging.Level; -import org.glassfish.api.ActionReport; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.hk2.api.PerLookup; import org.glassfish.internal.data.ApplicationRegistry; +import org.glassfish.loadbalancer.admin.cli.connection.ConnectionManager; import org.glassfish.loadbalancer.admin.cli.helper.LbConfigHelper; +import org.glassfish.loadbalancer.admin.cli.reader.api.LoadbalancerReader; +import org.glassfish.loadbalancer.config.LoadBalancer; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.types.Property; -import jakarta.inject.Inject; - /** * Class to publish the loadbalancer.xml to the physical loadbalancer. * diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ConfigureLBWeightCommand.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ConfigureLBWeightCommand.java index ef0c2b2d960..5297be8af76 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ConfigureLBWeightCommand.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ConfigureLBWeightCommand.java @@ -16,24 +16,30 @@ package org.glassfish.loadbalancer.admin.cli; -import java.util.logging.Logger; -import java.util.Map; -import java.util.Iterator; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.util.LocalStringManagerImpl; import java.beans.PropertyVetoException; +import java.util.Iterator; +import java.util.Map; +import java.util.logging.Logger; -import org.jvnet.hk2.annotations.*; -import org.jvnet.hk2.config.*; -import org.glassfish.api.Param; -import org.glassfish.api.I18n; import org.glassfish.api.ActionReport; -import com.sun.enterprise.util.LocalStringManagerImpl; - -import com.sun.enterprise.config.serverbeans.Server; -import com.sun.enterprise.config.serverbeans.Cluster; - -import org.glassfish.api.admin.*; +import org.glassfish.api.I18n; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandException; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.ConfigSupport; +import org.jvnet.hk2.config.SingleConfigCode; +import org.jvnet.hk2.config.TransactionFailure; /** * This is a remote command that enables lb-enabled attribute of an application diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/CreateHTTPHealthCheckerCommand.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/CreateHTTPHealthCheckerCommand.java index 56f20102f26..1e428871792 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/CreateHTTPHealthCheckerCommand.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/CreateHTTPHealthCheckerCommand.java @@ -17,37 +17,40 @@ package org.glassfish.loadbalancer.admin.cli; import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.ClusterRef; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.HealthChecker; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.config.serverbeans.ServerRef; +import com.sun.enterprise.util.LocalStringManagerImpl; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.ArrayList; -import java.util.List; +import jakarta.inject.Inject; import java.beans.PropertyVetoException; +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; - -import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.config.*; -import org.glassfish.api.Param; import org.glassfish.api.ActionReport; -import com.sun.enterprise.util.LocalStringManagerImpl; - +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandException; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.config.support.CommandTarget; +import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; import org.glassfish.internal.api.Target; - -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.ClusterRef; -import com.sun.enterprise.config.serverbeans.ServerRef; -import com.sun.enterprise.config.serverbeans.HealthChecker; -import com.sun.enterprise.config.serverbeans.Server; -import org.glassfish.loadbalancer.config.LbConfigs; import org.glassfish.loadbalancer.config.LbConfig; - -import org.glassfish.api.admin.*; -import org.glassfish.config.support.TargetType; -import org.glassfish.config.support.CommandTarget; - -import jakarta.inject.Inject; +import org.glassfish.loadbalancer.config.LbConfigs; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.ConfigSupport; +import org.jvnet.hk2.config.SingleConfigCode; +import org.jvnet.hk2.config.TransactionFailure; /** * This is a remote command that creates health-checker config for cluster or diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/CreateHTTPLBRefCommand.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/CreateHTTPLBRefCommand.java index b74c13f00bd..395d55ea29a 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/CreateHTTPLBRefCommand.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/CreateHTTPLBRefCommand.java @@ -16,39 +16,44 @@ package org.glassfish.loadbalancer.admin.cli; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.List; +import com.sun.enterprise.config.serverbeans.ApplicationRef; +import com.sun.enterprise.config.serverbeans.Applications; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.ClusterRef; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.config.serverbeans.ServerRef; +import com.sun.enterprise.util.LocalStringManagerImpl; -import java.beans.PropertyVetoException; +import jakarta.inject.Inject; +import java.beans.PropertyVetoException; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; -import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.config.*; -import org.glassfish.api.Param; -import org.glassfish.api.I18n; import org.glassfish.api.ActionReport; -import com.sun.enterprise.util.LocalStringManagerImpl; - +import org.glassfish.api.I18n; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandException; +import org.glassfish.api.admin.CommandRunner; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.config.support.CommandTarget; +import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; import org.glassfish.internal.api.Target; - -import com.sun.enterprise.config.serverbeans.ApplicationRef; -import com.sun.enterprise.config.serverbeans.ClusterRef; -import com.sun.enterprise.config.serverbeans.ServerRef; -import com.sun.enterprise.config.serverbeans.Server; -import com.sun.enterprise.config.serverbeans.Cluster; -import org.glassfish.loadbalancer.config.LbConfigs; import org.glassfish.loadbalancer.config.LbConfig; +import org.glassfish.loadbalancer.config.LbConfigs; import org.glassfish.loadbalancer.config.LoadBalancer; import org.glassfish.loadbalancer.config.LoadBalancers; -import com.sun.enterprise.config.serverbeans.Applications; - -import org.glassfish.api.admin.*; -import org.glassfish.config.support.TargetType; -import org.glassfish.config.support.CommandTarget; - -import jakarta.inject.Inject; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.ConfigSupport; +import org.jvnet.hk2.config.SingleConfigCode; +import org.jvnet.hk2.config.TransactionFailure; /** * diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/CreateHTTPLoadBalancerCommand.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/CreateHTTPLoadBalancerCommand.java index 8ea2bcbab74..da4c2f63bd0 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/CreateHTTPLoadBalancerCommand.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/CreateHTTPLoadBalancerCommand.java @@ -16,38 +16,45 @@ package org.glassfish.loadbalancer.admin.cli; -import java.util.logging.Logger; +import com.sun.enterprise.config.serverbeans.Applications; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + +import java.beans.PropertyVetoException; import java.util.Properties; +import java.util.logging.Logger; import java.util.regex.Pattern; -import java.beans.PropertyVetoException; import javax.security.auth.Subject; - -import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.config.*; -import org.jvnet.hk2.config.types.Property; -import org.glassfish.api.Param; -import org.glassfish.api.I18n; import org.glassfish.api.ActionReport; -import com.sun.enterprise.util.LocalStringManagerImpl; - +import org.glassfish.api.I18n; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandException; +import org.glassfish.api.admin.CommandRunner; +import org.glassfish.api.admin.CommandRunner.CommandInvocation; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.config.support.CommandTarget; +import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; import org.glassfish.internal.api.Target; - -import org.glassfish.loadbalancer.config.LoadBalancers; import org.glassfish.loadbalancer.config.LoadBalancer; -import com.sun.enterprise.config.serverbeans.Applications; -import com.sun.enterprise.config.serverbeans.Domain; - -import org.glassfish.api.admin.*; -import org.glassfish.config.support.TargetType; -import org.glassfish.config.support.CommandTarget; -import static org.glassfish.config.support.Constants.*; - -import org.glassfish.api.admin.CommandRunner.CommandInvocation; +import org.glassfish.loadbalancer.config.LoadBalancers; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.ConfigSupport; +import org.jvnet.hk2.config.RetryableException; +import org.jvnet.hk2.config.SingleConfigCode; +import org.jvnet.hk2.config.Transaction; +import org.jvnet.hk2.config.TransactionFailure; +import org.jvnet.hk2.config.types.Property; -import jakarta.inject.Inject; +import static org.glassfish.config.support.Constants.NAME_REGEX; /** * This method supports the create-http-lb CLI command. It creates a lb-config, cluster-ref, health-checker by using diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DeleteHTTPHealthCheckerCommand.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DeleteHTTPHealthCheckerCommand.java index b239557088e..226b88caa67 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DeleteHTTPHealthCheckerCommand.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DeleteHTTPHealthCheckerCommand.java @@ -17,36 +17,38 @@ package org.glassfish.loadbalancer.admin.cli; import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.ClusterRef; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.HealthChecker; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.config.serverbeans.ServerRef; +import com.sun.enterprise.util.LocalStringManagerImpl; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.List; +import jakarta.inject.Inject; import java.beans.PropertyVetoException; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; - -import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.config.*; -import org.glassfish.api.Param; import org.glassfish.api.ActionReport; -import com.sun.enterprise.util.LocalStringManagerImpl; - +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.config.support.CommandTarget; +import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; import org.glassfish.internal.api.Target; - -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.ClusterRef; -import com.sun.enterprise.config.serverbeans.ServerRef; -import com.sun.enterprise.config.serverbeans.HealthChecker; -import com.sun.enterprise.config.serverbeans.Server; -import org.glassfish.loadbalancer.config.LbConfigs; import org.glassfish.loadbalancer.config.LbConfig; - -import org.glassfish.api.admin.*; -import org.glassfish.config.support.TargetType; -import org.glassfish.config.support.CommandTarget; - -import jakarta.inject.Inject; +import org.glassfish.loadbalancer.config.LbConfigs; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.ConfigSupport; +import org.jvnet.hk2.config.SingleConfigCode; +import org.jvnet.hk2.config.TransactionFailure; /** * This is a remote command that deletes health-checker config for cluster or diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DeleteHTTPLBRefCommand.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DeleteHTTPLBRefCommand.java index 35afb7be040..16404dbd586 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DeleteHTTPLBRefCommand.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DeleteHTTPLBRefCommand.java @@ -16,38 +16,40 @@ package org.glassfish.loadbalancer.admin.cli; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.List; +import com.sun.enterprise.config.serverbeans.ApplicationRef; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.ClusterRef; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.config.serverbeans.ServerRef; +import com.sun.enterprise.util.LocalStringManagerImpl; -import java.beans.PropertyVetoException; +import jakarta.inject.Inject; +import java.beans.PropertyVetoException; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; -import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.config.*; -import org.glassfish.api.Param; import org.glassfish.api.ActionReport; -import com.sun.enterprise.util.LocalStringManagerImpl; - +import org.glassfish.api.I18n; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.config.support.CommandTarget; +import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; import org.glassfish.internal.api.Target; - -import com.sun.enterprise.config.serverbeans.ApplicationRef; -import com.sun.enterprise.config.serverbeans.ClusterRef; -import com.sun.enterprise.config.serverbeans.ServerRef; -import com.sun.enterprise.config.serverbeans.Server; -import com.sun.enterprise.config.serverbeans.Cluster; -import org.glassfish.loadbalancer.config.LbConfigs; import org.glassfish.loadbalancer.config.LbConfig; +import org.glassfish.loadbalancer.config.LbConfigs; import org.glassfish.loadbalancer.config.LoadBalancer; import org.glassfish.loadbalancer.config.LoadBalancers; - -import org.glassfish.api.I18n; -import org.glassfish.api.admin.*; -import org.glassfish.config.support.TargetType; -import org.glassfish.config.support.CommandTarget; - -import jakarta.inject.Inject; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.ConfigSupport; +import org.jvnet.hk2.config.SingleConfigCode; +import org.jvnet.hk2.config.TransactionFailure; /** * diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DisableHTTPLBApplicationCommand.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DisableHTTPLBApplicationCommand.java index 9c755aac2da..dba9e11118a 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DisableHTTPLBApplicationCommand.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DisableHTTPLBApplicationCommand.java @@ -16,23 +16,35 @@ package org.glassfish.loadbalancer.admin.cli; -import com.sun.enterprise.config.serverbeans.*; -import java.util.logging.Logger; -import java.beans.PropertyVetoException; +import com.sun.enterprise.config.serverbeans.Application; +import com.sun.enterprise.config.serverbeans.ApplicationRef; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.util.LocalStringManagerImpl; +import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.config.*; -import org.glassfish.api.Param; -import org.glassfish.api.ActionReport; -import com.sun.enterprise.util.LocalStringManagerImpl; +import java.beans.PropertyVetoException; +import java.util.logging.Logger; -import org.glassfish.api.admin.*; -import org.glassfish.config.support.TargetType; +import org.glassfish.api.ActionReport; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; +import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; - -import jakarta.inject.Inject; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.ConfigSupport; +import org.jvnet.hk2.config.SingleConfigCode; +import org.jvnet.hk2.config.Transaction; +import org.jvnet.hk2.config.TransactionFailure; /** * This is a remote command that disables lb-enabled attribute of an application diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DisableHTTPLBServerCommand.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DisableHTTPLBServerCommand.java index dbf305de820..b2e2b2da781 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DisableHTTPLBServerCommand.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/DisableHTTPLBServerCommand.java @@ -18,26 +18,30 @@ import com.sun.enterprise.config.serverbeans.Cluster; import com.sun.enterprise.config.serverbeans.Server; -import java.util.logging.Logger; +import com.sun.enterprise.config.serverbeans.ServerRef; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + import java.util.List; +import java.util.logging.Logger; +import org.glassfish.api.ActionReport; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.config.support.CommandTarget; +import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; import org.glassfish.internal.api.Target; - -import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.config.*; -import org.glassfish.api.Param; -import org.glassfish.api.ActionReport; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.config.serverbeans.ServerRef; -import org.glassfish.loadbalancer.config.LbConfigs; import org.glassfish.loadbalancer.config.LbConfig; - -import org.glassfish.api.admin.*; -import org.glassfish.config.support.TargetType; -import org.glassfish.config.support.CommandTarget; - -import jakarta.inject.Inject; +import org.glassfish.loadbalancer.config.LbConfigs; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.TransactionFailure; /** * This is a remote command that enables lb-enabled attribute of diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/EnableHTTPLBApplicationCommand.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/EnableHTTPLBApplicationCommand.java index 29ad734a451..9529ef5c813 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/EnableHTTPLBApplicationCommand.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/EnableHTTPLBApplicationCommand.java @@ -16,23 +16,35 @@ package org.glassfish.loadbalancer.admin.cli; -import com.sun.enterprise.config.serverbeans.*; -import java.util.logging.Logger; -import java.beans.PropertyVetoException; +import com.sun.enterprise.config.serverbeans.Application; +import com.sun.enterprise.config.serverbeans.ApplicationRef; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.util.LocalStringManagerImpl; +import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.config.*; -import org.glassfish.api.Param; -import org.glassfish.api.ActionReport; -import com.sun.enterprise.util.LocalStringManagerImpl; +import java.beans.PropertyVetoException; +import java.util.logging.Logger; -import org.glassfish.api.admin.*; -import org.glassfish.config.support.TargetType; +import org.glassfish.api.ActionReport; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; +import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; - -import jakarta.inject.Inject; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.ConfigSupport; +import org.jvnet.hk2.config.SingleConfigCode; +import org.jvnet.hk2.config.Transaction; +import org.jvnet.hk2.config.TransactionFailure; /** * This is a remote command that enables lb-enabled attribute of an application diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/EnableHTTPLBServerCommand.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/EnableHTTPLBServerCommand.java index 12daef4ed65..d0b7978993b 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/EnableHTTPLBServerCommand.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/EnableHTTPLBServerCommand.java @@ -18,28 +18,30 @@ import com.sun.enterprise.config.serverbeans.Cluster; import com.sun.enterprise.config.serverbeans.Server; -import java.util.logging.Logger; -import java.util.List; +import com.sun.enterprise.config.serverbeans.ServerRef; +import com.sun.enterprise.util.LocalStringManagerImpl; +import jakarta.inject.Inject; +import java.util.List; +import java.util.logging.Logger; -import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.config.*; -import org.glassfish.api.Param; import org.glassfish.api.ActionReport; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.config.serverbeans.ServerRef; -import org.glassfish.loadbalancer.config.LbConfigs; -import org.glassfish.loadbalancer.config.LbConfig; - -import org.glassfish.api.admin.*; -import org.glassfish.config.support.TargetType; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; - +import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; import org.glassfish.internal.api.Target; - -import jakarta.inject.Inject; +import org.glassfish.loadbalancer.config.LbConfig; +import org.glassfish.loadbalancer.config.LbConfigs; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.TransactionFailure; /** * This is a remote command that enables lb-enabled attribute of diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ExportHttpLbConfig.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ExportHttpLbConfig.java index c0266f22c58..f5cd98757fa 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ExportHttpLbConfig.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ExportHttpLbConfig.java @@ -16,42 +16,37 @@ package org.glassfish.loadbalancer.admin.cli; +import com.sun.enterprise.config.serverbeans.Domain; + +import jakarta.inject.Inject; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; - -import org.glassfish.api.I18n; -import org.glassfish.api.Param; -import org.jvnet.hk2.annotations.Service; - -import org.glassfish.hk2.api.PerLookup; -import com.sun.enterprise.config.serverbeans.Domain; -import org.glassfish.loadbalancer.config.LoadBalancer; - import java.net.URI; - -import org.glassfish.api.admin.AdminCommandContext; - -import org.glassfish.loadbalancer.admin.cli.reader.api.LoadbalancerReader; - import java.util.HashSet; import java.util.List; - -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.ServerEnvironment; - import java.util.Properties; import java.util.Set; import java.util.logging.Level; import org.glassfish.api.ActionReport; -import org.glassfish.api.admin.*; +import org.glassfish.api.I18n; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.hk2.api.PerLookup; import org.glassfish.internal.data.ApplicationRegistry; -import org.glassfish.loadbalancer.admin.cli.reader.impl.LoadbalancerReaderImpl; import org.glassfish.loadbalancer.admin.cli.helper.LbConfigHelper; +import org.glassfish.loadbalancer.admin.cli.reader.api.LoadbalancerReader; +import org.glassfish.loadbalancer.admin.cli.reader.impl.LoadbalancerReaderImpl; import org.glassfish.loadbalancer.config.LbConfig; - -import jakarta.inject.Inject; +import org.glassfish.loadbalancer.config.LoadBalancer; +import org.jvnet.hk2.annotations.Service; /** * Export load-balancer xml diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/LBCommandsBase.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/LBCommandsBase.java index bca9c8e8ce7..fdbe7a3ed5c 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/LBCommandsBase.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/LBCommandsBase.java @@ -16,23 +16,25 @@ package org.glassfish.loadbalancer.admin.cli; -import java.util.Map; -import java.util.HashMap; -import java.util.StringTokenizer; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.ServerRef; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; import java.beans.PropertyVetoException; +import java.util.HashMap; +import java.util.Map; +import java.util.StringTokenizer; -import org.jvnet.hk2.config.*; import org.glassfish.api.ActionReport; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.ServerRef; -import com.sun.enterprise.config.serverbeans.Cluster; - -import org.glassfish.api.admin.*; import org.glassfish.api.ActionReport.ExitCode; - -import jakarta.inject.Inject; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandException; +import org.jvnet.hk2.config.ConfigSupport; +import org.jvnet.hk2.config.SingleConfigCode; +import org.jvnet.hk2.config.TransactionFailure; /** * Base class for all the LB commands diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/LbLogUtil.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/LbLogUtil.java index 95516f895dd..0e9dc9c5d7e 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/LbLogUtil.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/LbLogUtil.java @@ -18,6 +18,7 @@ import com.sun.enterprise.util.i18n.StringManager; import com.sun.logging.LogDomains; + import java.util.logging.Logger; /** diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ListLBConfigsCommand.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ListLBConfigsCommand.java index 37b0fbb5693..682738cea8f 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ListLBConfigsCommand.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/ListLBConfigsCommand.java @@ -16,28 +16,30 @@ package org.glassfish.loadbalancer.admin.cli; +import com.sun.enterprise.config.serverbeans.ClusterRef; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.ServerRef; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.inject.Inject; + +import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.List; - -import org.jvnet.hk2.annotations.Service; -import org.glassfish.api.Param; import org.glassfish.api.ActionReport; -import com.sun.enterprise.util.LocalStringManagerImpl; - +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.hk2.api.PerLookup; import org.glassfish.internal.api.Target; - -import com.sun.enterprise.config.serverbeans.ClusterRef; -import com.sun.enterprise.config.serverbeans.ServerRef; -import com.sun.enterprise.config.serverbeans.Domain; -import org.glassfish.loadbalancer.config.LbConfigs; import org.glassfish.loadbalancer.config.LbConfig; - -import org.glassfish.api.admin.*; - -import jakarta.inject.Inject; +import org.glassfish.loadbalancer.config.LbConfigs; +import org.jvnet.hk2.annotations.Service; /** * This is a remote commands to list lb configs (ported from v2) diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/beans/Cluster.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/beans/Cluster.java index c636c37bd0d..763ebe36f41 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/beans/Cluster.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/beans/Cluster.java @@ -16,8 +16,10 @@ package org.glassfish.loadbalancer.admin.cli.beans; -import org.netbeans.modules.schema2beans.*; -import java.util.*; +import java.util.Vector; + +import org.netbeans.modules.schema2beans.AttrProp; +import org.netbeans.modules.schema2beans.Common; // BEGIN_NOI18N public class Cluster extends org.netbeans.modules.schema2beans.BaseBean { diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/beans/Loadbalancer.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/beans/Loadbalancer.java index 083be20de51..0cfa82b9849 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/beans/Loadbalancer.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/beans/Loadbalancer.java @@ -56,10 +56,16 @@ */ package org.glassfish.loadbalancer.admin.cli.beans; -import org.w3c.dom.*; -import org.netbeans.modules.schema2beans.*; -import java.util.*; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.util.Vector; + +import org.netbeans.modules.schema2beans.AttrProp; +import org.netbeans.modules.schema2beans.Common; +import org.netbeans.modules.schema2beans.GraphManager; +import org.netbeans.modules.schema2beans.Schema2BeansException; +import org.w3c.dom.Document; +import org.w3c.dom.Node; // BEGIN_NOI18N public class Loadbalancer extends org.netbeans.modules.schema2beans.BaseBean { diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/beans/Property.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/beans/Property.java index 848c18401fd..3ab5ed12fa9 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/beans/Property.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/beans/Property.java @@ -21,8 +21,9 @@ */ package org.glassfish.loadbalancer.admin.cli.beans; -import org.netbeans.modules.schema2beans.*; -import java.util.*; +import java.util.Vector; + +import org.netbeans.modules.schema2beans.Common; // BEGIN_NOI18N public class Property extends org.netbeans.modules.schema2beans.BaseBean { diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/beans/WebModule.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/beans/WebModule.java index b44ac9c6ca8..e03add3dca4 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/beans/WebModule.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/beans/WebModule.java @@ -21,8 +21,10 @@ */ package org.glassfish.loadbalancer.admin.cli.beans; -import org.netbeans.modules.schema2beans.*; -import java.util.*; +import java.util.Vector; + +import org.netbeans.modules.schema2beans.AttrProp; +import org.netbeans.modules.schema2beans.Common; // BEGIN_NOI18N public class WebModule extends org.netbeans.modules.schema2beans.BaseBean { diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/connection/ConnectionManager.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/connection/ConnectionManager.java index 82d97841a48..0365b516577 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/connection/ConnectionManager.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/connection/ConnectionManager.java @@ -16,17 +16,19 @@ package org.glassfish.loadbalancer.admin.cli.connection; +import com.sun.enterprise.security.ssl.SSLUtils; + import java.io.IOException; +import java.net.HttpURLConnection; import java.net.InetSocketAddress; import java.net.Proxy; import java.net.URL; -import javax.net.ssl.HttpsURLConnection; + import javax.net.ssl.HostnameVerifier; -import java.net.HttpURLConnection; +import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; -import com.sun.enterprise.security.ssl.SSLUtils; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.api.Globals; diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/connection/SSLHostNameVerifier.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/connection/SSLHostNameVerifier.java index 37d7c02632e..f7d67fb38bf 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/connection/SSLHostNameVerifier.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/connection/SSLHostNameVerifier.java @@ -16,12 +16,13 @@ package org.glassfish.loadbalancer.admin.cli.connection; -import javax.net.ssl.SSLSession; -import javax.net.ssl.HostnameVerifier; +import java.security.cert.Certificate; +import java.security.cert.X509Certificate; +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.SSLSession; import javax.security.auth.x500.X500Principal; -import java.security.cert.X509Certificate; -import java.security.cert.Certificate; + import org.glassfish.loadbalancer.admin.cli.LbLogUtil; /** diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/helper/LbConfigHelper.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/helper/LbConfigHelper.java index d5c2b230640..bf6510f3734 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/helper/LbConfigHelper.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/helper/LbConfigHelper.java @@ -16,28 +16,27 @@ package org.glassfish.loadbalancer.admin.cli.helper; +import com.sun.enterprise.config.serverbeans.Domain; + import java.io.OutputStream; import java.util.Date; import java.util.Properties; import java.util.StringTokenizer; +import org.glassfish.internal.data.ApplicationRegistry; +import org.glassfish.loadbalancer.admin.cli.LbLogUtil; +import org.glassfish.loadbalancer.admin.cli.beans.Loadbalancer; import org.glassfish.loadbalancer.admin.cli.reader.api.ClusterReader; import org.glassfish.loadbalancer.admin.cli.reader.api.InstanceReader; +import org.glassfish.loadbalancer.admin.cli.reader.api.LoadbalancerReader; import org.glassfish.loadbalancer.admin.cli.reader.api.WebModuleReader; +import org.glassfish.loadbalancer.admin.cli.reader.impl.LoadbalancerReaderImpl; +import org.glassfish.loadbalancer.admin.cli.transform.LoadbalancerVisitor; import org.glassfish.loadbalancer.config.LbConfig; -import com.sun.enterprise.config.serverbeans.Domain; -import org.glassfish.loadbalancer.config.LoadBalancer; import org.glassfish.loadbalancer.config.LbConfigs; +import org.glassfish.loadbalancer.config.LoadBalancer; import org.glassfish.loadbalancer.config.LoadBalancers; -import org.glassfish.loadbalancer.admin.cli.reader.api.LoadbalancerReader; -import org.glassfish.loadbalancer.admin.cli.reader.impl.LoadbalancerReaderImpl; -import org.glassfish.loadbalancer.admin.cli.transform.LoadbalancerVisitor; - -import org.glassfish.internal.data.ApplicationRegistry; -import org.glassfish.loadbalancer.admin.cli.LbLogUtil; -import org.glassfish.loadbalancer.admin.cli.beans.Loadbalancer; - /** * Export support class diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/ClusterReaderHelper.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/ClusterReaderHelper.java index 021a05446b5..a3528d8c529 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/ClusterReaderHelper.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/ClusterReaderHelper.java @@ -17,30 +17,27 @@ package org.glassfish.loadbalancer.admin.cli.reader.impl; import com.sun.enterprise.config.serverbeans.Application; - -import java.util.List; -import java.util.ArrayList; import com.sun.enterprise.config.serverbeans.ApplicationRef; import com.sun.enterprise.config.serverbeans.Applications; - -import org.glassfish.loadbalancer.admin.cli.reader.api.WebModuleReader; - - import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.deployment.BundleDescriptor; import com.sun.enterprise.deployment.EjbBundleDescriptor; import com.sun.enterprise.deployment.WebBundleDescriptor; import com.sun.enterprise.deployment.WebServiceEndpoint; + +import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import org.glassfish.loadbalancer.admin.cli.reader.api.LbReaderException; - import java.util.Iterator; +import java.util.List; import java.util.Set; import java.util.logging.Level; + import org.glassfish.internal.data.ApplicationInfo; import org.glassfish.internal.data.ApplicationRegistry; import org.glassfish.loadbalancer.admin.cli.LbLogUtil; +import org.glassfish.loadbalancer.admin.cli.reader.api.LbReaderException; +import org.glassfish.loadbalancer.admin.cli.reader.api.WebModuleReader; /** * Impl class for ClusterReader. This provides loadbalancer diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/ClusterReaderImpl.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/ClusterReaderImpl.java index d849f95d0b0..9ec0b07a155 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/ClusterReaderImpl.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/ClusterReaderImpl.java @@ -17,24 +17,23 @@ package org.glassfish.loadbalancer.admin.cli.reader.impl; import com.sun.enterprise.config.serverbeans.ApplicationRef; -import com.sun.enterprise.config.serverbeans.HealthChecker; - -import org.glassfish.loadbalancer.admin.cli.transform.Visitor; -import org.glassfish.loadbalancer.admin.cli.transform.ClusterVisitor; - -import org.glassfish.loadbalancer.admin.cli.reader.api.ClusterReader; -import org.glassfish.loadbalancer.admin.cli.reader.api.InstanceReader; -import org.glassfish.loadbalancer.admin.cli.reader.api.WebModuleReader; -import org.glassfish.loadbalancer.admin.cli.reader.api.HealthCheckerReader; - import com.sun.enterprise.config.serverbeans.Cluster; import com.sun.enterprise.config.serverbeans.ClusterRef; import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.HealthChecker; import com.sun.enterprise.config.serverbeans.ServerRef; + import java.util.Iterator; import java.util.List; + import org.glassfish.internal.data.ApplicationRegistry; +import org.glassfish.loadbalancer.admin.cli.reader.api.ClusterReader; +import org.glassfish.loadbalancer.admin.cli.reader.api.HealthCheckerReader; +import org.glassfish.loadbalancer.admin.cli.reader.api.InstanceReader; import org.glassfish.loadbalancer.admin.cli.reader.api.LbReaderException; +import org.glassfish.loadbalancer.admin.cli.reader.api.WebModuleReader; +import org.glassfish.loadbalancer.admin.cli.transform.ClusterVisitor; +import org.glassfish.loadbalancer.admin.cli.transform.Visitor; /** * Impl class for ClusterReader. This provides loadbalancer diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/HealthCheckerReaderImpl.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/HealthCheckerReaderImpl.java index 79305fcfb81..88183dd08f9 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/HealthCheckerReaderImpl.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/HealthCheckerReaderImpl.java @@ -16,12 +16,13 @@ package org.glassfish.loadbalancer.admin.cli.reader.impl; -import org.glassfish.loadbalancer.admin.cli.transform.Visitor; -import org.glassfish.loadbalancer.admin.cli.transform.HealthCheckerVisitor; -import org.glassfish.loadbalancer.admin.cli.reader.api.HealthCheckerReader; -import org.glassfish.loadbalancer.admin.cli.reader.api.LbReaderException; import com.sun.enterprise.config.serverbeans.HealthChecker; + import org.glassfish.loadbalancer.admin.cli.LbLogUtil; +import org.glassfish.loadbalancer.admin.cli.reader.api.HealthCheckerReader; +import org.glassfish.loadbalancer.admin.cli.reader.api.LbReaderException; +import org.glassfish.loadbalancer.admin.cli.transform.HealthCheckerVisitor; +import org.glassfish.loadbalancer.admin.cli.transform.Visitor; /** * Provides health checker information relavant to Load balancer tier. diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/IdempotentUrlPatternReaderImpl.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/IdempotentUrlPatternReaderImpl.java index 9455c2753fc..0f7897c6cef 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/IdempotentUrlPatternReaderImpl.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/IdempotentUrlPatternReaderImpl.java @@ -18,10 +18,11 @@ import com.sun.enterprise.deployment.runtime.web.IdempotentUrlPattern; import com.sun.enterprise.deployment.runtime.web.SunWebApp; -import org.glassfish.loadbalancer.admin.cli.reader.api.LbReaderException; + import org.glassfish.loadbalancer.admin.cli.reader.api.IdempotentUrlPatternReader; -import org.glassfish.loadbalancer.admin.cli.transform.Visitor; +import org.glassfish.loadbalancer.admin.cli.reader.api.LbReaderException; import org.glassfish.loadbalancer.admin.cli.transform.IdempotentUrlPatternVisitor; +import org.glassfish.loadbalancer.admin.cli.transform.Visitor; /** * Provides idempotent url pattern information relavant to Load balancer tier. diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/InstanceReaderImpl.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/InstanceReaderImpl.java index c2b15871260..48c16fdc7ec 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/InstanceReaderImpl.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/InstanceReaderImpl.java @@ -16,30 +16,30 @@ package org.glassfish.loadbalancer.admin.cli.reader.impl; -import java.net.UnknownHostException; -import org.glassfish.loadbalancer.admin.cli.transform.Visitor; -import org.glassfish.loadbalancer.admin.cli.transform.InstanceVisitor; - -import org.glassfish.loadbalancer.admin.cli.reader.api.InstanceReader; -import org.glassfish.loadbalancer.admin.cli.reader.api.LbReaderException; -import com.sun.enterprise.config.serverbeans.ServerRef; -import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Node; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.config.serverbeans.ServerRef; import com.sun.enterprise.config.serverbeans.ServerTags; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.Iterator; + +import org.glassfish.config.support.GlassFishConfigBean; +import org.glassfish.config.support.PropertyResolver; import org.glassfish.grizzly.config.dom.NetworkConfig; import org.glassfish.grizzly.config.dom.NetworkListener; import org.glassfish.grizzly.config.dom.NetworkListeners; import org.glassfish.grizzly.config.dom.Protocol; import org.glassfish.grizzly.config.dom.Protocols; -import java.net.InetAddress; -import java.util.Iterator; -import org.glassfish.config.support.GlassFishConfigBean; -import org.glassfish.config.support.PropertyResolver; import org.glassfish.loadbalancer.admin.cli.LbLogUtil; +import org.glassfish.loadbalancer.admin.cli.reader.api.InstanceReader; +import org.glassfish.loadbalancer.admin.cli.reader.api.LbReaderException; import org.glassfish.loadbalancer.admin.cli.reader.api.LoadbalancerReader; +import org.glassfish.loadbalancer.admin.cli.transform.InstanceVisitor; +import org.glassfish.loadbalancer.admin.cli.transform.Visitor; /** * Provides instance information relavant to Load balancer tier. diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/LoadbalancerReaderImpl.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/LoadbalancerReaderImpl.java index 8a857f0f228..c4518dfeda5 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/LoadbalancerReaderImpl.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/LoadbalancerReaderImpl.java @@ -17,28 +17,26 @@ package org.glassfish.loadbalancer.admin.cli.reader.impl; import com.sun.enterprise.config.serverbeans.Cluster; -import org.glassfish.loadbalancer.admin.cli.transform.Visitor; -import org.glassfish.loadbalancer.admin.cli.transform.LoadbalancerVisitor; - -import org.glassfish.loadbalancer.admin.cli.reader.api.ClusterReader; -import org.glassfish.loadbalancer.admin.cli.reader.api.PropertyReader; -import org.glassfish.loadbalancer.admin.cli.reader.api.LoadbalancerReader; -import org.glassfish.loadbalancer.admin.cli.reader.api.LbReaderException; - -import org.glassfish.loadbalancer.config.LbConfig; import com.sun.enterprise.config.serverbeans.ClusterRef; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Ref; import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.config.serverbeans.ServerRef; -import java.util.List; - import java.util.Iterator; +import java.util.List; import java.util.Properties; import java.util.Set; + import org.glassfish.internal.data.ApplicationRegistry; import org.glassfish.loadbalancer.admin.cli.LbLogUtil; +import org.glassfish.loadbalancer.admin.cli.reader.api.ClusterReader; +import org.glassfish.loadbalancer.admin.cli.reader.api.LbReaderException; +import org.glassfish.loadbalancer.admin.cli.reader.api.LoadbalancerReader; +import org.glassfish.loadbalancer.admin.cli.reader.api.PropertyReader; +import org.glassfish.loadbalancer.admin.cli.transform.LoadbalancerVisitor; +import org.glassfish.loadbalancer.admin.cli.transform.Visitor; +import org.glassfish.loadbalancer.config.LbConfig; /** * Reader class to get information about load balancer configuration. diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/PropertyReaderImpl.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/PropertyReaderImpl.java index 48796ae1b43..a2e2b7e951d 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/PropertyReaderImpl.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/PropertyReaderImpl.java @@ -16,17 +16,15 @@ package org.glassfish.loadbalancer.admin.cli.reader.impl; -import org.glassfish.loadbalancer.admin.cli.transform.Visitor; -import org.glassfish.loadbalancer.admin.cli.transform.PropertyVisitor; +import java.util.Iterator; +import java.util.Properties; -import org.glassfish.loadbalancer.admin.cli.reader.api.PropertyReader; -import org.glassfish.loadbalancer.admin.cli.reader.api.LoadbalancerReader; import org.glassfish.loadbalancer.admin.cli.reader.api.LbReaderException; - +import org.glassfish.loadbalancer.admin.cli.reader.api.LoadbalancerReader; +import org.glassfish.loadbalancer.admin.cli.reader.api.PropertyReader; +import org.glassfish.loadbalancer.admin.cli.transform.PropertyVisitor; +import org.glassfish.loadbalancer.admin.cli.transform.Visitor; import org.glassfish.loadbalancer.config.LbConfig; - -import java.util.Iterator; -import java.util.Properties; import org.jvnet.hk2.config.types.Property; /** diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/StandAloneClusterReaderImpl.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/StandAloneClusterReaderImpl.java index 6ba6dbd0faa..49f7f392130 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/StandAloneClusterReaderImpl.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/StandAloneClusterReaderImpl.java @@ -18,22 +18,20 @@ import com.sun.enterprise.config.serverbeans.ApplicationRef; import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.ServerRef; import com.sun.enterprise.config.serverbeans.HealthChecker; import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.config.serverbeans.ServerRef; -import org.glassfish.loadbalancer.admin.cli.transform.Visitor; -import org.glassfish.loadbalancer.admin.cli.transform.ClusterVisitor; +import java.util.List; +import org.glassfish.internal.data.ApplicationRegistry; import org.glassfish.loadbalancer.admin.cli.reader.api.ClusterReader; -import org.glassfish.loadbalancer.admin.cli.reader.api.InstanceReader; -import org.glassfish.loadbalancer.admin.cli.reader.api.WebModuleReader; import org.glassfish.loadbalancer.admin.cli.reader.api.HealthCheckerReader; - -import java.util.List; -import org.glassfish.internal.data.ApplicationRegistry; - +import org.glassfish.loadbalancer.admin.cli.reader.api.InstanceReader; import org.glassfish.loadbalancer.admin.cli.reader.api.LbReaderException; +import org.glassfish.loadbalancer.admin.cli.reader.api.WebModuleReader; +import org.glassfish.loadbalancer.admin.cli.transform.ClusterVisitor; +import org.glassfish.loadbalancer.admin.cli.transform.Visitor; /** * Impl class for ClusterReader. This provides loadbalancer diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/WebModuleReaderImpl.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/WebModuleReaderImpl.java index fcc16779a29..18b904681f5 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/WebModuleReaderImpl.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/WebModuleReaderImpl.java @@ -20,14 +20,13 @@ import com.sun.enterprise.config.serverbeans.ApplicationRef; import com.sun.enterprise.deployment.WebBundleDescriptor; import com.sun.enterprise.deployment.runtime.web.SunWebApp; -import org.glassfish.loadbalancer.admin.cli.reader.api.WebModuleReader; -import org.glassfish.loadbalancer.admin.cli.reader.api.IdempotentUrlPatternReader; +import org.glassfish.loadbalancer.admin.cli.reader.api.IdempotentUrlPatternReader; +import org.glassfish.loadbalancer.admin.cli.reader.api.LbReaderException; +import org.glassfish.loadbalancer.admin.cli.reader.api.WebModuleReader; import org.glassfish.loadbalancer.admin.cli.transform.Visitor; import org.glassfish.loadbalancer.admin.cli.transform.WebModuleVisitor; -import org.glassfish.loadbalancer.admin.cli.reader.api.LbReaderException; - /** * Provides web module information relavant to Load balancer tier. * diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/WebServiceEndpointReaderImpl.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/WebServiceEndpointReaderImpl.java index 1426e23c174..117ddfdb41d 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/WebServiceEndpointReaderImpl.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/reader/impl/WebServiceEndpointReaderImpl.java @@ -19,14 +19,13 @@ import com.sun.enterprise.config.serverbeans.Application; import com.sun.enterprise.config.serverbeans.ApplicationRef; import com.sun.enterprise.deployment.WebServiceEndpoint; -import org.glassfish.loadbalancer.admin.cli.reader.api.WebModuleReader; + import org.glassfish.loadbalancer.admin.cli.reader.api.IdempotentUrlPatternReader; +import org.glassfish.loadbalancer.admin.cli.reader.api.LbReaderException; +import org.glassfish.loadbalancer.admin.cli.reader.api.WebModuleReader; import org.glassfish.loadbalancer.admin.cli.transform.Visitor; import org.glassfish.loadbalancer.admin.cli.transform.WebModuleVisitor; - -import org.glassfish.loadbalancer.admin.cli.reader.api.LbReaderException; - /** * Provides web module information relavant to Load balancer tier. * diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/ClusterVisitor.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/ClusterVisitor.java index 429008c781c..067f398ce0c 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/ClusterVisitor.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/ClusterVisitor.java @@ -16,14 +16,13 @@ package org.glassfish.loadbalancer.admin.cli.transform; +import org.glassfish.loadbalancer.admin.cli.beans.Cluster; +import org.glassfish.loadbalancer.admin.cli.beans.WebModule; import org.glassfish.loadbalancer.admin.cli.reader.api.BaseReader; import org.glassfish.loadbalancer.admin.cli.reader.api.ClusterReader; +import org.glassfish.loadbalancer.admin.cli.reader.api.HealthCheckerReader; import org.glassfish.loadbalancer.admin.cli.reader.api.InstanceReader; import org.glassfish.loadbalancer.admin.cli.reader.api.WebModuleReader; -import org.glassfish.loadbalancer.admin.cli.reader.api.HealthCheckerReader; - -import org.glassfish.loadbalancer.admin.cli.beans.Cluster; -import org.glassfish.loadbalancer.admin.cli.beans.WebModule; /** * Provides transform capabilites for cluster diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/HealthCheckerVisitor.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/HealthCheckerVisitor.java index 4ac65d41a49..5ed2d9fa0b8 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/HealthCheckerVisitor.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/HealthCheckerVisitor.java @@ -16,9 +16,9 @@ package org.glassfish.loadbalancer.admin.cli.transform; +import org.glassfish.loadbalancer.admin.cli.beans.Cluster; import org.glassfish.loadbalancer.admin.cli.reader.api.BaseReader; import org.glassfish.loadbalancer.admin.cli.reader.api.HealthCheckerReader; -import org.glassfish.loadbalancer.admin.cli.beans.Cluster; /** * Provides transform capabilites for health checker diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/IdempotentUrlPatternVisitor.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/IdempotentUrlPatternVisitor.java index 8963f8fffda..f7beabdecda 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/IdempotentUrlPatternVisitor.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/IdempotentUrlPatternVisitor.java @@ -16,11 +16,10 @@ package org.glassfish.loadbalancer.admin.cli.transform; +import org.glassfish.loadbalancer.admin.cli.beans.WebModule; import org.glassfish.loadbalancer.admin.cli.reader.api.BaseReader; import org.glassfish.loadbalancer.admin.cli.reader.api.IdempotentUrlPatternReader; -import org.glassfish.loadbalancer.admin.cli.beans.WebModule; - /** * Provides transform capabilites for IdempotentUrlPattern * diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/InstanceVisitor.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/InstanceVisitor.java index 9567a1aaeb6..b8fa8efb7a9 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/InstanceVisitor.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/InstanceVisitor.java @@ -16,11 +16,10 @@ package org.glassfish.loadbalancer.admin.cli.transform; +import org.glassfish.loadbalancer.admin.cli.beans.Cluster; import org.glassfish.loadbalancer.admin.cli.reader.api.BaseReader; import org.glassfish.loadbalancer.admin.cli.reader.api.InstanceReader; -import org.glassfish.loadbalancer.admin.cli.beans.Cluster; - /** * Provides transform capabilites for instance * diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/LoadbalancerVisitor.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/LoadbalancerVisitor.java index b59f05b3c35..c0b707752a9 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/LoadbalancerVisitor.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/LoadbalancerVisitor.java @@ -16,14 +16,13 @@ package org.glassfish.loadbalancer.admin.cli.transform; -import org.glassfish.loadbalancer.admin.cli.reader.api.BaseReader; -import org.glassfish.loadbalancer.admin.cli.reader.api.PropertyReader; -import org.glassfish.loadbalancer.admin.cli.reader.api.LoadbalancerReader; -import org.glassfish.loadbalancer.admin.cli.reader.api.ClusterReader; - import org.glassfish.loadbalancer.admin.cli.beans.Cluster; import org.glassfish.loadbalancer.admin.cli.beans.Loadbalancer; import org.glassfish.loadbalancer.admin.cli.beans.Property; +import org.glassfish.loadbalancer.admin.cli.reader.api.BaseReader; +import org.glassfish.loadbalancer.admin.cli.reader.api.ClusterReader; +import org.glassfish.loadbalancer.admin.cli.reader.api.LoadbalancerReader; +import org.glassfish.loadbalancer.admin.cli.reader.api.PropertyReader; /** * Provides transform capabilites for LB diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/PropertyVisitor.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/PropertyVisitor.java index 45fe7bf6470..60672908958 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/PropertyVisitor.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/PropertyVisitor.java @@ -16,11 +16,10 @@ package org.glassfish.loadbalancer.admin.cli.transform; +import org.glassfish.loadbalancer.admin.cli.beans.Property; import org.glassfish.loadbalancer.admin.cli.reader.api.BaseReader; import org.glassfish.loadbalancer.admin.cli.reader.api.PropertyReader; -import org.glassfish.loadbalancer.admin.cli.beans.Property; - /** * Provides transform capabilites for properties * diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/WebModuleVisitor.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/WebModuleVisitor.java index 8fccf318049..8a284c88064 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/WebModuleVisitor.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/transform/WebModuleVisitor.java @@ -16,12 +16,11 @@ package org.glassfish.loadbalancer.admin.cli.transform; -import org.glassfish.loadbalancer.admin.cli.reader.api.BaseReader; -import org.glassfish.loadbalancer.admin.cli.reader.api.WebModuleReader; -import org.glassfish.loadbalancer.admin.cli.reader.api.IdempotentUrlPatternReader; - import org.glassfish.loadbalancer.admin.cli.beans.Cluster; import org.glassfish.loadbalancer.admin.cli.beans.WebModule; +import org.glassfish.loadbalancer.admin.cli.reader.api.BaseReader; +import org.glassfish.loadbalancer.admin.cli.reader.api.IdempotentUrlPatternReader; +import org.glassfish.loadbalancer.admin.cli.reader.api.WebModuleReader; import org.netbeans.modules.schema2beans.AttrProp; /** diff --git a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/upgrade/LoadBalancerConfigUpgrade.java b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/upgrade/LoadBalancerConfigUpgrade.java index 1845b54fcbb..f6e234de0f6 100644 --- a/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/upgrade/LoadBalancerConfigUpgrade.java +++ b/appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/upgrade/LoadBalancerConfigUpgrade.java @@ -16,25 +16,25 @@ package org.glassfish.loadbalancer.upgrade; +import com.sun.enterprise.config.serverbeans.Domain; + +import jakarta.inject.Inject; + import java.beans.PropertyVetoException; +import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; + import org.glassfish.api.admin.config.ConfigurationUpgrade; -import com.sun.enterprise.config.serverbeans.Domain; +import org.glassfish.hk2.api.PostConstruct; +import org.glassfish.loadbalancer.admin.cli.LbLogUtil; import org.glassfish.loadbalancer.config.LoadBalancer; import org.glassfish.loadbalancer.config.LoadBalancers; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PostConstruct; -import org.jvnet.hk2.config.TransactionFailure; -import org.jvnet.hk2.config.types.Property; - -import java.util.List; -import org.glassfish.loadbalancer.admin.cli.LbLogUtil; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; - -import jakarta.inject.Inject; +import org.jvnet.hk2.config.TransactionFailure; +import org.jvnet.hk2.config.types.Property; /** * diff --git a/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/LbConfig.java b/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/LbConfig.java index 2ce0426011e..6f7db57e4ea 100644 --- a/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/LbConfig.java +++ b/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/LbConfig.java @@ -17,10 +17,10 @@ package org.glassfish.loadbalancer.config; +import com.sun.enterprise.config.serverbeans.ClusterRef; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Ref; import com.sun.enterprise.config.serverbeans.ServerRef; -import com.sun.enterprise.config.serverbeans.ClusterRef; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.logging.LogDomains; diff --git a/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/LbConfigs.java b/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/LbConfigs.java index 726b4e65e49..0cfab613ced 100644 --- a/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/LbConfigs.java +++ b/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/LbConfigs.java @@ -23,12 +23,12 @@ import org.glassfish.api.I18n; import org.glassfish.api.admin.RuntimeType; -import org.jvnet.hk2.config.ConfigBeanProxy; -import org.jvnet.hk2.config.Configured; -import org.jvnet.hk2.config.Element; import org.glassfish.config.support.Create; import org.glassfish.config.support.Delete; import org.glassfish.config.support.TypeAndNameResolver; +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Configured; +import org.jvnet.hk2.config.Element; /** * diff --git a/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/LoadBalancer.java b/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/LoadBalancer.java index 55fa537aefe..644177866a7 100644 --- a/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/LoadBalancer.java +++ b/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/LoadBalancer.java @@ -16,19 +16,27 @@ package org.glassfish.loadbalancer.config; -import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.modularity.annotation.HasNoDefaultConfiguration; +import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.logging.LogDomains; + +import jakarta.inject.Inject; +import jakarta.validation.constraints.NotNull; + +import java.beans.PropertyVetoException; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.Param; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.config.PropertiesDesc; import org.glassfish.config.support.DeletionDecorator; +import org.glassfish.hk2.api.PerLookup; import org.glassfish.quality.ToDo; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.Configured; @@ -37,13 +45,6 @@ import org.jvnet.hk2.config.TransactionFailure; import org.jvnet.hk2.config.types.Property; import org.jvnet.hk2.config.types.PropertyBag; - -import jakarta.inject.Inject; -import jakarta.validation.constraints.NotNull; -import java.beans.PropertyVetoException; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; /** * */ diff --git a/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/LoadBalancers.java b/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/LoadBalancers.java index ff908fc9d16..ae4752e7551 100644 --- a/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/LoadBalancers.java +++ b/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/LoadBalancers.java @@ -22,12 +22,12 @@ import java.util.List; import org.glassfish.api.I18n; -import org.jvnet.hk2.config.ConfigBeanProxy; -import org.jvnet.hk2.config.Configured; -import org.jvnet.hk2.config.Element; import org.glassfish.config.support.Delete; import org.glassfish.config.support.Listing; import org.glassfish.config.support.TypeAndNameResolver; +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Configured; +import org.jvnet.hk2.config.Element; /** * diff --git a/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/customvalidators/RefConstraint.java b/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/customvalidators/RefConstraint.java index 716b2b6f70b..f5bf8157ec8 100644 --- a/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/customvalidators/RefConstraint.java +++ b/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/customvalidators/RefConstraint.java @@ -18,6 +18,7 @@ import jakarta.validation.Constraint; import jakarta.validation.Payload; + import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/customvalidators/RefValidator.java b/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/customvalidators/RefValidator.java index f15e8ad70eb..3f9b5423015 100644 --- a/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/customvalidators/RefValidator.java +++ b/appserver/load-balancer/gf-load-balancer-connector/src/main/java/org/glassfish/loadbalancer/config/customvalidators/RefValidator.java @@ -17,14 +17,16 @@ package org.glassfish.loadbalancer.config.customvalidators; import com.sun.enterprise.config.serverbeans.ClusterRef; -import org.glassfish.loadbalancer.config.LbConfig; import com.sun.enterprise.config.serverbeans.ServerRef; -import java.util.List; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import jakarta.validation.Payload; +import java.util.List; + +import org.glassfish.loadbalancer.config.LbConfig; + /** * A simple constraint that validates lb-config children. * @author yamini From 03fdc9219d291aef879abcf7b897636f26c63a15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 02:10:05 +0200 Subject: [PATCH 23/40] Imports: jms modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../jmq/management/DefaultTrustManager.java | 3 +- .../management/MQRMIClientSocketFactory.java | 3 +- .../admin/cli/ChangeMasterBrokerCommand.java | 5 ++- .../jms/admin/cli/ConfigureJMSCluster.java | 36 ++++++++------- .../jms/admin/cli/CreateJMSHost.java | 31 +++++++------ .../jms/admin/cli/DeleteJMSHost.java | 27 ++++++----- .../jms/admin/cli/FlushJMSDestination.java | 45 ++++++++++--------- .../jms/admin/cli/JMSDestination.java | 40 ++++++++++------- .../org/glassfish/jms/admin/cli/JMSPing.java | 2 +- .../glassfish/jms/admin/cli/ListJMSHosts.java | 29 ++++++------ .../jms/admin/cli/MQJMXConnectorInfo.java | 15 ++++--- .../UpdateJmsPhysicalDestinationCommand.java | 19 +++++--- .../jms/config/JmsAvailability.java | 16 +++---- .../connectors/jms/config/JmsHost.java | 24 +++++----- .../injection/AbstractJMSContextManager.java | 12 ++--- .../jms/injection/ForwardingJMSContext.java | 4 +- .../jms/injection/InjectableJMSContext.java | 26 +++++------ .../jms/injection/JMSCDIExtension.java | 14 +++--- .../jms/injection/JMSContextEntry.java | 4 +- .../connectors/jms/JMSLoggerInfo.java | 1 + .../connectors/jms/system/JmsHostWrapper.java | 7 +-- .../jms/system/JmsProviderLifecycle.java | 31 ++++--------- 22 files changed, 209 insertions(+), 185 deletions(-) diff --git a/appserver/jms/admin/src/main/java/com/sun/messaging/jmq/management/DefaultTrustManager.java b/appserver/jms/admin/src/main/java/com/sun/messaging/jmq/management/DefaultTrustManager.java index 1c284047307..eae2e53e484 100644 --- a/appserver/jms/admin/src/main/java/com/sun/messaging/jmq/management/DefaultTrustManager.java +++ b/appserver/jms/admin/src/main/java/com/sun/messaging/jmq/management/DefaultTrustManager.java @@ -20,10 +20,9 @@ package com.sun.messaging.jmq.management; -import javax.net.ssl.X509TrustManager; import java.security.cert.X509Certificate; -//import com.sun.messaging.jmq.util.log.Logger; +import javax.net.ssl.X509TrustManager; /* * IMPORTANT NOTE: Please do not modify this file directly. This source code is owned and shipped as a part of MQ but has only been included here diff --git a/appserver/jms/admin/src/main/java/com/sun/messaging/jmq/management/MQRMIClientSocketFactory.java b/appserver/jms/admin/src/main/java/com/sun/messaging/jmq/management/MQRMIClientSocketFactory.java index 8bbf668d231..2e76d585050 100644 --- a/appserver/jms/admin/src/main/java/com/sun/messaging/jmq/management/MQRMIClientSocketFactory.java +++ b/appserver/jms/admin/src/main/java/com/sun/messaging/jmq/management/MQRMIClientSocketFactory.java @@ -27,12 +27,11 @@ import java.io.IOException; import java.net.Socket; - import java.rmi.server.RMISocketFactory; +import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocketFactory; -import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; import javax.rmi.ssl.SslRMIClientSocketFactory; diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ChangeMasterBrokerCommand.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ChangeMasterBrokerCommand.java index ac0f3a6e7ff..b316cc64d20 100755 --- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ChangeMasterBrokerCommand.java +++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ChangeMasterBrokerCommand.java @@ -28,8 +28,11 @@ import com.sun.enterprise.connectors.jms.util.JmsRaUtil; import com.sun.enterprise.util.LocalStringManagerImpl; +import jakarta.inject.Inject; + import java.beans.PropertyVetoException; import java.util.List; + import javax.management.MBeanServerConnection; import javax.management.ObjectName; import javax.management.openmbean.CompositeData; @@ -53,8 +56,6 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; - /** * Change JMS Master Broker Command diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ConfigureJMSCluster.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ConfigureJMSCluster.java index 6b2193197ed..d6c6222e1c4 100755 --- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ConfigureJMSCluster.java +++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ConfigureJMSCluster.java @@ -16,36 +16,40 @@ package org.glassfish.jms.admin.cli; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.connectors.jms.config.JmsAvailability; import com.sun.enterprise.connectors.jms.config.JmsService; -import org.glassfish.api.I18n; -import org.glassfish.api.Param; -import org.glassfish.api.ActionReport; -import org.glassfish.api.admin.*; import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.config.serverbeans.*; -import org.glassfish.api.admin.AdminCommand; -import org.glassfish.api.admin.AdminCommandContext; -import org.glassfish.api.admin.RuntimeType; -import com.sun.enterprise.config.serverbeans.Cluster; +import jakarta.inject.Inject; +import java.beans.PropertyVetoException; import java.util.List; import java.util.Locale; -import java.util.Properties; import java.util.Map; -import java.beans.PropertyVetoException; - -import jakarta.inject.Inject; - -import org.jvnet.hk2.annotations.Service; +import java.util.Properties; +import org.glassfish.api.ActionReport; +import org.glassfish.api.I18n; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandRunner; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; -import org.jvnet.hk2.config.types.Property; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; +import org.jvnet.hk2.config.types.Property; /** diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSHost.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSHost.java index c7d212d894b..f5fe5a5be37 100644 --- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSHost.java +++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSHost.java @@ -16,36 +16,39 @@ package org.glassfish.jms.admin.cli; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.connectors.jms.config.JmsHost; import com.sun.enterprise.connectors.jms.config.JmsService; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import java.beans.PropertyVetoException; +import java.util.Map; +import java.util.Properties; + +import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.ActionReport; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandRunner; import org.glassfish.api.admin.ExecuteOn; import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; -import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.api.admin.RuntimeType; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.SystemPropertyConstants; -import com.sun.enterprise.config.serverbeans.*; -import java.util.Properties; -import java.beans.PropertyVetoException; -import org.jvnet.hk2.annotations.Service; - import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; import org.jvnet.hk2.config.types.Property; -import java.util.Map; - -import jakarta.inject.Inject; -import jakarta.inject.Named; /** * Create Admin Object Command diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSHost.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSHost.java index dc7143b100e..d41cfc142ee 100644 --- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSHost.java +++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSHost.java @@ -16,25 +16,32 @@ package org.glassfish.jms.admin.cli; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.connectors.jms.config.JmsHost; import com.sun.enterprise.connectors.jms.config.JmsService; -import org.glassfish.api.I18n; -import org.glassfish.api.ActionReport; -import org.glassfish.api.Param; import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.config.serverbeans.*; import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.config.support.CommandTarget; -import org.glassfish.config.support.TargetType; - -import java.beans.PropertyVetoException; import jakarta.inject.Inject; -import org.glassfish.api.admin.*; -import org.jvnet.hk2.annotations.Service; +import java.beans.PropertyVetoException; +import org.glassfish.api.ActionReport; +import org.glassfish.api.I18n; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.config.support.CommandTarget; +import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/FlushJMSDestination.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/FlushJMSDestination.java index a10754f2b3f..9b9117ac312 100644 --- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/FlushJMSDestination.java +++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/FlushJMSDestination.java @@ -17,36 +17,41 @@ package org.glassfish.jms.admin.cli; -import org.glassfish.api.I18n; -import org.glassfish.api.Param; -import org.glassfish.api.ActionReport; -import org.glassfish.internal.api.ServerContext; -import org.glassfish.internal.api.Globals; - -import java.util.logging.Logger; -import java.util.logging.Level; -import java.util.List; - +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.connectors.jms.util.JmsRaUtil; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; -import com.sun.enterprise.config.serverbeans.*; -import com.sun.enterprise.connectors.jms.util.JmsRaUtil; import jakarta.inject.Inject; import jakarta.inject.Named; -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; -import javax.management.MalformedObjectNameException; -import org.jvnet.hk2.annotations.Service; - -import org.glassfish.hk2.api.PerLookup; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; -import org.glassfish.api.admin.*; +import javax.management.MBeanServerConnection; +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; -//import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.ActionReport; +import org.glassfish.api.I18n; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; +import org.glassfish.hk2.api.PerLookup; +import org.glassfish.internal.api.Globals; +import org.glassfish.internal.api.ServerContext; +import org.jvnet.hk2.annotations.Service; /** diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSDestination.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSDestination.java index 2fd0966e819..2f62cb50209 100644 --- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSDestination.java +++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSDestination.java @@ -17,40 +17,46 @@ package org.glassfish.jms.admin.cli; +import com.sun.appserv.connectors.internal.api.ConnectorConstants; +import com.sun.appserv.connectors.internal.api.ConnectorRuntime; +import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; +import com.sun.appserv.connectors.internal.api.ConnectorsUtil; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.connectors.ConnectorRegistry; import com.sun.enterprise.connectors.jms.config.JmsHost; import com.sun.enterprise.connectors.jms.config.JmsService; import com.sun.enterprise.connectors.jms.system.ActiveJmsResourceAdapter; import com.sun.enterprise.connectors.jms.system.MQAddressList; import com.sun.enterprise.connectors.jms.util.JmsRaUtil; -import com.sun.enterprise.connectors.ConnectorRegistry; import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.config.serverbeans.*; -import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; -import com.sun.appserv.connectors.internal.api.ConnectorConstants; -import com.sun.appserv.connectors.internal.api.ConnectorsUtil; -import com.sun.appserv.connectors.internal.api.ConnectorRuntime; import jakarta.resource.spi.ResourceAdapter; -import javax.management.AttributeList; -import javax.management.Attribute; -import java.util.logging.Logger; -import java.util.logging.Level; -import java.util.*; + +import java.io.PrintWriter; +import java.io.StringWriter; import java.lang.reflect.Method; import java.security.AccessController; import java.security.PrivilegedExceptionAction; -import java.io.StringWriter; -import java.io.PrintWriter; +import java.util.Enumeration; +import java.util.Map; +import java.util.Properties; +import java.util.StringTokenizer; +import java.util.logging.Level; +import java.util.logging.Logger; -import com.sun.enterprise.config.serverbeans.Cluster; +import javax.management.Attribute; +import javax.management.AttributeList; + +import org.glassfish.config.support.CommandTarget; +import org.glassfish.internal.api.Globals; import org.glassfish.internal.api.ServerContext; import static com.sun.enterprise.connectors.jms.system.ActiveJmsResourceAdapter.ADMINPASSWORD; import static com.sun.enterprise.connectors.jms.system.ActiveJmsResourceAdapter.ADMINUSERNAME; -import org.glassfish.internal.api.Globals; -import org.glassfish.config.support.CommandTarget; - /** * Common parent for JMS Destination admin commands */ diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSPing.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSPing.java index e10837fbd27..0585cb31fbd 100644 --- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSPing.java +++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSPing.java @@ -32,9 +32,9 @@ import jakarta.inject.Named; import jakarta.resource.ResourceException; -import java.util.Map.Entry; import java.lang.System.Logger; import java.lang.System.Logger.Level; +import java.util.Map.Entry; import java.util.Properties; import javax.security.auth.Subject; diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSHosts.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSHosts.java index 4a2ba572aaf..3382ac8f8a1 100644 --- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSHosts.java +++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSHosts.java @@ -16,29 +16,32 @@ package org.glassfish.jms.admin.cli; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.connectors.jms.config.JmsHost; import com.sun.enterprise.connectors.jms.config.JmsService; -import org.glassfish.api.I18n; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + +import java.util.ArrayList; + import org.glassfish.api.ActionReport; +import org.glassfish.api.I18n; import org.glassfish.api.Param; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandLock; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.config.serverbeans.*; -import com.sun.enterprise.util.SystemPropertyConstants; -import org.jvnet.hk2.annotations.Service; - -import org.glassfish.hk2.api.PerLookup; import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; -import org.glassfish.api.admin.RuntimeType; -import java.util.ArrayList; - -import jakarta.inject.Inject; - -import org.glassfish.api.admin.*; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; /** * List JMS Hosts command diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/MQJMXConnectorInfo.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/MQJMXConnectorInfo.java index 1c618c30653..f1441411245 100644 --- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/MQJMXConnectorInfo.java +++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/MQJMXConnectorInfo.java @@ -17,17 +17,18 @@ package org.glassfish.jms.admin.cli; -import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; +import com.sun.enterprise.util.LocalStringManagerImpl; -import javax.management.remote.JMXConnector; -import javax.management.remote.JMXServiceURL; -import javax.management.remote.JMXConnectorFactory; -import javax.management.MBeanServerConnection; +import java.io.IOException; import java.util.Map; -import java.util.logging.Logger; import java.util.logging.Level; -import java.io.IOException; +import java.util.logging.Logger; + +import javax.management.MBeanServerConnection; +import javax.management.remote.JMXConnector; +import javax.management.remote.JMXConnectorFactory; +import javax.management.remote.JMXServiceURL; /** * The MQJMXConnectorInfo holds MBean Server connection information diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/UpdateJmsPhysicalDestinationCommand.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/UpdateJmsPhysicalDestinationCommand.java index 42d7f46ca0f..c4a9544c870 100644 --- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/UpdateJmsPhysicalDestinationCommand.java +++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/UpdateJmsPhysicalDestinationCommand.java @@ -22,23 +22,32 @@ import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; -import java.util.Properties; -import java.util.logging.Level; import jakarta.inject.Inject; import jakarta.inject.Named; + +import java.util.Properties; +import java.util.logging.Level; + import javax.management.AttributeList; import javax.management.MBeanServerConnection; import javax.management.ObjectName; + import org.glassfish.api.ActionReport; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; +import org.glassfish.hk2.api.PerLookup; import org.glassfish.internal.api.ServerContext; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; /** * diff --git a/appserver/jms/gf-jms-connector/src/main/java/com/sun/enterprise/connectors/jms/config/JmsAvailability.java b/appserver/jms/gf-jms-connector/src/main/java/com/sun/enterprise/connectors/jms/config/JmsAvailability.java index 4c5577b5d97..0f94557a2be 100644 --- a/appserver/jms/gf-jms-connector/src/main/java/com/sun/enterprise/connectors/jms/config/JmsAvailability.java +++ b/appserver/jms/gf-jms-connector/src/main/java/com/sun/enterprise/connectors/jms/config/JmsAvailability.java @@ -18,20 +18,20 @@ package com.sun.enterprise.connectors.jms.config; import com.sun.enterprise.config.serverbeans.AvailabilityServiceExtension; -import org.glassfish.api.admin.config.ConfigExtension; -import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.Element; -import org.jvnet.hk2.config.Configured; -import org.jvnet.hk2.config.types.Property; + +import jakarta.validation.constraints.Pattern; import java.beans.PropertyVetoException; import java.util.List; +import org.glassfish.api.admin.config.ConfigExtension; import org.glassfish.api.admin.config.PropertiesDesc; -import org.jvnet.hk2.config.types.PropertyBag; -import jakarta.validation.constraints.Pattern; - import org.glassfish.quality.ToDo; +import org.jvnet.hk2.config.Attribute; +import org.jvnet.hk2.config.Configured; +import org.jvnet.hk2.config.Element; +import org.jvnet.hk2.config.types.Property; +import org.jvnet.hk2.config.types.PropertyBag; /** * diff --git a/appserver/jms/gf-jms-connector/src/main/java/com/sun/enterprise/connectors/jms/config/JmsHost.java b/appserver/jms/gf-jms-connector/src/main/java/com/sun/enterprise/connectors/jms/config/JmsHost.java index 0195a37e8a9..fdafe2391e2 100644 --- a/appserver/jms/gf-jms-connector/src/main/java/com/sun/enterprise/connectors/jms/config/JmsHost.java +++ b/appserver/jms/gf-jms-connector/src/main/java/com/sun/enterprise/connectors/jms/config/JmsHost.java @@ -17,25 +17,23 @@ package com.sun.enterprise.connectors.jms.config; -import org.glassfish.api.admin.config.ConfigExtension; -import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.Element; -import org.jvnet.hk2.config.Configured; -import org.jvnet.hk2.config.types.Property; -import org.jvnet.hk2.config.types.PropertyBag; +import jakarta.validation.Payload; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import java.beans.PropertyVetoException; import java.util.List; -import org.glassfish.api.admin.config.PropertiesDesc; -import org.glassfish.api.admin.RestRedirects; import org.glassfish.api.admin.RestRedirect; - +import org.glassfish.api.admin.RestRedirects; +import org.glassfish.api.admin.config.ConfigExtension; +import org.glassfish.api.admin.config.PropertiesDesc; import org.glassfish.quality.ToDo; - -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Pattern; -import jakarta.validation.Payload; +import org.jvnet.hk2.config.Attribute; +import org.jvnet.hk2.config.Configured; +import org.jvnet.hk2.config.Element; +import org.jvnet.hk2.config.types.Property; +import org.jvnet.hk2.config.types.PropertyBag; /** * diff --git a/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/AbstractJMSContextManager.java b/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/AbstractJMSContextManager.java index c4583244672..da36eb798e7 100644 --- a/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/AbstractJMSContextManager.java +++ b/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/AbstractJMSContextManager.java @@ -17,6 +17,12 @@ package org.glassfish.jms.injection; +import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.annotation.PreDestroy; +import jakarta.jms.ConnectionFactory; +import jakarta.jms.JMSContext; + import java.io.Serializable; import java.util.HashMap; import java.util.Map; @@ -29,12 +35,6 @@ import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.api.Globals; -import com.sun.enterprise.util.LocalStringManagerImpl; - -import jakarta.annotation.PreDestroy; -import jakarta.jms.ConnectionFactory; -import jakarta.jms.JMSContext; - /** * This bean has a map to store JMSContext instances based on the injection point, that makes sure in one class, the * injected JMSContext beans of different injection point will not share the same request/trasaction scoped JMSContext diff --git a/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/ForwardingJMSContext.java b/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/ForwardingJMSContext.java index ec4c6fbd6e1..bc3c2698f66 100644 --- a/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/ForwardingJMSContext.java +++ b/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/ForwardingJMSContext.java @@ -17,8 +17,6 @@ package org.glassfish.jms.injection; -import java.io.Serializable; - import com.sun.enterprise.util.LocalStringManagerImpl; import jakarta.jms.BytesMessage; @@ -40,6 +38,8 @@ import jakarta.jms.TextMessage; import jakarta.jms.Topic; +import java.io.Serializable; + // Delegate all business methods to JMSContext API public abstract class ForwardingJMSContext implements JMSContext { private final static LocalStringManagerImpl localStrings = new LocalStringManagerImpl(ForwardingJMSContext.class); diff --git a/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/InjectableJMSContext.java b/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/InjectableJMSContext.java index b939e0a4d18..e154d9ab5c2 100644 --- a/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/InjectableJMSContext.java +++ b/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/InjectableJMSContext.java @@ -17,19 +17,6 @@ package org.glassfish.jms.injection; -import java.io.Serializable; -import java.util.UUID; -import java.util.logging.Level; -import java.util.logging.Logger; - -import javax.naming.InitialContext; -import javax.naming.NamingException; - -import org.glassfish.api.naming.SimpleJndiName; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.internal.api.Globals; -import org.glassfish.logging.annotation.LoggerInfo; - import com.sun.appserv.connectors.internal.api.ConnectorsUtil; import com.sun.enterprise.transaction.api.JavaEETransactionManager; import com.sun.enterprise.util.LocalStringManagerImpl; @@ -47,6 +34,19 @@ import jakarta.transaction.SystemException; import jakarta.transaction.Transaction; +import java.io.Serializable; +import java.util.UUID; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.naming.InitialContext; +import javax.naming.NamingException; + +import org.glassfish.api.naming.SimpleJndiName; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Globals; +import org.glassfish.logging.annotation.LoggerInfo; + /** * This bean is the JMSContext wrapper which user gets by injection. It can read metadata of injection point for it is * dependent scoped. It delegates all business methods of JMSContext interface to the JMSContext API via request scopd diff --git a/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/JMSCDIExtension.java b/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/JMSCDIExtension.java index 3233f6e9008..a29fc3f3ffa 100644 --- a/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/JMSCDIExtension.java +++ b/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/JMSCDIExtension.java @@ -17,13 +17,6 @@ package org.glassfish.jms.injection; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; - import jakarta.enterprise.context.Dependent; import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.context.spi.CreationalContext; @@ -41,6 +34,13 @@ import jakarta.enterprise.inject.spi.PassivationCapable; import jakarta.transaction.TransactionScoped; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + /* * This CDI portable extension can register JMSContext beans to be system-level * that can be injected into all applications. diff --git a/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/JMSContextEntry.java b/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/JMSContextEntry.java index ea6aa48be4e..6643495d397 100644 --- a/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/JMSContextEntry.java +++ b/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/JMSContextEntry.java @@ -17,12 +17,12 @@ package org.glassfish.jms.injection; +import jakarta.jms.JMSContext; + import java.io.Serializable; import org.glassfish.api.invocation.ComponentInvocation; -import jakarta.jms.JMSContext; - public class JMSContextEntry implements Serializable { private static final long serialVersionUID = 5250371279470306316L; diff --git a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/JMSLoggerInfo.java b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/JMSLoggerInfo.java index 20c6e6cce56..14b74f7ba51 100644 --- a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/JMSLoggerInfo.java +++ b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/JMSLoggerInfo.java @@ -17,6 +17,7 @@ package com.sun.enterprise.connectors.jms; import java.util.logging.Logger; + import org.glassfish.logging.annotation.LogMessageInfo; import org.glassfish.logging.annotation.LogMessagesResourceBundle; import org.glassfish.logging.annotation.LoggerInfo; diff --git a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JmsHostWrapper.java b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JmsHostWrapper.java index 35111ee1356..cbe81417774 100644 --- a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JmsHostWrapper.java +++ b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JmsHostWrapper.java @@ -16,13 +16,14 @@ package com.sun.enterprise.connectors.jms.system; -import java.beans.PropertyVetoException; - import com.sun.enterprise.connectors.jms.config.JmsHost; -import org.jvnet.hk2.config.types.Property; + +import java.beans.PropertyVetoException; import java.util.List; + import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.TransactionFailure; +import org.jvnet.hk2.config.types.Property; /** A wrapper class for the JmsHost serverbean since you cannot clone JmsHost * elements without being a part of a transaction * This class is primaritly used to create copies of the default jmshost element diff --git a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JmsProviderLifecycle.java b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JmsProviderLifecycle.java index 124c8f002dc..2129238823d 100644 --- a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JmsProviderLifecycle.java +++ b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JmsProviderLifecycle.java @@ -16,38 +16,25 @@ package com.sun.enterprise.connectors.jms.system; -//import org.glassfish.api.monitoring.MonitoringItem; -//import org.glassfish.jms.admin.monitor.config.JmsServiceMI; -import com.sun.enterprise.connectors.jms.config.JmsService; -import com.sun.enterprise.connectors.jms.config.JmsHost; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PostConstruct; -import org.glassfish.hk2.runlevel.RunLevel; -//import org.jvnet.hk2.config.ConfigSupport; -//import org.jvnet.hk2.config.SingleConfigCode; -//import org.jvnet.hk2.config.TransactionFailure; -import com.sun.appserv.connectors.internal.api.ConnectorRuntime; import com.sun.appserv.connectors.internal.api.ConnectorConstants; - +import com.sun.appserv.connectors.internal.api.ConnectorRuntime; import com.sun.appserv.connectors.internal.api.ConnectorRuntimeException; import com.sun.appserv.connectors.internal.api.ConnectorsUtil; -import org.glassfish.internal.api.PostStartupRunLevel; - import com.sun.enterprise.config.serverbeans.Config; - -import java.util.List; +import com.sun.enterprise.connectors.jms.config.JmsHost; +import com.sun.enterprise.connectors.jms.config.JmsService; import jakarta.inject.Inject; import jakarta.inject.Named; import jakarta.inject.Provider; -import org.glassfish.api.admin.ServerEnvironment; -//import com.sun.enterprise.config.serverbeans.MonitoringService; +import java.util.List; -//import java.beans.PropertyVetoException; -//import java.util.logging.Level; -//import java.util.logging.Logger; -//import java.util.List; +import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.hk2.api.PostConstruct; +import org.glassfish.hk2.runlevel.RunLevel; +import org.glassfish.internal.api.PostStartupRunLevel; +import org.jvnet.hk2.annotations.Service; @Service @RunLevel(value=PostStartupRunLevel.VAL, mode=RunLevel.RUNLEVEL_MODE_NON_VALIDATING) From 3ffc72a6f718257d668c4465fb4a5ae3534f2d14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 02:18:12 +0200 Subject: [PATCH 24/40] Imports: concurrency modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- ...CreateManagedScheduledExecutorService.java | 8 ++++-- .../admin/DeleteContextService.java | 5 ++-- .../admin/DeleteManagedExecutorService.java | 5 ++-- ...DeleteManagedScheduledExecutorService.java | 5 ++-- .../concurrent/admin/ListContextServices.java | 28 ++++++++++++++----- .../admin/ListManagedExecutorServices.java | 28 ++++++++++++++----- .../ListManagedScheduledExecutorServices.java | 25 +++++++++++++---- ...anagedScheduledExecutorServiceManager.java | 9 +++--- .../concurrent/runtime/LogFacade.java | 5 ++-- .../concurrent/runtime/ThreadMgmtData.java | 1 + .../runtime/TransactionHandleImpl.java | 4 +-- .../runtime/TransactionSetupProviderImpl.java | 5 ++-- .../runtime/deployer/cfg/CfgParserTest.java | 5 +++- 13 files changed, 93 insertions(+), 40 deletions(-) diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/CreateManagedScheduledExecutorService.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/CreateManagedScheduledExecutorService.java index 20944a9121e..0626222d128 100644 --- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/CreateManagedScheduledExecutorService.java +++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/CreateManagedScheduledExecutorService.java @@ -17,6 +17,11 @@ package org.glassfish.concurrent.admin; import com.sun.enterprise.config.serverbeans.Domain; + +import jakarta.inject.Inject; + +import java.util.HashMap; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.admin.AdminCommand; @@ -29,9 +34,6 @@ import org.glassfish.resourcebase.resources.api.ResourceStatus; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import java.util.HashMap; - /** * Create Managed Scheduled Executor Service Command diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteContextService.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteContextService.java index 05080d96472..da9b3adc439 100644 --- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteContextService.java +++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteContextService.java @@ -19,6 +19,9 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -32,8 +35,6 @@ import org.glassfish.resourcebase.resources.api.ResourceStatus; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; - /** * Delete Context Service Command * diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteManagedExecutorService.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteManagedExecutorService.java index eb86b5722af..a64812c2826 100644 --- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteManagedExecutorService.java +++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteManagedExecutorService.java @@ -19,6 +19,9 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -32,8 +35,6 @@ import org.glassfish.resourcebase.resources.api.ResourceStatus; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; - /** * Delete Managed Executor Service Command * diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteManagedScheduledExecutorService.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteManagedScheduledExecutorService.java index 6db544c1cab..db886651187 100644 --- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteManagedScheduledExecutorService.java +++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/DeleteManagedScheduledExecutorService.java @@ -19,6 +19,9 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -32,8 +35,6 @@ import org.glassfish.resourcebase.resources.api.ResourceStatus; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; - /** * Delete Managed Scheduled Executor Service Command * diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListContextServices.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListContextServices.java index 4342ac1e8f3..e1626073b49 100644 --- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListContextServices.java +++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListContextServices.java @@ -16,26 +16,40 @@ package org.glassfish.concurrent.admin; -import com.sun.enterprise.config.serverbeans.*; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Resources; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.api.naming.DefaultResourceProxy; +import org.glassfish.concurrent.config.ContextService; +import org.glassfish.concurrent.runtime.deployer.DefaultContextService; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.concurrent.config.ContextService; import org.glassfish.resourcebase.resources.util.BindableResourcesHelper; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import java.util.*; -import org.glassfish.concurrent.runtime.deployer.DefaultContextService; - /** * List Context Service Resources command * diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListManagedExecutorServices.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListManagedExecutorServices.java index 9ee984cb5f8..cbf1a610dc2 100644 --- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListManagedExecutorServices.java +++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListManagedExecutorServices.java @@ -16,26 +16,40 @@ package org.glassfish.concurrent.admin; -import com.sun.enterprise.config.serverbeans.*; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.Resources; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.api.naming.DefaultResourceProxy; +import org.glassfish.concurrent.config.ManagedExecutorService; +import org.glassfish.concurrent.runtime.deployer.DefaultManagedExecutorService; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.concurrent.config.ManagedExecutorService; import org.glassfish.resourcebase.resources.util.BindableResourcesHelper; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import java.util.*; -import org.glassfish.concurrent.runtime.deployer.DefaultManagedExecutorService; - /** * List Managed Executor Service Resources command * diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListManagedScheduledExecutorServices.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListManagedScheduledExecutorServices.java index 35ac973cc6f..57c06e8bf38 100644 --- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListManagedScheduledExecutorServices.java +++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ListManagedScheduledExecutorServices.java @@ -20,23 +20,36 @@ import com.sun.enterprise.config.serverbeans.Resources; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; + +import jakarta.inject.Inject; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.api.naming.DefaultResourceProxy; +import org.glassfish.concurrent.config.ManagedScheduledExecutorService; +import org.glassfish.concurrent.runtime.deployer.DefaultManagedScheduledExecutorService; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.concurrent.config.ManagedScheduledExecutorService; import org.glassfish.resourcebase.resources.util.BindableResourcesHelper; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import java.util.*; -import org.glassfish.concurrent.runtime.deployer.DefaultManagedScheduledExecutorService; - /** * List Managed Scheduled Executor Service Resources command * diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ManagedScheduledExecutorServiceManager.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ManagedScheduledExecutorServiceManager.java index d59daf3b7cc..1adb354805f 100644 --- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ManagedScheduledExecutorServiceManager.java +++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/admin/ManagedScheduledExecutorServiceManager.java @@ -18,16 +18,17 @@ import com.sun.enterprise.config.serverbeans.Resources; import com.sun.enterprise.config.serverbeans.ServerTags; + +import java.beans.PropertyVetoException; +import java.util.Properties; + +import org.glassfish.api.I18n; import org.glassfish.concurrent.config.ManagedExecutorServiceBase; import org.glassfish.concurrent.config.ManagedScheduledExecutorService; -import org.glassfish.api.I18n; import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.ConfiguredBy; import org.jvnet.hk2.config.TransactionFailure; -import java.beans.PropertyVetoException; -import java.util.Properties; - /** * * The managed scheduled executor service manager allows you to create and diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/LogFacade.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/LogFacade.java index 6d39537f0a5..e789f766468 100644 --- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/LogFacade.java +++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/LogFacade.java @@ -17,10 +17,11 @@ package org.glassfish.concurrent.runtime; +import java.util.logging.Logger; + import org.glassfish.logging.annotation.LogMessageInfo; -import org.glassfish.logging.annotation.LoggerInfo; import org.glassfish.logging.annotation.LogMessagesResourceBundle; -import java.util.logging.Logger; +import org.glassfish.logging.annotation.LoggerInfo; public class LogFacade { diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/ThreadMgmtData.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/ThreadMgmtData.java index 06cecc86241..728b267a997 100644 --- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/ThreadMgmtData.java +++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/ThreadMgmtData.java @@ -24,6 +24,7 @@ import java.lang.System.Logger.Level; import java.util.ArrayList; import java.util.List; + import static java.util.Collections.emptyList; /** diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/TransactionHandleImpl.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/TransactionHandleImpl.java index f417f0c85b3..34795fcdda2 100644 --- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/TransactionHandleImpl.java +++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/TransactionHandleImpl.java @@ -17,10 +17,10 @@ package org.glassfish.concurrent.runtime; -import org.glassfish.enterprise.concurrent.spi.TransactionHandle; - import jakarta.transaction.Transaction; +import org.glassfish.enterprise.concurrent.spi.TransactionHandle; + public class TransactionHandleImpl implements TransactionHandle { private Transaction transaction; diff --git a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/TransactionSetupProviderImpl.java b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/TransactionSetupProviderImpl.java index 74633fbaaeb..4746dd766e4 100644 --- a/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/TransactionSetupProviderImpl.java +++ b/appserver/concurrent/concurrent-impl/src/main/java/org/glassfish/concurrent/runtime/TransactionSetupProviderImpl.java @@ -18,8 +18,6 @@ package org.glassfish.concurrent.runtime; import com.sun.enterprise.transaction.api.JavaEETransactionManager; -import org.glassfish.enterprise.concurrent.spi.TransactionHandle; -import org.glassfish.enterprise.concurrent.spi.TransactionSetupProvider; import jakarta.enterprise.concurrent.ManagedTask; import jakarta.transaction.InvalidTransactionException; @@ -30,6 +28,9 @@ import java.util.logging.Level; import java.util.logging.Logger; +import org.glassfish.enterprise.concurrent.spi.TransactionHandle; +import org.glassfish.enterprise.concurrent.spi.TransactionSetupProvider; + public class TransactionSetupProviderImpl implements TransactionSetupProvider { private static final long serialVersionUID = 2278968807330359713L; diff --git a/appserver/concurrent/concurrent-impl/src/test/java/org/glassfish/concurrent/runtime/deployer/cfg/CfgParserTest.java b/appserver/concurrent/concurrent-impl/src/test/java/org/glassfish/concurrent/runtime/deployer/cfg/CfgParserTest.java index 4a5f0ec3854..562fec9aa06 100644 --- a/appserver/concurrent/concurrent-impl/src/test/java/org/glassfish/concurrent/runtime/deployer/cfg/CfgParserTest.java +++ b/appserver/concurrent/concurrent-impl/src/test/java/org/glassfish/concurrent/runtime/deployer/cfg/CfgParserTest.java @@ -21,11 +21,14 @@ import org.junit.jupiter.api.Test; +import static com.sun.enterprise.deployment.types.StandardContextType.Classloader; +import static com.sun.enterprise.deployment.types.StandardContextType.JNDI; +import static com.sun.enterprise.deployment.types.StandardContextType.Security; +import static com.sun.enterprise.deployment.types.StandardContextType.WorkArea; import static org.glassfish.concurrent.runtime.deployer.cfg.CfgParser.parseContextInfo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.junit.jupiter.api.Assertions.assertAll; -import static com.sun.enterprise.deployment.types.StandardContextType.*; /** * @author David Matejcek From f8c0e2e901b3fa8efcac2d719f9b10130edcaecf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 02:19:27 +0200 Subject: [PATCH 25/40] Imports: batch modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../glassfish/batch/AbstractListCommand.java | 18 ++++++----- .../batch/AbstractListCommandProxy.java | 16 +++++++--- .../batch/ListBatchJobExecutions.java | 31 ++++++++++++++----- .../batch/ListBatchJobExecutionsProxy.java | 13 ++++++-- .../glassfish/batch/ListBatchJobSteps.java | 28 ++++++++++++----- .../batch/ListBatchJobStepsProxy.java | 13 ++++++-- .../org/glassfish/batch/ListBatchJobs.java | 30 +++++++++++++----- .../glassfish/batch/ListBatchJobsProxy.java | 13 ++++++-- .../batch/ListBatchRuntimeConfiguration.java | 17 +++++++--- .../batch/SetBatchRuntimeConfiguration.java | 26 +++++++++++----- .../batch/spi/impl/BatchRuntimeHelper.java | 30 +++++++++++------- .../impl/GlassFishBatchSecurityHelper.java | 5 +-- .../spi/impl/ManagedServiceActivator.java | 4 +-- 13 files changed, 175 insertions(+), 69 deletions(-) diff --git a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/AbstractListCommand.java b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/AbstractListCommand.java index 9cde9230d9d..a1d179191d6 100644 --- a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/AbstractListCommand.java +++ b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/AbstractListCommand.java @@ -16,6 +16,17 @@ package org.glassfish.batch; +import jakarta.batch.operations.JobOperator; +import jakarta.batch.runtime.BatchRuntime; +import jakarta.inject.Inject; + +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import java.util.Properties; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.Param; import org.glassfish.api.admin.AdminCommand; @@ -23,13 +34,6 @@ import org.glassfish.batch.spi.impl.BatchRuntimeHelper; import org.glassfish.batch.spi.impl.GlassFishBatchSecurityHelper; -import jakarta.batch.operations.JobOperator; -import jakarta.batch.runtime.BatchRuntime; -import jakarta.inject.Inject; -import java.util.*; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * @author Mahesh Kannan * diff --git a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/AbstractListCommandProxy.java b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/AbstractListCommandProxy.java index 8127af586d6..ba665b37a07 100644 --- a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/AbstractListCommandProxy.java +++ b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/AbstractListCommandProxy.java @@ -18,16 +18,22 @@ import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.util.SystemPropertyConstants; -import org.glassfish.api.ActionReport; -import org.glassfish.api.Param; -import org.glassfish.api.admin.*; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.internal.api.Target; + import jakarta.inject.Inject; + import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; +import org.glassfish.api.ActionReport; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandRunner; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Target; + /** * Command to list batch jobs info * diff --git a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobExecutions.java b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobExecutions.java index 69407fa3dfc..f913f8bb50e 100644 --- a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobExecutions.java +++ b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobExecutions.java @@ -19,20 +19,37 @@ import com.ibm.jbatch.spi.TaggedJobExecution; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.util.ColumnFormatter; + +import jakarta.batch.operations.JobOperator; +import jakarta.batch.operations.JobSecurityException; +import jakarta.batch.operations.NoSuchJobException; +import jakarta.batch.operations.NoSuchJobExecutionException; +import jakarta.batch.operations.NoSuchJobInstanceException; +import jakarta.batch.runtime.JobExecution; +import jakarta.batch.runtime.JobInstance; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.StringTokenizer; +import java.util.logging.Level; + import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import jakarta.batch.operations.*; -import jakarta.batch.runtime.JobExecution; -import jakarta.batch.runtime.JobInstance; -import java.util.*; -import java.util.logging.Level; - /** * Command to list batch jobs info * diff --git a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobExecutionsProxy.java b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobExecutionsProxy.java index 097138717e8..547e5c7667a 100644 --- a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobExecutionsProxy.java +++ b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobExecutionsProxy.java @@ -17,17 +17,24 @@ package org.glassfish.batch; import com.sun.enterprise.config.serverbeans.Domain; + +import java.util.Properties; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import java.util.Properties; - /** * Command to list batch jobs info * diff --git a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobSteps.java b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobSteps.java index df3764dfa66..5e1fc905168 100644 --- a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobSteps.java +++ b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobSteps.java @@ -19,13 +19,6 @@ import com.ibm.jbatch.spi.TaggedJobExecution; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.util.ColumnFormatter; -import org.glassfish.api.I18n; -import org.glassfish.api.Param; -import org.glassfish.api.admin.*; -import org.glassfish.config.support.CommandTarget; -import org.glassfish.config.support.TargetType; -import org.glassfish.hk2.api.PerLookup; -import org.jvnet.hk2.annotations.Service; import jakarta.batch.operations.JobOperator; import jakarta.batch.operations.JobSecurityException; @@ -33,9 +26,28 @@ import jakarta.batch.runtime.JobExecution; import jakarta.batch.runtime.Metric; import jakarta.batch.runtime.StepExecution; -import java.util.*; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.StringTokenizer; import java.util.logging.Level; +import org.glassfish.api.I18n; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; +import org.glassfish.config.support.CommandTarget; +import org.glassfish.config.support.TargetType; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; + /** * Command to list batch jobs info * diff --git a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobStepsProxy.java b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobStepsProxy.java index b0643bc85fc..be67f585f58 100644 --- a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobStepsProxy.java +++ b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobStepsProxy.java @@ -17,17 +17,24 @@ package org.glassfish.batch; import com.sun.enterprise.config.serverbeans.Domain; + +import java.util.Properties; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import java.util.Properties; - /** * Command to list batch jobs info * diff --git a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobs.java b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobs.java index 18a3d7ba438..9acb7fd0dcb 100644 --- a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobs.java +++ b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobs.java @@ -19,20 +19,36 @@ import com.ibm.jbatch.spi.TaggedJobExecution; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.util.ColumnFormatter; + +import jakarta.batch.operations.JobOperator; +import jakarta.batch.operations.JobSecurityException; +import jakarta.batch.operations.NoSuchJobException; +import jakarta.batch.operations.NoSuchJobExecutionException; +import jakarta.batch.operations.NoSuchJobInstanceException; +import jakarta.batch.runtime.JobExecution; +import jakarta.batch.runtime.JobInstance; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.logging.Level; + import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import jakarta.batch.operations.*; -import jakarta.batch.runtime.JobExecution; -import jakarta.batch.runtime.JobInstance; -import java.util.*; -import java.util.logging.Level; - /** * Command to list batch jobs info * diff --git a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobsProxy.java b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobsProxy.java index 23b4d13617a..4d938d6b1ca 100644 --- a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobsProxy.java +++ b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobsProxy.java @@ -17,17 +17,24 @@ package org.glassfish.batch; import com.sun.enterprise.config.serverbeans.Domain; + +import java.util.Properties; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import java.util.Properties; - /** * Command to list batch jobs info * diff --git a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchRuntimeConfiguration.java b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchRuntimeConfiguration.java index 7da838d8404..9e3cc7374f4 100644 --- a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchRuntimeConfiguration.java +++ b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchRuntimeConfiguration.java @@ -19,9 +19,21 @@ import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.util.ColumnFormatter; + +import jakarta.inject.Inject; + +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.batch.spi.impl.BatchRuntimeConfiguration; import org.glassfish.batch.spi.impl.BatchRuntimeHelper; import org.glassfish.config.support.CommandTarget; @@ -30,9 +42,6 @@ import org.glassfish.internal.api.Target; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import java.util.*; - /** * Command to list batch jobs info * diff --git a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/SetBatchRuntimeConfiguration.java b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/SetBatchRuntimeConfiguration.java index 0b25d1bd449..9a42b25677e 100644 --- a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/SetBatchRuntimeConfiguration.java +++ b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/SetBatchRuntimeConfiguration.java @@ -18,10 +18,28 @@ import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; + +import jakarta.inject.Inject; + +import java.beans.PropertyVetoException; +import java.util.HashMap; +import java.util.List; +import java.util.Properties; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; -import org.glassfish.api.admin.*; +import org.glassfish.api.admin.AdminCommand; +import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.CommandLock; +import org.glassfish.api.admin.CommandRunner; +import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RuntimeType; import org.glassfish.batch.spi.impl.BatchRuntimeConfiguration; import org.glassfish.batch.spi.impl.GlassFishBatchValidationException; import org.glassfish.config.support.CommandTarget; @@ -34,12 +52,6 @@ import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import jakarta.inject.Inject; -import java.beans.PropertyVetoException; -import java.util.*; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * @author Mahesh Kannan * diff --git a/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeHelper.java b/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeHelper.java index 582c8f1b247..72cd3cca663 100644 --- a/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeHelper.java +++ b/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeHelper.java @@ -17,8 +17,26 @@ package org.glassfish.batch.spi.impl; -import com.ibm.jbatch.spi.*; +import com.ibm.jbatch.spi.BatchSPIManager; +import com.ibm.jbatch.spi.DatabaseAlreadyInitializedException; +import com.ibm.jbatch.spi.DatabaseConfigurationBean; +import com.ibm.jbatch.spi.ExecutorServiceProvider; import com.sun.enterprise.config.serverbeans.Config; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import java.util.HashSet; +import java.util.Properties; +import java.util.Set; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.naming.InitialContext; +import javax.naming.NamingException; + import org.glassfish.api.StartupRunLevel; import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.api.event.EventListener; @@ -35,16 +53,6 @@ import org.glassfish.internal.deployment.Deployment; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; -import jakarta.inject.Named; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import java.util.*; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * Helper class to get values for Batch Runtime. Follows * zero-config rules by using default values when the diff --git a/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/GlassFishBatchSecurityHelper.java b/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/GlassFishBatchSecurityHelper.java index 4430d06730a..8f0ea646edc 100644 --- a/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/GlassFishBatchSecurityHelper.java +++ b/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/GlassFishBatchSecurityHelper.java @@ -18,12 +18,13 @@ import com.ibm.jbatch.spi.BatchSecurityHelper; import com.sun.enterprise.config.serverbeans.Config; + +import jakarta.inject.Inject; + import org.glassfish.api.invocation.ComponentInvocation; import org.glassfish.api.invocation.InvocationManager; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; - @Service public class GlassFishBatchSecurityHelper implements BatchSecurityHelper { diff --git a/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/ManagedServiceActivator.java b/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/ManagedServiceActivator.java index 9b73328044c..c67dec6463f 100644 --- a/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/ManagedServiceActivator.java +++ b/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/ManagedServiceActivator.java @@ -16,10 +16,10 @@ package org.glassfish.batch.spi.impl; -import org.jvnet.hk2.annotations.Service; - import jakarta.inject.Inject; +import org.jvnet.hk2.annotations.Service; + /** * @author Mahesh Kannan */ From c8a05bd891cfbb68fde8711441807e7a49efe522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 02:23:24 +0200 Subject: [PATCH 26/40] Imports: admin gui modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../admingui/ClusterConsolePlugin.java | 3 +- .../admingui/CommandRecorder.java | 8 +++-- .../plugin/CommandRecorderConsolePlugin.java | 1 + .../factories/NavNodeContainerFactory.java | 1 + .../factories/NavigationNodeFactory.java | 1 + .../common/gadget/GadgetHandlers.java | 1 - .../common/handlers/ApplicationHandlers.java | 21 ++++++------ .../common/handlers/ClusterHandler.java | 13 ++++--- .../common/handlers/CommonHandlers.java | 32 ++++++++--------- .../common/handlers/DeploymentHandler.java | 8 ++--- .../common/handlers/InstanceHandler.java | 5 +-- .../common/handlers/JdbcTempHandler.java | 3 +- .../common/handlers/JmsResourceHandler.java | 2 ++ .../common/handlers/LogViewHandlers.java | 3 +- .../common/handlers/MonitoringHandlers.java | 17 +++++----- .../common/handlers/NewSSLHandlers.java | 7 ++-- .../common/handlers/PluginHandlers.java | 9 ++--- .../common/handlers/PreferencesHandler.java | 1 + .../common/handlers/ResourceHandlers.java | 7 ++-- .../common/handlers/RestApiHandlers.java | 11 ++++-- .../common/handlers/RestUtilHandlers.java | 5 +-- .../common/handlers/ScheduleHandlers.java | 12 +++---- .../common/handlers/SecurityHandler.java | 9 ++++- .../admingui/common/handlers/TagSupport.java | 1 + .../common/handlers/UtilHandlers.java | 12 +++---- .../common/handlers/WebAppHandlers.java | 6 ++-- .../admingui/common/help/HelpHandlers.java | 6 ++-- .../admingui/common/help/HelpTreeAdaptor.java | 9 ++--- .../common/help/HelpTreeIndexAdaptor.java | 10 +++--- .../common/plugin/CommonUtilPlugin.java | 4 +-- .../common/plugin/ConsoleClassLoader.java | 6 ++-- .../security/AdminConsoleAuthModule.java | 21 ++++++------ .../servlet/ClientStubsContentSource.java | 6 ++-- .../common/servlet/DownloadServlet.java | 18 +++++----- .../common/servlet/LBConfigContentSource.java | 6 ++-- .../common/servlet/LogFilesContentSource.java | 6 ++-- .../servlet/LogViewerContentSource.java | 6 ++-- .../admingui/common/tree/FilterTreeEvent.java | 5 +-- .../admingui/common/tree/ListTreeAdaptor.java | 9 +++-- .../admingui/common/util/AppUtil.java | 3 +- .../admingui/common/util/DeployUtil.java | 7 ++-- .../admingui/common/util/GuiUtil.java | 34 ++++++++----------- .../admingui/common/util/MiscUtil.java | 5 ++- .../admingui/common/util/RestUtil.java | 2 +- .../admingui/common/util/RestUtil2.java | 17 +++++----- .../admingui/common/util/TargetUtil.java | 12 +++++-- .../admingui/customtheme/ThemePlugin.java | 4 +-- .../admingui/ConcurrentConsolePlugin.java | 3 +- .../corba/admingui/CorbaConsolePlugin.java | 3 +- .../admingui/cdi/Hk2ServicesProducer.java | 1 + .../admingui/cdi/SecurityProducer.java | 2 ++ .../admingui/handlers/TableHandlers.java | 14 ++++---- .../admingui/handlers/ThemeHandlers.java | 5 ++- .../admingui/handlers/WoodstockHandler.java | 21 ++++++------ .../admingui/theme/AdminguiThemeContext.java | 3 +- .../admingui/util/SunOptionUtil.java | 2 ++ .../admingui/EjbLiteConsolePlugin.java | 3 +- .../ejb/admingui/EjbConsolePlugin.java | 3 +- .../full/admingui/JMailConsolePlugin.java | 3 +- .../full/admingui/handlers/JndiHandlers.java | 4 +-- .../admingui/connector/ConsoleConfig.java | 4 +-- .../admingui/connector/GadgetModule.java | 4 +-- .../glassfish/admingui/connector/Index.java | 4 +-- .../admingui/connector/IndexItem.java | 4 +-- .../admingui/connector/IntegrationPoint.java | 5 ++- .../org/glassfish/admingui/connector/TOC.java | 4 +-- .../glassfish/admingui/connector/TOCItem.java | 4 +-- .../jca/admingui/JcaConsolePlugin.java | 3 +- .../admingui/handlers/ConnectorsHandlers.java | 7 ++-- .../jdbc/admingui/JdbcConsolePlugin.java | 3 +- .../admingui/plugin/jms/JMXUtil.java | 1 + .../plugin/jms/PluginConsoleProvider.java | 4 +-- .../jts/admingui/JtsConsolePlugin.java | 3 +- .../admingui/plugin/ConsolePluginService.java | 26 +++++++------- .../web/admingui/WebConsolePlugin.java | 3 +- .../web/admingui/handlers/WebHandlers.java | 4 +-- 76 files changed, 300 insertions(+), 245 deletions(-) diff --git a/appserver/admingui/cluster/src/main/java/org/glassfish/cluster/admingui/ClusterConsolePlugin.java b/appserver/admingui/cluster/src/main/java/org/glassfish/cluster/admingui/ClusterConsolePlugin.java index e72184c7202..1dcf038e05b 100644 --- a/appserver/admingui/cluster/src/main/java/org/glassfish/cluster/admingui/ClusterConsolePlugin.java +++ b/appserver/admingui/cluster/src/main/java/org/glassfish/cluster/admingui/ClusterConsolePlugin.java @@ -21,9 +21,10 @@ package org.glassfish.cluster.admingui; +import java.net.URL; + import org.glassfish.api.admingui.ConsoleProvider; import org.jvnet.hk2.annotations.Service; -import java.net.URL; /** * @author anilam diff --git a/appserver/admingui/commandrecorder/src/main/java/org/glassfish/commandrecorder/admingui/CommandRecorder.java b/appserver/admingui/commandrecorder/src/main/java/org/glassfish/commandrecorder/admingui/CommandRecorder.java index 980fa349476..5968d2903c0 100644 --- a/appserver/admingui/commandrecorder/src/main/java/org/glassfish/commandrecorder/admingui/CommandRecorder.java +++ b/appserver/admingui/commandrecorder/src/main/java/org/glassfish/commandrecorder/admingui/CommandRecorder.java @@ -15,19 +15,21 @@ */ package org.glassfish.commandrecorder.admingui; -import static org.glassfish.extras.commandlogger.AdminCommandLogger.LogMode.NO_COMMAND; -import static org.glassfish.extras.commandlogger.AdminCommandLogger.LogMode.WRITE_COMMANDS; - import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.inject.Instance; import jakarta.inject.Inject; import jakarta.inject.Named; + import javax.security.auth.Subject; + import org.glassfish.api.ActionReport; import org.glassfish.api.admin.CommandRunner; import org.glassfish.api.admin.ParameterMap; import org.glassfish.extras.commandlogger.AdminCommandLogger; +import static org.glassfish.extras.commandlogger.AdminCommandLogger.LogMode.NO_COMMAND; +import static org.glassfish.extras.commandlogger.AdminCommandLogger.LogMode.WRITE_COMMANDS; + @Named @RequestScoped public class CommandRecorder { diff --git a/appserver/admingui/commandrecorder/src/main/java/org/glassfish/commandrecorder/admingui/plugin/CommandRecorderConsolePlugin.java b/appserver/admingui/commandrecorder/src/main/java/org/glassfish/commandrecorder/admingui/plugin/CommandRecorderConsolePlugin.java index e2f302f7f8f..4958a23bb03 100644 --- a/appserver/admingui/commandrecorder/src/main/java/org/glassfish/commandrecorder/admingui/plugin/CommandRecorderConsolePlugin.java +++ b/appserver/admingui/commandrecorder/src/main/java/org/glassfish/commandrecorder/admingui/plugin/CommandRecorderConsolePlugin.java @@ -16,6 +16,7 @@ package org.glassfish.commandrecorder.admingui.plugin; import java.net.URL; + import org.glassfish.api.admingui.ConsoleProvider; import org.jvnet.hk2.annotations.Service; diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/factories/NavNodeContainerFactory.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/factories/NavNodeContainerFactory.java index d50982b8bda..b80351f7173 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/factories/NavNodeContainerFactory.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/factories/NavNodeContainerFactory.java @@ -19,6 +19,7 @@ import com.sun.jsftemplating.annotation.UIComponentFactory; import com.sun.jsftemplating.component.factory.ComponentFactoryBase; import com.sun.jsftemplating.layout.descriptors.LayoutComponent; + import jakarta.faces.component.UIComponent; import jakarta.faces.context.FacesContext; diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/factories/NavigationNodeFactory.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/factories/NavigationNodeFactory.java index 30fbdcb668f..5e675fa6491 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/factories/NavigationNodeFactory.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/factories/NavigationNodeFactory.java @@ -19,6 +19,7 @@ import com.sun.jsftemplating.annotation.UIComponentFactory; import com.sun.jsftemplating.component.factory.ComponentFactoryBase; import com.sun.jsftemplating.layout.descriptors.LayoutComponent; + import jakarta.faces.component.UIComponent; import jakarta.faces.context.FacesContext; diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/gadget/GadgetHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/gadget/GadgetHandlers.java index e5cb0663e6f..1b71a4c051f 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/gadget/GadgetHandlers.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/gadget/GadgetHandlers.java @@ -38,7 +38,6 @@ import org.glassfish.admingui.common.util.GuiUtil; import org.glassfish.admingui.common.util.JSONUtil; import org.glassfish.admingui.connector.GadgetModule; - import org.jvnet.hk2.config.ConfigParser; import org.jvnet.hk2.config.DomDocument; diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ApplicationHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ApplicationHandlers.java index 321dee3280f..c7ff562bf23 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ApplicationHandlers.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ApplicationHandlers.java @@ -21,29 +21,30 @@ */ package org.glassfish.admingui.common.handlers; +import com.sun.jsftemplating.annotation.Handler; import com.sun.jsftemplating.annotation.HandlerInput; import com.sun.jsftemplating.annotation.HandlerOutput; -import com.sun.jsftemplating.annotation.Handler; import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; -import java.net.URLEncoder; -import java.net.InetAddress; +import java.net.InetAddress; +import java.net.URLEncoder; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; import java.util.HashMap; +import java.util.Iterator; import java.util.List; -import java.util.logging.Level; import java.util.Map; -import java.util.Iterator; -import java.util.Collection; -import java.util.Collections; -import java.util.TreeSet; import java.util.Set; -import org.glassfish.admingui.common.util.GuiUtil; +import java.util.TreeSet; +import java.util.logging.Level; + +import org.glassfish.admingui.common.util.AppUtil; import org.glassfish.admingui.common.util.DeployUtil; +import org.glassfish.admingui.common.util.GuiUtil; import org.glassfish.admingui.common.util.RestUtil; import org.glassfish.admingui.common.util.TargetUtil; -import org.glassfish.admingui.common.util.AppUtil; public class ApplicationHandlers { diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ClusterHandler.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ClusterHandler.java index c6402789e29..56e521d6dcf 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ClusterHandler.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ClusterHandler.java @@ -35,15 +35,20 @@ import com.sun.jsftemplating.annotation.HandlerInput; import com.sun.jsftemplating.annotation.HandlerOutput; import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; + +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.logging.Level; + import org.glassfish.admingui.common.util.GuiUtil; import org.glassfish.admingui.common.util.RestUtil; import org.glassfish.admingui.common.util.TargetUtil; import org.glassfish.api.admin.InstanceState; -import java.net.URLEncoder; -import java.util.*; -import java.util.logging.Level; - public class ClusterHandler { public static final String CLUSTER_RESOURCE_NAME = "org.glassfish.cluster.admingui.Strings"; diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/CommonHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/CommonHandlers.java index a5488af3845..3f267dea516 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/CommonHandlers.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/CommonHandlers.java @@ -26,6 +26,22 @@ package org.glassfish.admingui.common.handlers; +import com.sun.enterprise.config.serverbeans.ServerTags; +import com.sun.enterprise.util.SystemPropertyConstants; +import com.sun.jsftemplating.annotation.Handler; +import com.sun.jsftemplating.annotation.HandlerInput; +import com.sun.jsftemplating.annotation.HandlerOutput; +import com.sun.jsftemplating.el.PageSessionResolver; +import com.sun.jsftemplating.handlers.NavigationHandlers; +import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; +import com.sun.jsftemplating.util.Util; + +import jakarta.faces.component.UIComponent; +import jakarta.faces.component.UIInput; +import jakarta.faces.component.UIViewRoot; +import jakarta.faces.context.FacesContext; +import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.io.Serializable; import java.text.DateFormat; @@ -39,28 +55,12 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.jsftemplating.el.PageSessionResolver; import org.glassfish.admingui.common.tree.FilterTreeEvent; import org.glassfish.admingui.common.util.GuiUtil; import org.glassfish.admingui.common.util.MiscUtil; import org.glassfish.admingui.common.util.RestUtil; import org.glassfish.admingui.common.util.TargetUtil; -import com.sun.enterprise.config.serverbeans.ServerTags; -import com.sun.enterprise.util.SystemPropertyConstants; -import com.sun.jsftemplating.annotation.Handler; -import com.sun.jsftemplating.annotation.HandlerInput; -import com.sun.jsftemplating.annotation.HandlerOutput; -import com.sun.jsftemplating.handlers.NavigationHandlers; -import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; -import com.sun.jsftemplating.util.Util; - -import jakarta.faces.component.UIComponent; -import jakarta.faces.component.UIInput; -import jakarta.faces.component.UIViewRoot; -import jakarta.faces.context.FacesContext; -import jakarta.servlet.http.HttpServletResponse; - public class CommonHandlers { diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/DeploymentHandler.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/DeploymentHandler.java index 6ec5441acc8..e6865d96e60 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/DeploymentHandler.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/DeploymentHandler.java @@ -20,10 +20,6 @@ */ package org.glassfish.admingui.common.handlers; -import java.util.List; -import java.util.Map; -import java.util.Properties; - import com.sun.jsftemplating.annotation.Handler; import com.sun.jsftemplating.annotation.HandlerInput; import com.sun.jsftemplating.annotation.HandlerOutput; @@ -38,9 +34,13 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Properties; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; + import org.glassfish.admingui.common.util.AppUtil; import org.glassfish.admingui.common.util.DeployUtil; import org.glassfish.admingui.common.util.GuiUtil; diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/InstanceHandler.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/InstanceHandler.java index 64ecf2648d7..9b16f8689ee 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/InstanceHandler.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/InstanceHandler.java @@ -32,8 +32,6 @@ import com.sun.jsftemplating.annotation.HandlerInput; import com.sun.jsftemplating.annotation.HandlerOutput; import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; -import org.glassfish.admingui.common.util.GuiUtil; -import org.glassfish.admingui.common.util.RestUtil; import java.util.ArrayList; import java.util.HashMap; @@ -41,6 +39,9 @@ import java.util.Map; import java.util.logging.Level; +import org.glassfish.admingui.common.util.GuiUtil; +import org.glassfish.admingui.common.util.RestUtil; + public class InstanceHandler { /** Creates a new instance of InstanceHandler */ diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/JdbcTempHandler.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/JdbcTempHandler.java index 16660ac33ed..e32e1e68dac 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/JdbcTempHandler.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/JdbcTempHandler.java @@ -34,13 +34,12 @@ import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; import java.util.ArrayList; -import java.util.Map; import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; - import org.glassfish.admingui.common.util.GuiUtil; import org.glassfish.admingui.common.util.RestUtil; diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/JmsResourceHandler.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/JmsResourceHandler.java index f6f39f48d3d..b7b4ba366b4 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/JmsResourceHandler.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/JmsResourceHandler.java @@ -32,10 +32,12 @@ import com.sun.jsftemplating.annotation.HandlerInput; import com.sun.jsftemplating.annotation.HandlerOutput; import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; + import java.net.URLEncoder; import java.util.List; import java.util.Map; import java.util.logging.Level; + import org.glassfish.admingui.common.util.GuiUtil; import org.glassfish.admingui.common.util.RestUtil; diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/LogViewHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/LogViewHandlers.java index f0659f44c1f..4d9e0ce108f 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/LogViewHandlers.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/LogViewHandlers.java @@ -23,14 +23,15 @@ import com.sun.jsftemplating.util.Util; import java.text.DateFormat; -import java.text.SimpleDateFormat; import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.logging.Level; + import org.glassfish.admingui.common.util.GuiUtil; public class LogViewHandlers { diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/MonitoringHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/MonitoringHandlers.java index e5b5b125e2c..7dfcbc1aba0 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/MonitoringHandlers.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/MonitoringHandlers.java @@ -17,26 +17,25 @@ package org.glassfish.admingui.common.handlers; -import java.io.UnsupportedEncodingException; -import org.glassfish.admingui.common.util.GuiUtil; - import com.sun.jsftemplating.annotation.Handler; import com.sun.jsftemplating.annotation.HandlerInput; import com.sun.jsftemplating.annotation.HandlerOutput; import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; -import java.net.URLEncoder; -import java.util.List; -import java.util.HashMap; -import java.util.Map; -import java.util.ArrayList; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.text.DateFormat; +import java.util.ArrayList; import java.util.Arrays; -import java.util.Locale; import java.util.Date; +import java.util.HashMap; +import java.util.List; import java.util.ListIterator; +import java.util.Locale; +import java.util.Map; import java.util.logging.Level; +import org.glassfish.admingui.common.util.GuiUtil; import org.glassfish.admingui.common.util.RestUtil; /** diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/NewSSLHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/NewSSLHandlers.java index 13686c3ca6d..05ea2f59039 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/NewSSLHandlers.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/NewSSLHandlers.java @@ -23,13 +23,14 @@ package org.glassfish.admingui.common.handlers; -import java.util.Arrays; -import java.util.Vector; - import com.sun.jsftemplating.annotation.Handler; import com.sun.jsftemplating.annotation.HandlerInput; import com.sun.jsftemplating.annotation.HandlerOutput; import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; + +import java.util.Arrays; +import java.util.Vector; + import org.glassfish.admingui.common.util.GuiUtil; /** diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/PluginHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/PluginHandlers.java index 037d4ace027..d3f1079061b 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/PluginHandlers.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/PluginHandlers.java @@ -28,6 +28,10 @@ import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; import com.sun.jsftemplating.util.FileUtil; +import jakarta.faces.component.UIComponent; +import jakarta.faces.context.FacesContext; +import jakarta.servlet.ServletContext; + import java.io.IOException; import java.net.URL; import java.util.ArrayList; @@ -39,14 +43,11 @@ import java.util.Set; import java.util.TreeSet; import java.util.logging.Level; -import jakarta.faces.component.UIComponent; -import jakarta.faces.context.FacesContext; -import jakarta.servlet.ServletContext; import org.glassfish.admingui.common.factories.NavigationNodeFactory; import org.glassfish.admingui.common.util.GuiUtil; -import org.glassfish.admingui.plugin.ConsolePluginService; import org.glassfish.admingui.connector.IntegrationPoint; +import org.glassfish.admingui.plugin.ConsolePluginService; import org.glassfish.admingui.plugin.IntegrationPointComparator; import org.glassfish.hk2.api.ServiceLocator; diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/PreferencesHandler.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/PreferencesHandler.java index e0b48ba9465..18b9feb68fa 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/PreferencesHandler.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/PreferencesHandler.java @@ -24,6 +24,7 @@ import com.sun.jsftemplating.annotation.HandlerInput; import com.sun.jsftemplating.annotation.HandlerOutput; import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; + import java.util.List; /** diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ResourceHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ResourceHandlers.java index 14d36dc3943..0ac185d5af4 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ResourceHandlers.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ResourceHandlers.java @@ -16,16 +16,17 @@ package org.glassfish.admingui.common.handlers; -import java.util.Map; -import java.util.List; - import com.sun.jsftemplating.annotation.Handler; import com.sun.jsftemplating.annotation.HandlerInput; import com.sun.jsftemplating.annotation.HandlerOutput; import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; + import java.net.URLEncoder; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.glassfish.admingui.common.util.DeployUtil; import org.glassfish.admingui.common.util.GuiUtil; import org.glassfish.admingui.common.util.TargetUtil; diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/RestApiHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/RestApiHandlers.java index ca159b9fafa..3f272bed09e 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/RestApiHandlers.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/RestApiHandlers.java @@ -16,17 +16,24 @@ package org.glassfish.admingui.common.handlers; -import java.util.*; -import java.util.logging.Logger; import com.sun.jsftemplating.annotation.Handler; import com.sun.jsftemplating.annotation.HandlerInput; import com.sun.jsftemplating.annotation.HandlerOutput; import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; + import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.logging.Level; +import java.util.logging.Logger; + import org.glassfish.admingui.common.util.GuiUtil; import org.glassfish.admingui.common.util.RestResponse; import org.glassfish.admingui.common.util.RestUtil; + import static org.glassfish.admingui.common.util.RestUtil.appendEncodedSegment; import static org.glassfish.admingui.common.util.RestUtil.buildChildEntityList; import static org.glassfish.admingui.common.util.RestUtil.buildDefaultValueMap; diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/RestUtilHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/RestUtilHandlers.java index c3fc847bad1..534db80cdf4 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/RestUtilHandlers.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/RestUtilHandlers.java @@ -31,12 +31,13 @@ import com.sun.jsftemplating.annotation.Handler; import com.sun.jsftemplating.annotation.HandlerInput; import com.sun.jsftemplating.annotation.HandlerOutput; - import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; + import java.util.ArrayList; import java.util.HashMap; -import java.util.Map; import java.util.List; +import java.util.Map; + import org.glassfish.admingui.common.util.GuiUtil; import org.glassfish.admingui.common.util.RestUtil; diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ScheduleHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ScheduleHandlers.java index fb1ae9ca837..52413efb1a6 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ScheduleHandlers.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ScheduleHandlers.java @@ -16,16 +16,13 @@ package org.glassfish.admingui.common.handlers; -//import java.util.*; - - +import com.sun.jsftemplating.annotation.Handler; import com.sun.jsftemplating.annotation.HandlerInput; import com.sun.jsftemplating.annotation.HandlerOutput; -import com.sun.jsftemplating.annotation.Handler; import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; -import org.glassfish.admingui.common.util.GuiUtil; -import java.text.*; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collections; import java.util.Date; @@ -33,7 +30,10 @@ import java.util.List; import java.util.Map; import java.util.logging.Level; + +import org.glassfish.admingui.common.util.GuiUtil; import org.glassfish.admingui.common.util.RestUtil; + /** * * @author Siraj diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/SecurityHandler.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/SecurityHandler.java index ba82dddf9de..97e152256ee 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/SecurityHandler.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/SecurityHandler.java @@ -21,8 +21,15 @@ import com.sun.jsftemplating.annotation.HandlerInput; import com.sun.jsftemplating.annotation.HandlerOutput; import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; + import java.net.URLEncoder; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.logging.Level; import org.glassfish.admingui.common.util.GuiUtil; diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/TagSupport.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/TagSupport.java index 8090273dc2a..4b69fd4ee3a 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/TagSupport.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/TagSupport.java @@ -29,6 +29,7 @@ import java.util.Map; import java.util.StringTokenizer; import java.util.prefs.Preferences; + import org.glassfish.admingui.common.util.GuiUtil; /** diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java index ba8ae8ee2e1..9b22e01a65a 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java @@ -26,10 +26,6 @@ package org.glassfish.admingui.common.handlers; -import org.glassfish.admingui.common.util.GuiUtil; -import org.glassfish.admingui.common.util.JSONUtil; -import org.glassfish.admingui.common.util.RestUtil; - import com.sun.jsftemplating.annotation.Handler; import com.sun.jsftemplating.annotation.HandlerInput; import com.sun.jsftemplating.annotation.HandlerOutput; @@ -40,6 +36,8 @@ import com.sun.jsftemplating.layout.descriptors.handler.HandlerDefinition; import com.sun.jsftemplating.util.FileUtil; +import jakarta.faces.component.UIViewRoot; + import java.io.File; import java.io.FileNotFoundException; import java.io.UnsupportedEncodingException; @@ -54,12 +52,14 @@ import java.util.GregorianCalendar; import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.StringTokenizer; -import java.util.Map; import java.util.logging.Level; -import jakarta.faces.component.UIViewRoot; +import org.glassfish.admingui.common.util.GuiUtil; +import org.glassfish.admingui.common.util.JSONUtil; +import org.glassfish.admingui.common.util.RestUtil; /** * diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/WebAppHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/WebAppHandlers.java index f13416c00ac..e1cec839a3d 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/WebAppHandlers.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/WebAppHandlers.java @@ -28,19 +28,19 @@ */ package org.glassfish.admingui.common.handlers; +import com.sun.enterprise.config.serverbeans.ServerTags; +import com.sun.jsftemplating.annotation.Handler; import com.sun.jsftemplating.annotation.HandlerInput; import com.sun.jsftemplating.annotation.HandlerOutput; -import com.sun.jsftemplating.annotation.Handler; import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; -import com.sun.enterprise.config.serverbeans.ServerTags; import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.glassfish.admingui.common.util.GuiUtil; import org.glassfish.admingui.common.util.DeployUtil; +import org.glassfish.admingui.common.util.GuiUtil; import org.glassfish.admingui.common.util.RestResponse; import org.glassfish.admingui.common.util.RestUtil; diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/help/HelpHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/help/HelpHandlers.java index ad4c8cc70de..a8a0d0d6bc6 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/help/HelpHandlers.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/help/HelpHandlers.java @@ -21,13 +21,13 @@ import com.sun.jsftemplating.annotation.HandlerOutput; import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; +import java.util.Locale; + import org.glassfish.admingui.common.handlers.PluginHandlers; -import org.glassfish.admingui.plugin.ConsolePluginService; import org.glassfish.admingui.connector.Index; import org.glassfish.admingui.connector.IntegrationPoint; import org.glassfish.admingui.connector.TOC; - -import java.util.Locale; +import org.glassfish.admingui.plugin.ConsolePluginService; /** diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/help/HelpTreeAdaptor.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/help/HelpTreeAdaptor.java index b77504ee48f..4a710298579 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/help/HelpTreeAdaptor.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/help/HelpTreeAdaptor.java @@ -19,16 +19,17 @@ import com.sun.jsftemplating.component.factory.tree.TreeAdaptor; import com.sun.jsftemplating.component.factory.tree.TreeAdaptorBase; import com.sun.jsftemplating.layout.descriptors.LayoutComponent; + +import jakarta.faces.component.UIComponent; +import jakarta.faces.context.FacesContext; + +import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; - import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.io.Serializable; -import jakarta.faces.component.UIComponent; -import jakarta.faces.context.FacesContext; import org.glassfish.admingui.connector.TOC; import org.glassfish.admingui.connector.TOCItem; diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/help/HelpTreeIndexAdaptor.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/help/HelpTreeIndexAdaptor.java index ce8814ee37a..5eabe0b7090 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/help/HelpTreeIndexAdaptor.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/help/HelpTreeIndexAdaptor.java @@ -19,16 +19,18 @@ import com.sun.jsftemplating.component.factory.tree.TreeAdaptor; import com.sun.jsftemplating.component.factory.tree.TreeAdaptorBase; import com.sun.jsftemplating.layout.descriptors.LayoutComponent; + +import jakarta.faces.component.UIComponent; +import jakarta.faces.context.FacesContext; + +import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; - import java.util.HashMap; import java.util.List; import java.util.Map; -import java.io.Serializable; -import jakarta.faces.component.UIComponent; -import jakarta.faces.context.FacesContext; + import org.glassfish.admingui.connector.Index; import org.glassfish.admingui.connector.IndexItem; diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/plugin/CommonUtilPlugin.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/plugin/CommonUtilPlugin.java index 70da9e3aa47..63303cae3c5 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/plugin/CommonUtilPlugin.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/plugin/CommonUtilPlugin.java @@ -16,11 +16,11 @@ package org.glassfish.admingui.common.plugin; +import java.net.URL; + import org.glassfish.api.admingui.ConsoleProvider; import org.jvnet.hk2.annotations.Service; -import java.net.URL; - /** *

      This is a noop file just to help test out the {@link ConsoleProvider} diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/plugin/ConsoleClassLoader.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/plugin/ConsoleClassLoader.java index e61323007b3..80b1760a74a 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/plugin/ConsoleClassLoader.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/plugin/ConsoleClassLoader.java @@ -16,13 +16,11 @@ package org.glassfish.admingui.common.plugin; -import java.net.URL; -import java.net.URLClassLoader; - import jakarta.faces.context.FacesContext; import jakarta.servlet.ServletContext; -//import static com.sun.enterprise.web.Constants.HABITAT_ATTRIBUTE; +import java.net.URL; +import java.net.URLClassLoader; import org.glassfish.admingui.plugin.ConsolePluginService; import org.glassfish.hk2.api.ServiceLocator; diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/security/AdminConsoleAuthModule.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/security/AdminConsoleAuthModule.java index 791699c0ccf..98bd3075748 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/security/AdminConsoleAuthModule.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/security/AdminConsoleAuthModule.java @@ -21,6 +21,16 @@ import com.sun.enterprise.config.serverbeans.SecureAdmin; import com.sun.enterprise.security.SecurityServicesUtil; +import jakarta.security.auth.message.AuthException; +import jakarta.security.auth.message.AuthStatus; +import jakarta.security.auth.message.MessageInfo; +import jakarta.security.auth.message.MessagePolicy; +import jakarta.security.auth.message.callback.CallerPrincipalCallback; +import jakarta.security.auth.message.module.ServerAuthModule; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.ClientBuilder; import jakarta.ws.rs.client.Entity; @@ -40,17 +50,6 @@ import javax.security.auth.Subject; import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; -import jakarta.security.auth.message.AuthException; -import jakarta.security.auth.message.AuthStatus; -import jakarta.security.auth.message.MessageInfo; -import jakarta.security.auth.message.MessagePolicy; -import jakarta.security.auth.message.callback.CallerPrincipalCallback; -import jakarta.security.auth.message.module.ServerAuthModule; -import jakarta.servlet.RequestDispatcher; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.servlet.http.HttpSession; - import org.glassfish.admingui.common.util.GuiUtil; import org.glassfish.admingui.common.util.RestResponse; diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/servlet/ClientStubsContentSource.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/servlet/ClientStubsContentSource.java index f7540aed622..54fbe09766d 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/servlet/ClientStubsContentSource.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/servlet/ClientStubsContentSource.java @@ -16,17 +16,17 @@ package org.glassfish.admingui.common.servlet; -import java.io.File; -import java.io.InputStream; +import jakarta.servlet.http.HttpServletRequest; +import java.io.File; import java.io.FileInputStream; +import java.io.InputStream; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; import java.util.Map; -import jakarta.servlet.http.HttpServletRequest; import org.glassfish.admingui.common.util.RestUtil; /** diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/servlet/DownloadServlet.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/servlet/DownloadServlet.java index a38160f29b0..84f915e9be2 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/servlet/DownloadServlet.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/servlet/DownloadServlet.java @@ -16,15 +16,6 @@ package org.glassfish.admingui.common.servlet; -import org.glassfish.common.util.InputValidationUtil; - -import java.io.IOException; -import java.io.BufferedInputStream; -import java.io.InputStream; -import java.util.HashMap; -import java.util.Map; -import java.util.StringTokenizer; - import jakarta.servlet.Servlet; import jakarta.servlet.ServletConfig; import jakarta.servlet.ServletException; @@ -34,6 +25,15 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.HashMap; +import java.util.Map; +import java.util.StringTokenizer; + +import org.glassfish.common.util.InputValidationUtil; + /** diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/servlet/LBConfigContentSource.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/servlet/LBConfigContentSource.java index b3a03e1f7b5..5903a2244f4 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/servlet/LBConfigContentSource.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/servlet/LBConfigContentSource.java @@ -25,10 +25,11 @@ package org.glassfish.admingui.common.servlet; -import java.io.File; -import java.io.InputStream; +import jakarta.servlet.http.HttpServletRequest; +import java.io.File; import java.io.FileInputStream; +import java.io.InputStream; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; @@ -36,7 +37,6 @@ import java.util.Map; import org.glassfish.admingui.common.util.RestUtil; -import jakarta.servlet.http.HttpServletRequest; /** * diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/servlet/LogFilesContentSource.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/servlet/LogFilesContentSource.java index a845bdc314d..94f65860580 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/servlet/LogFilesContentSource.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/servlet/LogFilesContentSource.java @@ -16,17 +16,17 @@ package org.glassfish.admingui.common.servlet; -import java.io.File; -import java.io.InputStream; +import jakarta.servlet.http.HttpServletRequest; +import java.io.File; import java.io.FileInputStream; +import java.io.InputStream; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; import java.util.Map; -import jakarta.servlet.http.HttpServletRequest; import org.glassfish.admingui.common.util.RestUtil; /** diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/servlet/LogViewerContentSource.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/servlet/LogViewerContentSource.java index 88d1a7edddc..6d7037be5c5 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/servlet/LogViewerContentSource.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/servlet/LogViewerContentSource.java @@ -16,13 +16,13 @@ package org.glassfish.admingui.common.servlet; -import java.io.InputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.Response; +import java.io.InputStream; import java.util.HashMap; import java.util.Map; import java.util.StringTokenizer; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.ws.rs.core.Response; import org.glassfish.admingui.common.util.RestUtil; diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/tree/FilterTreeEvent.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/tree/FilterTreeEvent.java index 922815a7cce..db66e3fdc0d 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/tree/FilterTreeEvent.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/tree/FilterTreeEvent.java @@ -15,12 +15,13 @@ */ package org.glassfish.admingui.common.tree; -// import com.sun.jsftemplating.layout.event.EventObjectBase; -import java.util.List; + import jakarta.faces.component.UIComponent; +import java.util.List; + /** * * @author Ken Paulsen (ken.paulsen@sun.com) diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/tree/ListTreeAdaptor.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/tree/ListTreeAdaptor.java index 9fa8b02ff50..16d19d8f61d 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/tree/ListTreeAdaptor.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/tree/ListTreeAdaptor.java @@ -21,15 +21,18 @@ import com.sun.jsftemplating.component.factory.tree.TreeAdaptorBase; import com.sun.jsftemplating.layout.descriptors.LayoutComponent; import com.sun.jsftemplating.layout.event.CommandActionListener; + +import jakarta.faces.component.ActionSource; +import jakarta.faces.component.UIComponent; +import jakarta.faces.context.FacesContext; + import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Properties; -import jakarta.faces.component.ActionSource; -import jakarta.faces.component.UIComponent; -import jakarta.faces.context.FacesContext; + import org.glassfish.admingui.common.util.GuiUtil; diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/AppUtil.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/AppUtil.java index 83971d877e8..85d317ba314 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/AppUtil.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/AppUtil.java @@ -21,6 +21,8 @@ package org.glassfish.admingui.common.util; +import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; + import java.net.URLEncoder; import java.util.ArrayList; import java.util.Collections; @@ -28,7 +30,6 @@ import java.util.List; import java.util.Map; import java.util.logging.Level; -import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; /** diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/DeployUtil.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/DeployUtil.java index 6e484983716..0a5beff4de9 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/DeployUtil.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/DeployUtil.java @@ -21,14 +21,15 @@ package org.glassfish.admingui.common.util; -import java.util.ArrayList; -import java.util.List; import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; + import java.net.URLDecoder; import java.net.URLEncoder; +import java.util.ArrayList; import java.util.HashMap; -import java.util.logging.Level; +import java.util.List; import java.util.Map; +import java.util.logging.Level; /** * diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/GuiUtil.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/GuiUtil.java index 6bead61aba4..c2f9a123d86 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/GuiUtil.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/GuiUtil.java @@ -24,34 +24,30 @@ */ package org.glassfish.admingui.common.util; +import com.sun.jsftemplating.annotation.Handler; +import com.sun.jsftemplating.annotation.HandlerInput; +import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; import com.sun.jsftemplating.resource.ResourceBundleManager; +import jakarta.faces.context.ExternalContext; import jakarta.faces.context.FacesContext; -// FIXME: 7-31-08 -- FIX by importing woodstock api's: -//import com.sun.webui.jsf.model.Option; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.http.HttpServletRequest; -import java.util.Locale; -import java.util.Map; +import java.io.File; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.text.MessageFormat; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.ArrayList; -import java.util.StringTokenizer; +import java.util.Locale; +import java.util.Map; import java.util.ResourceBundle; +import java.util.StringTokenizer; import java.util.logging.Level; import java.util.logging.Logger; -import java.text.MessageFormat; -import java.net.URLEncoder; - -import com.sun.jsftemplating.annotation.Handler; -import com.sun.jsftemplating.annotation.HandlerInput; -import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; -import java.io.File; - -import java.io.UnsupportedEncodingException; -import jakarta.faces.context.ExternalContext; -import jakarta.servlet.ServletContext; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.http.HttpServletRequest; import org.glassfish.admingui.common.security.AdminConsoleAuthModule; import org.glassfish.hk2.api.ServiceLocator; diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/MiscUtil.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/MiscUtil.java index 9d4a2a443fa..1a8677d15d2 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/MiscUtil.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/MiscUtil.java @@ -16,12 +16,15 @@ package org.glassfish.admingui.common.util; -import java.io.ByteArrayInputStream; import jakarta.el.ValueExpression; import jakarta.faces.context.FacesContext; + +import java.io.ByteArrayInputStream; + import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; + import org.w3c.dom.Document; /** diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil.java index 2c6e58d8333..2dad88521d5 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil.java @@ -59,8 +59,8 @@ import javax.net.ssl.SSLSession; import javax.xml.parsers.ParserConfigurationException; -import org.glassfish.api.ActionReport.ExitCode; import org.glassfish.admingui.common.security.AdminConsoleAuthModule; +import org.glassfish.api.ActionReport.ExitCode; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.jersey.client.filter.CsrfProtectionFilter; import org.glassfish.jersey.jackson.JacksonFeature; diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil2.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil2.java index 02996ae359e..0f2150ca2e7 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil2.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil2.java @@ -20,22 +20,21 @@ */ package org.glassfish.admingui.common.util; -import java.util.List; -import java.util.Map; -import java.util.logging.Level; - -import jakarta.ws.rs.core.Cookie; -import jakarta.ws.rs.core.MediaType; - -import jakarta.faces.context.FacesContext; - import com.sun.jsftemplating.annotation.Handler; import com.sun.jsftemplating.annotation.HandlerInput; import com.sun.jsftemplating.annotation.HandlerOutput; import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; + +import jakarta.faces.context.FacesContext; import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; +import java.util.List; +import java.util.Map; +import java.util.logging.Level; + /** * This class is intended to replace, eventually, RestUtil. Whether or not that happens depends in large part on how the * new console is built. In the meantime, though, there is a need for REST-related utilities that behave in a manner not diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/TargetUtil.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/TargetUtil.java index 3b4d78073b4..5402c31337c 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/TargetUtil.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/TargetUtil.java @@ -21,12 +21,18 @@ package org.glassfish.admingui.common.util; -import org.glassfish.admingui.common.handlers.RestUtilHandlers; - import java.net.URLEncoder; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.logging.Level; +import org.glassfish.admingui.common.handlers.RestUtilHandlers; + /** * * @author anilam diff --git a/appserver/admingui/community-theme/src/main/java/org/glassfish/admingui/customtheme/ThemePlugin.java b/appserver/admingui/community-theme/src/main/java/org/glassfish/admingui/customtheme/ThemePlugin.java index 32c82f4b5ba..cd38474d27b 100644 --- a/appserver/admingui/community-theme/src/main/java/org/glassfish/admingui/customtheme/ThemePlugin.java +++ b/appserver/admingui/community-theme/src/main/java/org/glassfish/admingui/customtheme/ThemePlugin.java @@ -16,11 +16,11 @@ package org.glassfish.admingui.customtheme; +import java.net.URL; + import org.glassfish.api.admingui.ConsoleProvider; import org.jvnet.hk2.annotations.Service; -import java.net.URL; - /** *

      This is a noop file just to help test out the {@link ConsoleProvider} diff --git a/appserver/admingui/concurrent/src/main/java/org/glassfish/concurrent/admingui/ConcurrentConsolePlugin.java b/appserver/admingui/concurrent/src/main/java/org/glassfish/concurrent/admingui/ConcurrentConsolePlugin.java index b59a1ed68e6..42641a8d1a4 100644 --- a/appserver/admingui/concurrent/src/main/java/org/glassfish/concurrent/admingui/ConcurrentConsolePlugin.java +++ b/appserver/admingui/concurrent/src/main/java/org/glassfish/concurrent/admingui/ConcurrentConsolePlugin.java @@ -21,9 +21,10 @@ package org.glassfish.concurrent.admingui; +import java.net.URL; + import org.glassfish.api.admingui.ConsoleProvider; import org.jvnet.hk2.annotations.Service; -import java.net.URL; /** * diff --git a/appserver/admingui/corba/src/main/java/org/glassfish/corba/admingui/CorbaConsolePlugin.java b/appserver/admingui/corba/src/main/java/org/glassfish/corba/admingui/CorbaConsolePlugin.java index 144e50ee3e4..ab5386020a7 100644 --- a/appserver/admingui/corba/src/main/java/org/glassfish/corba/admingui/CorbaConsolePlugin.java +++ b/appserver/admingui/corba/src/main/java/org/glassfish/corba/admingui/CorbaConsolePlugin.java @@ -21,9 +21,10 @@ package org.glassfish.corba.admingui; +import java.net.URL; + import org.glassfish.api.admingui.ConsoleProvider; import org.jvnet.hk2.annotations.Service; -import java.net.URL; /** * diff --git a/appserver/admingui/core/src/main/java/org/glassfish/admingui/cdi/Hk2ServicesProducer.java b/appserver/admingui/core/src/main/java/org/glassfish/admingui/cdi/Hk2ServicesProducer.java index eb1d05ac2d5..5aaaadcb52c 100644 --- a/appserver/admingui/core/src/main/java/org/glassfish/admingui/cdi/Hk2ServicesProducer.java +++ b/appserver/admingui/core/src/main/java/org/glassfish/admingui/cdi/Hk2ServicesProducer.java @@ -17,6 +17,7 @@ import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Produces; + import org.glassfish.api.ActionReport; import org.glassfish.api.admin.CommandRunner; import org.glassfish.internal.api.Globals; diff --git a/appserver/admingui/core/src/main/java/org/glassfish/admingui/cdi/SecurityProducer.java b/appserver/admingui/core/src/main/java/org/glassfish/admingui/cdi/SecurityProducer.java index f093b9e9373..9c3aa340863 100644 --- a/appserver/admingui/core/src/main/java/org/glassfish/admingui/cdi/SecurityProducer.java +++ b/appserver/admingui/core/src/main/java/org/glassfish/admingui/cdi/SecurityProducer.java @@ -18,8 +18,10 @@ import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Produces; import jakarta.security.enterprise.SecurityContext; + import java.security.Principal; import java.util.Set; + import javax.security.auth.Subject; @ApplicationScoped diff --git a/appserver/admingui/core/src/main/java/org/glassfish/admingui/handlers/TableHandlers.java b/appserver/admingui/core/src/main/java/org/glassfish/admingui/handlers/TableHandlers.java index 1292081ec45..e43e2b7b3b2 100644 --- a/appserver/admingui/core/src/main/java/org/glassfish/admingui/handlers/TableHandlers.java +++ b/appserver/admingui/core/src/main/java/org/glassfish/admingui/handlers/TableHandlers.java @@ -31,25 +31,23 @@ package org.glassfish.admingui.handlers; +import com.sun.data.provider.RowKey; import com.sun.jsftemplating.annotation.Handler; import com.sun.jsftemplating.annotation.HandlerInput; import com.sun.jsftemplating.annotation.HandlerOutput; import com.sun.jsftemplating.component.dataprovider.MultipleListDataProvider; import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; - -import org.glassfish.admingui.common.util.GuiUtil; - import com.sun.webui.jsf.component.TableRowGroup; +import java.util.ArrayList; import java.util.HashMap; -import java.util.Properties; -import java.util.Map; +import java.util.Iterator; import java.util.List; -import java.util.ArrayList; import java.util.ListIterator; -import java.util.Iterator; +import java.util.Map; +import java.util.Properties; -import com.sun.data.provider.RowKey; +import org.glassfish.admingui.common.util.GuiUtil; public class TableHandlers { /** Creates a new instance of TableHandler */ diff --git a/appserver/admingui/core/src/main/java/org/glassfish/admingui/handlers/ThemeHandlers.java b/appserver/admingui/core/src/main/java/org/glassfish/admingui/handlers/ThemeHandlers.java index e310b64ccf8..d2773ef029b 100644 --- a/appserver/admingui/core/src/main/java/org/glassfish/admingui/handlers/ThemeHandlers.java +++ b/appserver/admingui/core/src/main/java/org/glassfish/admingui/handlers/ThemeHandlers.java @@ -22,11 +22,14 @@ import com.sun.jsftemplating.annotation.HandlerOutput; import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; import com.sun.webui.theme.ThemeContext; + +import jakarta.faces.context.FacesContext; + import java.net.URL; import java.util.Iterator; import java.util.List; import java.util.Properties; -import jakarta.faces.context.FacesContext; + import org.glassfish.admingui.common.handlers.PluginHandlers; import org.glassfish.admingui.common.plugin.ConsoleClassLoader; import org.glassfish.admingui.connector.IntegrationPoint; diff --git a/appserver/admingui/core/src/main/java/org/glassfish/admingui/handlers/WoodstockHandler.java b/appserver/admingui/core/src/main/java/org/glassfish/admingui/handlers/WoodstockHandler.java index 07c415e6fbf..9d5178aedad 100644 --- a/appserver/admingui/core/src/main/java/org/glassfish/admingui/handlers/WoodstockHandler.java +++ b/appserver/admingui/core/src/main/java/org/glassfish/admingui/handlers/WoodstockHandler.java @@ -29,35 +29,34 @@ import com.sun.jsftemplating.annotation.HandlerInput; import com.sun.jsftemplating.annotation.HandlerOutput; import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; - import com.sun.webui.jsf.component.Calendar; -import com.sun.webui.jsf.model.UploadedFile; +import com.sun.webui.jsf.component.DropDown; import com.sun.webui.jsf.component.Hyperlink; +import com.sun.webui.jsf.model.Option; +import com.sun.webui.jsf.model.OptionGroup; +import com.sun.webui.jsf.model.UploadedFile; import jakarta.faces.context.ExternalContext; import jakarta.faces.context.FacesContext; import jakarta.faces.model.SelectItem; -import com.sun.webui.jsf.model.Option; -import com.sun.webui.jsf.model.OptionGroup; -import com.sun.webui.jsf.component.DropDown; import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.Map; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.ListIterator; -import java.util.ArrayList; +import java.util.Map; +import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; -import org.glassfish.admingui.common.util.GuiUtil; import org.glassfish.admingui.common.handlers.MonitoringHandlers; +import org.glassfish.admingui.common.util.GuiUtil; import org.glassfish.admingui.common.util.RestUtil; import org.glassfish.admingui.util.SunOptionUtil; diff --git a/appserver/admingui/core/src/main/java/org/glassfish/admingui/theme/AdminguiThemeContext.java b/appserver/admingui/core/src/main/java/org/glassfish/admingui/theme/AdminguiThemeContext.java index 783822b88b7..7aec87caed5 100644 --- a/appserver/admingui/core/src/main/java/org/glassfish/admingui/theme/AdminguiThemeContext.java +++ b/appserver/admingui/core/src/main/java/org/glassfish/admingui/theme/AdminguiThemeContext.java @@ -20,10 +20,11 @@ import com.sun.webui.theme.ServletThemeContext; import com.sun.webui.theme.ThemeContext; +import jakarta.faces.context.FacesContext; + import java.util.HashMap; import java.util.Map; import java.util.Properties; -import jakarta.faces.context.FacesContext; /** diff --git a/appserver/admingui/core/src/main/java/org/glassfish/admingui/util/SunOptionUtil.java b/appserver/admingui/core/src/main/java/org/glassfish/admingui/util/SunOptionUtil.java index 43d67271491..bde1a738864 100644 --- a/appserver/admingui/core/src/main/java/org/glassfish/admingui/util/SunOptionUtil.java +++ b/appserver/admingui/core/src/main/java/org/glassfish/admingui/util/SunOptionUtil.java @@ -22,7 +22,9 @@ package org.glassfish.admingui.util; import com.sun.webui.jsf.model.Option; + import jakarta.faces.model.SelectItem; + import java.lang.reflect.Array; import java.lang.reflect.Constructor; diff --git a/appserver/admingui/ejb-lite/src/main/java/org/glassfish/ejblite/admingui/EjbLiteConsolePlugin.java b/appserver/admingui/ejb-lite/src/main/java/org/glassfish/ejblite/admingui/EjbLiteConsolePlugin.java index 5a163d5d1ed..ed7f924ab87 100644 --- a/appserver/admingui/ejb-lite/src/main/java/org/glassfish/ejblite/admingui/EjbLiteConsolePlugin.java +++ b/appserver/admingui/ejb-lite/src/main/java/org/glassfish/ejblite/admingui/EjbLiteConsolePlugin.java @@ -21,9 +21,10 @@ package org.glassfish.ejblite.admingui; +import java.net.URL; + import org.glassfish.api.admingui.ConsoleProvider; import org.jvnet.hk2.annotations.Service; -import java.net.URL; /** * diff --git a/appserver/admingui/ejb/src/main/java/org/glassfish/ejb/admingui/EjbConsolePlugin.java b/appserver/admingui/ejb/src/main/java/org/glassfish/ejb/admingui/EjbConsolePlugin.java index 2fd6869090b..719887d55fd 100644 --- a/appserver/admingui/ejb/src/main/java/org/glassfish/ejb/admingui/EjbConsolePlugin.java +++ b/appserver/admingui/ejb/src/main/java/org/glassfish/ejb/admingui/EjbConsolePlugin.java @@ -21,9 +21,10 @@ package org.glassfish.ejb.admingui; +import java.net.URL; + import org.glassfish.api.admingui.ConsoleProvider; import org.jvnet.hk2.annotations.Service; -import java.net.URL; /** * diff --git a/appserver/admingui/full/src/main/java/org/glassfish/full/admingui/JMailConsolePlugin.java b/appserver/admingui/full/src/main/java/org/glassfish/full/admingui/JMailConsolePlugin.java index 675049f83e2..874e6d9d2a0 100644 --- a/appserver/admingui/full/src/main/java/org/glassfish/full/admingui/JMailConsolePlugin.java +++ b/appserver/admingui/full/src/main/java/org/glassfish/full/admingui/JMailConsolePlugin.java @@ -21,9 +21,10 @@ package org.glassfish.full.admingui; +import java.net.URL; + import org.glassfish.api.admingui.ConsoleProvider; import org.jvnet.hk2.annotations.Service; -import java.net.URL; /** * diff --git a/appserver/admingui/full/src/main/java/org/glassfish/full/admingui/handlers/JndiHandlers.java b/appserver/admingui/full/src/main/java/org/glassfish/full/admingui/handlers/JndiHandlers.java index 3583e2e446e..248c2d95c18 100644 --- a/appserver/admingui/full/src/main/java/org/glassfish/full/admingui/handlers/JndiHandlers.java +++ b/appserver/admingui/full/src/main/java/org/glassfish/full/admingui/handlers/JndiHandlers.java @@ -32,10 +32,10 @@ import com.sun.jsftemplating.annotation.HandlerOutput; import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; -import java.util.List; import java.util.ArrayList; -import java.util.Map; import java.util.HashMap; +import java.util.List; +import java.util.Map; public class JndiHandlers { diff --git a/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/ConsoleConfig.java b/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/ConsoleConfig.java index f2ed6637eca..af2b2cb9ba8 100644 --- a/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/ConsoleConfig.java +++ b/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/ConsoleConfig.java @@ -16,12 +16,12 @@ package org.glassfish.admingui.connector; +import java.util.List; + import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.Element; -import java.util.List; - /** *

      This class is configured via XML (i.e. a console-config.xml file). diff --git a/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/GadgetModule.java b/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/GadgetModule.java index 074416fdef4..63d420867ab 100644 --- a/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/GadgetModule.java +++ b/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/GadgetModule.java @@ -16,11 +16,11 @@ package org.glassfish.admingui.connector; +import java.util.List; + import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.Element; -import java.util.List; - /** *

      This class is configured via XML. This is done via the HK2 diff --git a/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/Index.java b/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/Index.java index 81bb53414e9..6220b6cdea1 100644 --- a/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/Index.java +++ b/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/Index.java @@ -16,12 +16,12 @@ package org.glassfish.admingui.connector; +import java.util.List; + import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.Element; -import java.util.List; - /** *

      This class is configured via XML (i.e. a console-config.xml file). diff --git a/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/IndexItem.java b/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/IndexItem.java index b1e4ff9880a..673623cca00 100644 --- a/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/IndexItem.java +++ b/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/IndexItem.java @@ -16,12 +16,12 @@ package org.glassfish.admingui.connector; +import java.util.List; + import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.Element; -import java.util.List; - /** *

      This class is configured via XML (i.e. a console-config.xml file). diff --git a/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/IntegrationPoint.java b/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/IntegrationPoint.java index a91201c3cab..63bd7b576c9 100644 --- a/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/IntegrationPoint.java +++ b/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/IntegrationPoint.java @@ -16,13 +16,12 @@ package org.glassfish.admingui.connector; -import org.glassfish.api.admingui.ConsoleProvider; +import java.io.Serializable; +import org.glassfish.api.admingui.ConsoleProvider; import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.Configured; -import java.io.Serializable; - /** *

      An IntegrationPoint represents the data necessary to diff --git a/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/TOC.java b/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/TOC.java index b5076d77e95..a348bafa6c2 100644 --- a/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/TOC.java +++ b/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/TOC.java @@ -17,12 +17,12 @@ package org.glassfish.admingui.connector; +import java.util.List; + import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.Element; -import java.util.List; - /** *

      This class is configured via XML (i.e. a console-config.xml file). diff --git a/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/TOCItem.java b/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/TOCItem.java index e94d955cfe4..96c2edd88d4 100644 --- a/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/TOCItem.java +++ b/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/TOCItem.java @@ -16,12 +16,12 @@ package org.glassfish.admingui.connector; +import java.util.List; + import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.Element; -import java.util.List; - /** *

      This class is configured via XML (i.e. a console-config.xml file). diff --git a/appserver/admingui/jca/src/main/java/org/glassfish/jca/admingui/JcaConsolePlugin.java b/appserver/admingui/jca/src/main/java/org/glassfish/jca/admingui/JcaConsolePlugin.java index 5c1e296991c..90528a6ced9 100644 --- a/appserver/admingui/jca/src/main/java/org/glassfish/jca/admingui/JcaConsolePlugin.java +++ b/appserver/admingui/jca/src/main/java/org/glassfish/jca/admingui/JcaConsolePlugin.java @@ -21,9 +21,10 @@ package org.glassfish.jca.admingui; +import java.net.URL; + import org.glassfish.api.admingui.ConsoleProvider; import org.jvnet.hk2.annotations.Service; -import java.net.URL; /** * diff --git a/appserver/admingui/jca/src/main/java/org/glassfish/jca/admingui/handlers/ConnectorsHandlers.java b/appserver/admingui/jca/src/main/java/org/glassfish/jca/admingui/handlers/ConnectorsHandlers.java index 09c16fc2ec3..f020d792140 100644 --- a/appserver/admingui/jca/src/main/java/org/glassfish/jca/admingui/handlers/ConnectorsHandlers.java +++ b/appserver/admingui/jca/src/main/java/org/glassfish/jca/admingui/handlers/ConnectorsHandlers.java @@ -32,13 +32,12 @@ import com.sun.jsftemplating.annotation.HandlerOutput; import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; -import java.util.List; import java.util.ArrayList; -import java.util.Map; import java.util.HashMap; - - +import java.util.List; +import java.util.Map; import java.util.StringTokenizer; + import org.glassfish.admingui.common.util.GuiUtil; diff --git a/appserver/admingui/jdbc/src/main/java/org/glassfish/jdbc/admingui/JdbcConsolePlugin.java b/appserver/admingui/jdbc/src/main/java/org/glassfish/jdbc/admingui/JdbcConsolePlugin.java index 68b469dfbb4..49ea0959516 100644 --- a/appserver/admingui/jdbc/src/main/java/org/glassfish/jdbc/admingui/JdbcConsolePlugin.java +++ b/appserver/admingui/jdbc/src/main/java/org/glassfish/jdbc/admingui/JdbcConsolePlugin.java @@ -21,9 +21,10 @@ package org.glassfish.jdbc.admingui; +import java.net.URL; + import org.glassfish.api.admingui.ConsoleProvider; import org.jvnet.hk2.annotations.Service; -import java.net.URL; /** * diff --git a/appserver/admingui/jms-plugin/src/main/java/org/glassfish/admingui/plugin/jms/JMXUtil.java b/appserver/admingui/jms-plugin/src/main/java/org/glassfish/admingui/plugin/jms/JMXUtil.java index 3a73a56d47d..636d6858e42 100644 --- a/appserver/admingui/jms-plugin/src/main/java/org/glassfish/admingui/plugin/jms/JMXUtil.java +++ b/appserver/admingui/jms-plugin/src/main/java/org/glassfish/admingui/plugin/jms/JMXUtil.java @@ -23,6 +23,7 @@ import java.lang.management.ManagementFactory; import java.util.Set; + import javax.management.Attribute; import javax.management.MBeanServerConnection; import javax.management.MalformedObjectNameException; diff --git a/appserver/admingui/jms-plugin/src/main/java/org/glassfish/admingui/plugin/jms/PluginConsoleProvider.java b/appserver/admingui/jms-plugin/src/main/java/org/glassfish/admingui/plugin/jms/PluginConsoleProvider.java index ad209b36ab5..b6654e93cdb 100644 --- a/appserver/admingui/jms-plugin/src/main/java/org/glassfish/admingui/plugin/jms/PluginConsoleProvider.java +++ b/appserver/admingui/jms-plugin/src/main/java/org/glassfish/admingui/plugin/jms/PluginConsoleProvider.java @@ -16,11 +16,11 @@ package org.glassfish.admingui.plugin.jms; +import java.net.URL; + import org.glassfish.api.admingui.ConsoleProvider; import org.jvnet.hk2.annotations.Service; -import java.net.URL; - /** *

      This class serves as a marker to indicate this OSGi bundle provides GUI * content which is to be displayed in the GlassFish admin console. The diff --git a/appserver/admingui/jts/src/main/java/org/glassfish/jts/admingui/JtsConsolePlugin.java b/appserver/admingui/jts/src/main/java/org/glassfish/jts/admingui/JtsConsolePlugin.java index 0f7ab2ad44f..92827feb6bf 100644 --- a/appserver/admingui/jts/src/main/java/org/glassfish/jts/admingui/JtsConsolePlugin.java +++ b/appserver/admingui/jts/src/main/java/org/glassfish/jts/admingui/JtsConsolePlugin.java @@ -21,9 +21,10 @@ package org.glassfish.jts.admingui; +import java.net.URL; + import org.glassfish.api.admingui.ConsoleProvider; import org.jvnet.hk2.annotations.Service; -import java.net.URL; /** * diff --git a/appserver/admingui/plugin-service/src/main/java/org/glassfish/admingui/plugin/ConsolePluginService.java b/appserver/admingui/plugin-service/src/main/java/org/glassfish/admingui/plugin/ConsolePluginService.java index 23c6996c85d..a76b85f533d 100644 --- a/appserver/admingui/plugin-service/src/main/java/org/glassfish/admingui/plugin/ConsolePluginService.java +++ b/appserver/admingui/plugin-service/src/main/java/org/glassfish/admingui/plugin/ConsolePluginService.java @@ -17,34 +17,32 @@ package org.glassfish.admingui.plugin; -import org.glassfish.api.admingui.ConsoleProvider; - -import org.glassfish.hk2.api.IterableProvider; -import org.glassfish.hk2.api.ServiceLocator; -import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.component.MultiMap; -import org.jvnet.hk2.config.ConfigParser; -import org.jvnet.hk2.config.DomDocument; +import jakarta.inject.Inject; import java.io.IOException; import java.net.URL; import java.util.ArrayList; import java.util.Enumeration; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.glassfish.admingui.connector.TOC; -import org.glassfish.admingui.connector.TOCItem; +import org.glassfish.admingui.connector.ConsoleConfig; import org.glassfish.admingui.connector.Index; import org.glassfish.admingui.connector.IndexItem; import org.glassfish.admingui.connector.IntegrationPoint; -import org.glassfish.admingui.connector.ConsoleConfig; - -import jakarta.inject.Inject; -import java.util.Iterator; +import org.glassfish.admingui.connector.TOC; +import org.glassfish.admingui.connector.TOCItem; +import org.glassfish.api.admingui.ConsoleProvider; +import org.glassfish.hk2.api.IterableProvider; +import org.glassfish.hk2.api.ServiceLocator; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.component.MultiMap; +import org.jvnet.hk2.config.ConfigParser; +import org.jvnet.hk2.config.DomDocument; /** *

      diff --git a/appserver/admingui/web/src/main/java/org/glassfish/web/admingui/WebConsolePlugin.java b/appserver/admingui/web/src/main/java/org/glassfish/web/admingui/WebConsolePlugin.java index 865bd20035c..8729c53fd22 100644 --- a/appserver/admingui/web/src/main/java/org/glassfish/web/admingui/WebConsolePlugin.java +++ b/appserver/admingui/web/src/main/java/org/glassfish/web/admingui/WebConsolePlugin.java @@ -21,9 +21,10 @@ package org.glassfish.web.admingui; +import java.net.URL; + import org.glassfish.api.admingui.ConsoleProvider; import org.jvnet.hk2.annotations.Service; -import java.net.URL; /** * diff --git a/appserver/admingui/web/src/main/java/org/glassfish/web/admingui/handlers/WebHandlers.java b/appserver/admingui/web/src/main/java/org/glassfish/web/admingui/handlers/WebHandlers.java index db322fd2d50..0243267e687 100644 --- a/appserver/admingui/web/src/main/java/org/glassfish/web/admingui/handlers/WebHandlers.java +++ b/appserver/admingui/web/src/main/java/org/glassfish/web/admingui/handlers/WebHandlers.java @@ -17,8 +17,6 @@ package org.glassfish.web.admingui.handlers; -import java.util.Map; - import com.sun.jsftemplating.annotation.Handler; import com.sun.jsftemplating.annotation.HandlerInput; import com.sun.jsftemplating.annotation.HandlerOutput; @@ -26,6 +24,8 @@ import java.util.HashMap; import java.util.List; +import java.util.Map; + import org.glassfish.admingui.common.util.GuiUtil; /** From 42096768185cdc28569ac33be55503e816de5f86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 02:31:06 +0200 Subject: [PATCH 27/40] Imports: additional removals and ordering MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../admin/monitor/registry/MonitoredObjectType.java | 2 +- .../enterprise/admin/monitor/stats/PWCDnsStats.java | 7 +++---- .../admin/monitor/stats/PWCKeepAliveStats.java | 12 ++++-------- .../admin/monitor/stats/PWCThreadPoolStats.java | 10 ++++------ .../connectors/admin/cli/CreateAdminObject.java | 4 ++-- .../admin/cli/CreateConnectorConnectionPool.java | 6 +++--- .../admin/cli/CreateConnectorResource.java | 6 +++--- .../admin/cli/CreateResourceAdapterConfig.java | 2 +- .../enterprise/iiop/impl/GlassFishORBManager.java | 2 +- .../enterprise/iiop/impl/IORAddrAnyInitializer.java | 3 +-- .../persistence/enhancer/ByteCodeEnhancerHelper.java | 3 --- .../jdo/api/persistence/enhancer/FilterEnhancer.java | 1 - .../api/persistence/enhancer/impl/ClassControl.java | 1 - .../api/persistence/enhancer/impl/Environment.java | 2 -- .../api/persistence/enhancer/impl/FieldAction.java | 1 - .../persistence/enhancer/impl/MethodAnnotater.java | 1 - .../enterprise/security/ee/J2EESecurityManager.java | 2 -- .../org/glassfish/weld/ACLSingletonProvider.java | 2 +- .../config/support/TranslatedConfigView.java | 1 - .../admin/servermgmt/RepositoryManager.java | 12 ------------ .../glassfish/admin/amx/core/proxy/ProxyFactory.java | 1 - .../admin/amx/logging/LogQueryEntryImpl.java | 1 - .../sun/enterprise/universal/xml/ParsedCluster.java | 1 - .../java/com/sun/enterprise/util/ObjectAnalyzer.java | 1 - .../weblogic/workarea/WorkContextLocalMap.java | 2 -- 25 files changed, 24 insertions(+), 62 deletions(-) diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/registry/MonitoredObjectType.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/registry/MonitoredObjectType.java index 589c9075b86..3a0dc2ad59d 100644 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/registry/MonitoredObjectType.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/registry/MonitoredObjectType.java @@ -15,7 +15,7 @@ */ package com.sun.enterprise.admin.monitor.registry; -//import com.sun.enterprise.config.serverbeans.*; + import java.util.HashMap; /** diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCDnsStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCDnsStats.java index ecf0d700119..8931e0e12ac 100644 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCDnsStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCDnsStats.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2024 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 @@ -17,16 +18,14 @@ package com.sun.enterprise.admin.monitor.stats; import org.glassfish.j2ee.statistics.CountStatistic; -/** - * - * @author nsegura - */ import org.glassfish.j2ee.statistics.Stats; /** * The DNS Cache caches IP addresses and DNS names. The server’s DNS cache is * disabled by default. A single cache entry represents a single IP address or DNS * name lookup + * + * @author nsegura */ public interface PWCDnsStats extends Stats { diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCKeepAliveStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCKeepAliveStats.java index 05fecf90446..9882056044f 100644 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCKeepAliveStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCKeepAliveStats.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2024 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 @@ -17,17 +18,12 @@ package com.sun.enterprise.admin.monitor.stats; import org.glassfish.j2ee.statistics.CountStatistic; - -/** - * - * @author nsegura - */ - import org.glassfish.j2ee.statistics.Stats; /** - * Provides statistical information about the HttpService HTTP-level keep-alive - * system + * Provides statistical information about the HttpService HTTP-level keep-alive system + * + * @author nsegura */ public interface PWCKeepAliveStats extends Stats { diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCThreadPoolStats.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCThreadPoolStats.java index e9265a07f6e..44523689d46 100644 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCThreadPoolStats.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/PWCThreadPoolStats.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2024 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 @@ -17,15 +18,12 @@ package com.sun.enterprise.admin.monitor.stats; import org.glassfish.j2ee.statistics.CountStatistic; -/** - * - * @author nsegura - */ import org.glassfish.j2ee.statistics.Stats; /** - * Returns the statistical information associated with - * the HttpService thread pool + * Returns the statistical information associated with the HttpService thread pool + * + * @author nsegura */ public interface PWCThreadPoolStats extends Stats { diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateAdminObject.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateAdminObject.java index 122d891e7c8..5ba4d1a53b3 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateAdminObject.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateAdminObject.java @@ -44,13 +44,13 @@ import org.glassfish.resources.admin.cli.ResourceConstants; import org.jvnet.hk2.annotations.Service; -import static org.glassfish.connectors.admin.cli.CLIConstants.DESCRIPTION; -import static org.glassfish.connectors.admin.cli.CLIConstants.PROPERTY; import static org.glassfish.connectors.admin.cli.CLIConstants.AOR.AOR_CLASS_NAME; import static org.glassfish.connectors.admin.cli.CLIConstants.AOR.AOR_CREATE_COMMAND_NAME; import static org.glassfish.connectors.admin.cli.CLIConstants.AOR.AOR_JNDI_NAME; import static org.glassfish.connectors.admin.cli.CLIConstants.AOR.AOR_RA_NAME; import static org.glassfish.connectors.admin.cli.CLIConstants.AOR.AOR_RES_TYPE; +import static org.glassfish.connectors.admin.cli.CLIConstants.DESCRIPTION; +import static org.glassfish.connectors.admin.cli.CLIConstants.PROPERTY; import static org.glassfish.resources.admin.cli.ResourceConstants.ADMIN_OBJECT_CLASS_NAME; import static org.glassfish.resources.admin.cli.ResourceConstants.JNDI_NAME; import static org.glassfish.resources.admin.cli.ResourceConstants.RES_ADAPTER; diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorConnectionPool.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorConnectionPool.java index 3c40f1d969c..c779d4fe1fc 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorConnectionPool.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorConnectionPool.java @@ -43,9 +43,6 @@ import org.glassfish.resources.admin.cli.ResourceConstants; import org.jvnet.hk2.annotations.Service; -import static org.glassfish.connectors.admin.cli.CLIConstants.DESCRIPTION; -import static org.glassfish.connectors.admin.cli.CLIConstants.PROPERTY; -import static org.glassfish.connectors.admin.cli.CLIConstants.TARGET; import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_ASSOC_WITH_THREAD; import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_CON_CREATION_RETRY_ATTEMPTS; import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_CON_CREATION_RETRY_INTERVAL; @@ -70,6 +67,9 @@ import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_STEADY_POOL_SIZE; import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_TXN_SUPPORT; import static org.glassfish.connectors.admin.cli.CLIConstants.CCP.CCP_VALIDATE_ATMOST_PERIOD; +import static org.glassfish.connectors.admin.cli.CLIConstants.DESCRIPTION; +import static org.glassfish.connectors.admin.cli.CLIConstants.PROPERTY; +import static org.glassfish.connectors.admin.cli.CLIConstants.TARGET; /** * Create Connector Connection Pool Command diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorResource.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorResource.java index 7e264899039..8034b2b6e29 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorResource.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateConnectorResource.java @@ -46,12 +46,12 @@ import org.glassfish.resources.admin.cli.ResourceConstants; import org.jvnet.hk2.annotations.Service; -import static org.glassfish.connectors.admin.cli.CLIConstants.DESCRIPTION; -import static org.glassfish.connectors.admin.cli.CLIConstants.PROPERTY; -import static org.glassfish.connectors.admin.cli.CLIConstants.TARGET; import static org.glassfish.connectors.admin.cli.CLIConstants.CR.CR_JNDI_NAME; import static org.glassfish.connectors.admin.cli.CLIConstants.CR.CR_OBJECT_TYPE; import static org.glassfish.connectors.admin.cli.CLIConstants.CR.CR_POOL_NAME; +import static org.glassfish.connectors.admin.cli.CLIConstants.DESCRIPTION; +import static org.glassfish.connectors.admin.cli.CLIConstants.PROPERTY; +import static org.glassfish.connectors.admin.cli.CLIConstants.TARGET; import static org.glassfish.resources.admin.cli.ResourceConstants.JNDI_NAME; import static org.glassfish.resources.admin.cli.ResourceConstants.POOL_NAME; diff --git a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateResourceAdapterConfig.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateResourceAdapterConfig.java index f0f3f9a4c33..df71f250354 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateResourceAdapterConfig.java +++ b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/CreateResourceAdapterConfig.java @@ -49,10 +49,10 @@ import static org.glassfish.connectors.admin.cli.CLIConstants.OBJECT_TYPE; import static org.glassfish.connectors.admin.cli.CLIConstants.PROPERTY; -import static org.glassfish.connectors.admin.cli.CLIConstants.TARGET; import static org.glassfish.connectors.admin.cli.CLIConstants.RAC.RAC_CREATE_RAC_COMMAND; import static org.glassfish.connectors.admin.cli.CLIConstants.RAC.RAC_RA_NAME; import static org.glassfish.connectors.admin.cli.CLIConstants.RAC.RAC_THREAD_POOL_ID; +import static org.glassfish.connectors.admin.cli.CLIConstants.TARGET; import static org.glassfish.resources.admin.cli.ResourceConstants.RESOURCE_ADAPTER_CONFIG_NAME; import static org.glassfish.resources.admin.cli.ResourceConstants.THREAD_POOL_IDS; diff --git a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java index df3ef2b79e7..64ec32256e2 100644 --- a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java +++ b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java @@ -18,9 +18,9 @@ package org.glassfish.enterprise.iiop.impl; import com.sun.corba.ee.impl.folb.InitialGroupInfoService ; -import com.sun.corba.ee.impl.javax.rmi.PortableRemoteObject; import com.sun.corba.ee.impl.javax.rmi.CORBA.StubDelegateImpl; import com.sun.corba.ee.impl.javax.rmi.CORBA.Util; +import com.sun.corba.ee.impl.javax.rmi.PortableRemoteObject; import com.sun.corba.ee.impl.orb.ORBImpl; import com.sun.corba.ee.impl.orb.ORBSingleton; import com.sun.corba.ee.spi.misc.ORBConstants; diff --git a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/IORAddrAnyInitializer.java b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/IORAddrAnyInitializer.java index 7374f641b48..8048d4d98a2 100755 --- a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/IORAddrAnyInitializer.java +++ b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/IORAddrAnyInitializer.java @@ -16,7 +16,6 @@ package org.glassfish.enterprise.iiop.impl; - import com.sun.logging.LogDomains; import java.util.logging.Level; @@ -26,8 +25,8 @@ import org.omg.IOP.CodecFactory; import org.omg.IOP.ENCODING_CDR_ENCAPS; import org.omg.IOP.Encoding; -import org.omg.PortableInterceptor.ORBInitializer; import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName; +import org.omg.PortableInterceptor.ORBInitializer; /** * This class is used to add IOR interceptors for supporting IN_ADDR_ANY diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/ByteCodeEnhancerHelper.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/ByteCodeEnhancerHelper.java index 264a7dbf5dd..58090245175 100644 --- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/ByteCodeEnhancerHelper.java +++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/ByteCodeEnhancerHelper.java @@ -24,9 +24,6 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; - -//***************** import ************************************************ - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/FilterEnhancer.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/FilterEnhancer.java index 8f59b158a44..90567073c25 100644 --- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/FilterEnhancer.java +++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/FilterEnhancer.java @@ -28,7 +28,6 @@ import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaDataModelImpl; import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaDataPropertyImpl; import com.sun.jdo.api.persistence.enhancer.util.ClassFileSource; -//@olsen: added: support for I18N import com.sun.jdo.api.persistence.enhancer.util.Support; import com.sun.jdo.api.persistence.enhancer.util.UserException; import com.sun.jdo.api.persistence.model.Model; diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/ClassControl.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/ClassControl.java index d9f83d1b0a4..2fd19673905 100644 --- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/ClassControl.java +++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/ClassControl.java @@ -18,7 +18,6 @@ import com.sun.jdo.api.persistence.enhancer.classfile.ClassFile; import com.sun.jdo.api.persistence.enhancer.classfile.ConstClass; -//@olsen: added import import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaData; import com.sun.jdo.api.persistence.enhancer.util.ClassFileSource; import com.sun.jdo.api.persistence.enhancer.util.Support; diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/Environment.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/Environment.java index 87a5e77e198..62d127661d2 100644 --- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/Environment.java +++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/Environment.java @@ -16,14 +16,12 @@ package com.sun.jdo.api.persistence.enhancer.impl; -//@olsen: added import import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaData; import com.sun.jdo.api.persistence.enhancer.util.ClassFileSource; import com.sun.jdo.api.persistence.enhancer.util.ClassPath; import com.sun.jdo.api.persistence.enhancer.util.Support; import java.io.File; -//@olsen: added import import java.io.PrintWriter; import java.util.ArrayList; import java.util.HashMap; diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/FieldAction.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/FieldAction.java index fada0666ef9..fe40e81d974 100644 --- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/FieldAction.java +++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/FieldAction.java @@ -19,7 +19,6 @@ import com.sun.jdo.api.persistence.enhancer.classfile.ClassField; import com.sun.jdo.api.persistence.enhancer.classfile.Descriptor; import com.sun.jdo.api.persistence.enhancer.classfile.VMConstants; -//@olsen: added import import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaData; import com.sun.jdo.api.persistence.enhancer.util.InternalError; import com.sun.jdo.api.persistence.enhancer.util.Support; diff --git a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/MethodAnnotater.java b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/MethodAnnotater.java index 071306e9550..95e2e858fc8 100644 --- a/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/MethodAnnotater.java +++ b/appserver/persistence/cmp/enhancer/src/main/java/com/sun/jdo/api/persistence/enhancer/impl/MethodAnnotater.java @@ -30,7 +30,6 @@ import com.sun.jdo.api.persistence.enhancer.classfile.InsnTarget; import com.sun.jdo.api.persistence.enhancer.classfile.InsnUtils; import com.sun.jdo.api.persistence.enhancer.classfile.VMConstants; -//@olsen: added import import com.sun.jdo.api.persistence.enhancer.meta.JDOMetaData; import com.sun.jdo.api.persistence.enhancer.util.InternalError; import com.sun.jdo.api.persistence.enhancer.util.Support; diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/J2EESecurityManager.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/J2EESecurityManager.java index bc8df49feb6..d252dd125dc 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/J2EESecurityManager.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/J2EESecurityManager.java @@ -21,8 +21,6 @@ import com.sun.enterprise.security.ssl.SSLUtils; import java.net.SocketPermission; -// IASRI 4660742 START -// IASRI 4660742 END import java.util.PropertyPermission; /** diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/ACLSingletonProvider.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/ACLSingletonProvider.java index 4488c915d0f..ec3320d185e 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/ACLSingletonProvider.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/ACLSingletonProvider.java @@ -31,9 +31,9 @@ import org.jboss.weld.bootstrap.api.SingletonProvider; import org.jboss.weld.bootstrap.api.helpers.TCCLSingletonProvider; -import static java.lang.System.getSecurityManager; import static java.lang.System.Logger.Level.DEBUG; import static java.lang.System.Logger.Level.TRACE; +import static java.lang.System.getSecurityManager; import static java.lang.Thread.currentThread; import static java.security.AccessController.doPrivileged; 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 e4f149efee5..ea3f9c92b94 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 @@ -32,7 +32,6 @@ 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; diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/RepositoryManager.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/RepositoryManager.java index 817bd835c58..ecae2d070bd 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/RepositoryManager.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/RepositoryManager.java @@ -23,22 +23,10 @@ import com.sun.enterprise.admin.util.TokenValueSet; import com.sun.enterprise.security.store.PasswordAdapter; import com.sun.enterprise.util.OS; - -//import javax.management.remote.JMXAuthenticator; -//import com.sun.enterprise.admin.server.core.jmx.auth.ASJMXAuthenticator; -//import com.sun.enterprise.admin.server.core.jmx.auth.ASLoginDriverImpl; - -//iMQ imports -//import com.sun.enterprise.jms.IASJmsUtil; -//import com.sun.messaging.jmq.jmsspi.JMSAdmin; -//import jakarta.jms.JMSException; - import com.sun.enterprise.util.SystemPropertyConstants; import com.sun.enterprise.util.i18n.StringManager; import com.sun.enterprise.util.io.FileUtils; -//import com.sun.enterprise.admin.common.Status; -//import com.sun.enterprise.util.system.GFSystem; import java.io.File; import java.io.FilenameFilter; import java.io.IOException; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/proxy/ProxyFactory.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/proxy/ProxyFactory.java index 298b2768a22..fe8be37ba53 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/proxy/ProxyFactory.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/proxy/ProxyFactory.java @@ -57,7 +57,6 @@ import static org.glassfish.external.amx.AMX.DESC_STD_IMMUTABLE_INFO; import static org.glassfish.external.amx.AMX.NAME_KEY; -//import org.glassfish.api.amx.AMXUtil; /** * @deprecated Factory for {@link AMXProxy} proxies. */ diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogQueryEntryImpl.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogQueryEntryImpl.java index 6f1b57cde45..dea04477d83 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogQueryEntryImpl.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/logging/LogQueryEntryImpl.java @@ -37,7 +37,6 @@ import static org.glassfish.admin.amx.logging.LogRecordFields.PRODUCT_NAME_INDEX; import static org.glassfish.admin.amx.logging.LogRecordFields.RECORD_NUMBER_INDEX; -//import static org.glassfish.admin.amx.logging.LogRecordFields; /** * INTERNAL USE ONLY--not part of the API diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/xml/ParsedCluster.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/xml/ParsedCluster.java index c1fbe0f3960..c4577968b81 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/xml/ParsedCluster.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/xml/ParsedCluster.java @@ -18,7 +18,6 @@ import com.sun.enterprise.universal.collections.CollectionUtils; -//import static com.sun.enterprise.util.StringUtils.ok; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/ObjectAnalyzer.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/ObjectAnalyzer.java index 13c4998bf10..0bdc28dfe97 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/ObjectAnalyzer.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/ObjectAnalyzer.java @@ -19,7 +19,6 @@ * for any class */ package com.sun.enterprise.util; -// import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/nucleus/core/context-propagation/src/test/java/org/glassfish/contextpropagation/weblogic/workarea/WorkContextLocalMap.java b/nucleus/core/context-propagation/src/test/java/org/glassfish/contextpropagation/weblogic/workarea/WorkContextLocalMap.java index bc37083f48d..e5767e8cd8c 100644 --- a/nucleus/core/context-propagation/src/test/java/org/glassfish/contextpropagation/weblogic/workarea/WorkContextLocalMap.java +++ b/nucleus/core/context-propagation/src/test/java/org/glassfish/contextpropagation/weblogic/workarea/WorkContextLocalMap.java @@ -30,8 +30,6 @@ import org.glassfish.contextpropagation.weblogic.workarea.spi.WorkContextMapInterceptor; -//import weblogic.diagnostics.debug.DebugLogger; - /** * Thread-local implementation of WorkContextMap. This * class performs the guts of context management. From 5c5046c7de7e1d77a28f3a9e0b712bef86f0efd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 02:34:56 +0200 Subject: [PATCH 28/40] Imports: webservices modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../config/TransformationRule.java | 8 ++-- .../webservices/connector/LogUtils.java | 1 + .../connector/WebServicesSniffer.java | 10 ++--- .../handlers/WebServiceHandler.java | 43 +++++++++++-------- .../handlers/WebServiceProviderHandler.java | 41 ++++++++++-------- .../handlers/WebServiceRefsHandler.java | 7 ++- .../webservices/AdapterInvocationInfo.java | 3 +- .../webservices/Ejb3MessageDispatcher.java | 20 ++++----- .../glassfish/webservices/EjbWSAdapter.java | 6 +-- .../webservices/EjbWebServiceServlet.java | 30 ++++++------- .../webservices/InstanceResolverImpl.java | 13 +++--- .../glassfish/webservices/InvokerImpl.java | 12 ++++-- .../webservices/JAXWSAdapterRegistry.java | 7 ++- .../glassfish/webservices/JAXWSContainer.java | 6 +-- .../webservices/JAXWSServiceDelegate.java | 28 ++++++------ .../glassfish/webservices/JAXWSServlet.java | 26 +++++------ .../webservices/JAXWSServletModule.java | 7 +-- .../org/glassfish/webservices/LogUtils.java | 1 + .../glassfish/webservices/MonitoringPipe.java | 12 +++--- .../webservices/PortCreationCallbackImpl.java | 19 ++++---- .../glassfish/webservices/PortInfoImpl.java | 3 +- .../webservices/SOAPMessageContextImpl.java | 17 ++++---- .../webservices/SecurityService.java | 3 ++ .../webservices/ServerPipeCreator.java | 4 +- .../ServletImplInvocationHandler.java | 5 +-- .../webservices/WSClientContainer.java | 4 +- .../webservices/WSContainerResolver.java | 3 +- .../webservices/WSServletContextListener.java | 22 +++++----- .../webservices/WebServiceContractImpl.java | 20 ++++----- .../WebServiceDeploymentNotifierImpl.java | 1 + .../WebServiceEjbEndpointRegistry.java | 18 ++++---- .../webservices/WebServicesContainer.java | 18 ++++---- .../webservices/WebServicesContract.java | 4 +- .../cli/ListWebServicesCommand.java | 21 ++++----- .../deployment/DeployedEndpointData.java | 16 ++++--- .../deployment/WSDolSupportImpl.java | 9 ++-- .../webservices/monitoring/EndpointImpl.java | 6 +-- .../monitoring/JAXWSEndpointImpl.java | 8 ++-- .../monitoring/LogAuthenticationListener.java | 7 +-- .../monitoring/MessageTraceImpl.java | 7 ++- .../monitoring/WebServiceEngineImpl.java | 15 ++++--- .../monitoring/WebServiceStatsProvider.java | 7 +-- .../monitoring/WebServiceTesterServlet.java | 28 ++++++------ .../webservices/JAXWSAdapterRegistryTest.java | 4 +- .../webservices/metroglue/LogUtils.java | 1 + .../transport/tcp/AppServRegistry.java | 6 ++- .../webservices/transport/tcp/Connector.java | 1 + .../transport/tcp/Ejb109Adapter.java | 1 + .../webservices/transport/tcp/LogUtils.java | 1 + .../transport/tcp/TCP109Adapter.java | 3 +- .../webservices/transport/tcp/V3Module.java | 3 ++ .../transport/tcp/WSEndpointDescriptor.java | 4 +- .../tcp/WSEndpointLifeCycleListener.java | 1 + .../tcp/WSTCPAdapterRegistryImpl.java | 4 +- .../transport/tcp/WSTCPProtocolFilter.java | 7 +-- .../transport/tcp/WSTCPProtocolFinder.java | 2 + .../transport/tcp/Web109Adapter.java | 1 + 57 files changed, 322 insertions(+), 263 deletions(-) diff --git a/appserver/webservices/connector/src/main/java/org/glassfish/webservices/config/TransformationRule.java b/appserver/webservices/connector/src/main/java/org/glassfish/webservices/config/TransformationRule.java index 85efab92b38..772785baa2b 100644 --- a/appserver/webservices/connector/src/main/java/org/glassfish/webservices/config/TransformationRule.java +++ b/appserver/webservices/connector/src/main/java/org/glassfish/webservices/config/TransformationRule.java @@ -16,13 +16,13 @@ package org.glassfish.webservices.config; -import org.jvnet.hk2.config.Attribute; -import org.jvnet.hk2.config.Configured; -import org.jvnet.hk2.config.ConfigBeanProxy; +import jakarta.validation.constraints.NotNull; import java.beans.PropertyVetoException; -import jakarta.validation.constraints.NotNull; +import org.jvnet.hk2.config.Attribute; +import org.jvnet.hk2.config.ConfigBeanProxy; +import org.jvnet.hk2.config.Configured; /** * Specifies configuration for a XSLT transformation rule diff --git a/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/LogUtils.java b/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/LogUtils.java index 9f285c668b1..6d7bb92e6b6 100644 --- a/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/LogUtils.java +++ b/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/LogUtils.java @@ -17,6 +17,7 @@ package org.glassfish.webservices.connector; import java.util.logging.Logger; + import org.glassfish.logging.annotation.LogMessageInfo; import org.glassfish.logging.annotation.LogMessagesResourceBundle; import org.glassfish.logging.annotation.LoggerInfo; diff --git a/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/WebServicesSniffer.java b/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/WebServicesSniffer.java index c5deaea9f12..bb80b322cb9 100644 --- a/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/WebServicesSniffer.java +++ b/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/WebServicesSniffer.java @@ -16,15 +16,15 @@ package org.glassfish.webservices.connector; -import org.glassfish.internal.deployment.GenericSniffer; -import org.glassfish.api.deployment.archive.ReadableArchive; -import org.glassfish.api.deployment.archive.ArchiveType; -import org.jvnet.hk2.annotations.Service; - import jakarta.inject.Singleton; import java.io.IOException; +import org.glassfish.api.deployment.archive.ArchiveType; +import org.glassfish.api.deployment.archive.ReadableArchive; +import org.glassfish.internal.deployment.GenericSniffer; +import org.jvnet.hk2.annotations.Service; + /** * This is the Sniffer for Webservices * @author Bhakti Mehta diff --git a/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/annotation/handlers/WebServiceHandler.java b/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/annotation/handlers/WebServiceHandler.java index 0f4d3fa645a..431ebb6e79c 100644 --- a/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/annotation/handlers/WebServiceHandler.java +++ b/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/annotation/handlers/WebServiceHandler.java @@ -16,31 +16,40 @@ package org.glassfish.webservices.connector.annotation.handlers; -import java.util.StringTokenizer; -import java.util.logging.Logger; - -import java.lang.reflect.AnnotatedElement; -import java.lang.annotation.Annotation; - -import org.glassfish.apf.*; - -import org.glassfish.apf.impl.HandlerProcessingResultImpl; - -import com.sun.enterprise.deployment.annotation.context.WebBundleContext; -import com.sun.enterprise.deployment.annotation.context.WebComponentContext; +import com.sun.enterprise.deployment.BundleDescriptor; +import com.sun.enterprise.deployment.EjbBundleDescriptor; +import com.sun.enterprise.deployment.EjbDescriptor; +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.annotation.context.EjbContext; - -import com.sun.enterprise.deployment.*; import com.sun.enterprise.deployment.annotation.context.EjbsContext; -import com.sun.enterprise.deployment.util.DOLUtils; +import com.sun.enterprise.deployment.annotation.context.WebBundleContext; +import com.sun.enterprise.deployment.annotation.context.WebComponentContext; import com.sun.enterprise.deployment.annotation.handlers.AbstractHandler; +import com.sun.enterprise.deployment.util.DOLUtils; import com.sun.enterprise.util.LocalStringManagerImpl; + +import jakarta.ejb.Singleton; +import jakarta.ejb.Stateless; + +import java.lang.annotation.Annotation; +import java.lang.reflect.AnnotatedElement; +import java.util.StringTokenizer; import java.util.logging.Level; +import java.util.logging.Logger; import javax.xml.namespace.QName; -import jakarta.ejb.Stateless; -import jakarta.ejb.Singleton; +import org.glassfish.apf.AnnotatedElementHandler; +import org.glassfish.apf.AnnotationHandlerFor; +import org.glassfish.apf.AnnotationInfo; +import org.glassfish.apf.AnnotationProcessorException; +import org.glassfish.apf.HandlerProcessingResult; +import org.glassfish.apf.ResultType; +import org.glassfish.apf.impl.HandlerProcessingResultImpl; import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.web.deployment.descriptor.WebComponentDescriptorImpl; import org.glassfish.webservices.connector.LogUtils; diff --git a/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/annotation/handlers/WebServiceProviderHandler.java b/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/annotation/handlers/WebServiceProviderHandler.java index 451697c72e9..765ce43d50e 100644 --- a/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/annotation/handlers/WebServiceProviderHandler.java +++ b/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/annotation/handlers/WebServiceProviderHandler.java @@ -17,36 +17,39 @@ package org.glassfish.webservices.connector.annotation.handlers; -import java.lang.reflect.AnnotatedElement; -import java.lang.annotation.Annotation; -import java.util.logging.Logger; - -import org.glassfish.apf.*; - -import org.glassfish.apf.impl.HandlerProcessingResultImpl; - -import com.sun.enterprise.deployment.annotation.context.WebBundleContext; -import com.sun.enterprise.deployment.annotation.context.EjbContext; -import com.sun.enterprise.deployment.annotation.context.WebComponentContext; -import com.sun.enterprise.deployment.annotation.handlers.AbstractHandler; - -import com.sun.enterprise.deployment.WebBundleDescriptor; -import com.sun.enterprise.deployment.EjbBundleDescriptor; import com.sun.enterprise.deployment.BundleDescriptor; -import com.sun.enterprise.deployment.WebServicesDescriptor; -import com.sun.enterprise.deployment.WebService; -import com.sun.enterprise.deployment.WebServiceEndpoint; +import com.sun.enterprise.deployment.EjbBundleDescriptor; import com.sun.enterprise.deployment.EjbDescriptor; +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.annotation.context.EjbContext; import com.sun.enterprise.deployment.annotation.context.EjbsContext; +import com.sun.enterprise.deployment.annotation.context.WebBundleContext; +import com.sun.enterprise.deployment.annotation.context.WebComponentContext; +import com.sun.enterprise.deployment.annotation.handlers.AbstractHandler; import com.sun.enterprise.deployment.util.DOLUtils; import com.sun.enterprise.util.LocalStringManagerImpl; -import java.util.logging.Level; + import jakarta.ejb.Singleton; import jakarta.ejb.Stateless; +import java.lang.annotation.Annotation; +import java.lang.reflect.AnnotatedElement; +import java.util.logging.Level; +import java.util.logging.Logger; + import javax.xml.namespace.QName; +import org.glassfish.apf.AnnotatedElementHandler; +import org.glassfish.apf.AnnotationHandlerFor; +import org.glassfish.apf.AnnotationInfo; +import org.glassfish.apf.AnnotationProcessorException; +import org.glassfish.apf.HandlerProcessingResult; +import org.glassfish.apf.ResultType; +import org.glassfish.apf.impl.HandlerProcessingResultImpl; import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.web.deployment.descriptor.WebComponentDescriptorImpl; import org.glassfish.webservices.connector.LogUtils; diff --git a/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/annotation/handlers/WebServiceRefsHandler.java b/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/annotation/handlers/WebServiceRefsHandler.java index 3ad440e83fc..e06b891579f 100644 --- a/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/annotation/handlers/WebServiceRefsHandler.java +++ b/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/annotation/handlers/WebServiceRefsHandler.java @@ -16,17 +16,16 @@ package org.glassfish.webservices.connector.annotation.handlers; +import jakarta.xml.ws.WebServiceRef; +import jakarta.xml.ws.WebServiceRefs; + import java.util.ArrayList; import java.util.List; -import jakarta.xml.ws.WebServiceRefs; -import jakarta.xml.ws.WebServiceRef; - import org.glassfish.apf.AnnotationHandlerFor; import org.glassfish.apf.AnnotationInfo; import org.glassfish.apf.AnnotationProcessorException; import org.glassfish.apf.HandlerProcessingResult; - import org.jvnet.hk2.annotations.Service; /** diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/AdapterInvocationInfo.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/AdapterInvocationInfo.java index c1cfb538395..4fdb369d916 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/AdapterInvocationInfo.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/AdapterInvocationInfo.java @@ -16,9 +16,10 @@ package org.glassfish.webservices; -import org.glassfish.api.invocation.ComponentInvocation; import com.sun.xml.ws.transport.http.servlet.ServletAdapter; +import org.glassfish.api.invocation.ComponentInvocation; + /** * This class stores information for EjbRuntimeInfo * It stores the invocation object and the servlet Adapter diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/Ejb3MessageDispatcher.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/Ejb3MessageDispatcher.java index ed58f32ff24..ab482e2e186 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/Ejb3MessageDispatcher.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/Ejb3MessageDispatcher.java @@ -16,6 +16,16 @@ package org.glassfish.webservices; +import com.sun.xml.ws.transport.http.servlet.ServletAdapter; + +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +import java.io.IOException; +import java.text.MessageFormat; +import java.util.logging.Logger; + import static java.util.logging.Level.FINE; import static java.util.logging.Level.SEVERE; import static java.util.logging.Level.WARNING; @@ -24,16 +34,6 @@ import static org.glassfish.webservices.LogUtils.UNABLE_FIND_ADAPTER; import static org.glassfish.webservices.LogUtils.WEBSERVICE_DISPATCHER_INFO; -import java.io.IOException; -import java.text.MessageFormat; -import java.util.logging.Logger; - -import com.sun.xml.ws.transport.http.servlet.ServletAdapter; - -import jakarta.servlet.ServletContext; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - /** * Implementation of the Ejb Message Dispatcher for EJB3 endpoints. * diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/EjbWSAdapter.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/EjbWSAdapter.java index d1c6b74d48b..d2e6ce994bc 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/EjbWSAdapter.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/EjbWSAdapter.java @@ -16,13 +16,13 @@ package org.glassfish.webservices; +import java.util.Enumeration; +import java.util.NoSuchElementException; + import org.glassfish.grizzly.servlet.ServletConfigImpl; import org.glassfish.grizzly.servlet.ServletHandler; import org.glassfish.grizzly.servlet.WebappContext; -import java.util.Enumeration; -import java.util.NoSuchElementException; - /** * This class extends the ServletAdapter and sets the servletInstance to the EjbWebServiceServlet diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/EjbWebServiceServlet.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/EjbWebServiceServlet.java index 538b17b1695..44356e5a79e 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/EjbWebServiceServlet.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/EjbWebServiceServlet.java @@ -17,14 +17,13 @@ package org.glassfish.webservices; -import static com.sun.enterprise.deployment.WebServiceEndpoint.PUBLISHING_SUBCONTEXT; -import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND; -import static jakarta.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; -import static jakarta.xml.ws.http.HTTPBinding.HTTP_BINDING; -import static java.util.logging.Level.WARNING; -import static org.glassfish.webservices.LogUtils.AUTH_FAILED; -import static org.glassfish.webservices.LogUtils.EXCEPTION_THROWN; -import static org.glassfish.webservices.LogUtils.INVALID_REQUEST_SCHEME; +import com.sun.enterprise.deployment.Application; +import com.sun.enterprise.deployment.WebServiceEndpoint; + +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.net.URL; @@ -39,13 +38,14 @@ import org.glassfish.webservices.monitoring.WebServiceEngineImpl; import org.glassfish.webservices.monitoring.WebServiceTesterServlet; -import com.sun.enterprise.deployment.Application; -import com.sun.enterprise.deployment.WebServiceEndpoint; - -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import static com.sun.enterprise.deployment.WebServiceEndpoint.PUBLISHING_SUBCONTEXT; +import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND; +import static jakarta.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; +import static jakarta.xml.ws.http.HTTPBinding.HTTP_BINDING; +import static java.util.logging.Level.WARNING; +import static org.glassfish.webservices.LogUtils.AUTH_FAILED; +import static org.glassfish.webservices.LogUtils.EXCEPTION_THROWN; +import static org.glassfish.webservices.LogUtils.INVALID_REQUEST_SCHEME; /** * Servlet responsible for invoking EJB webservice endpoint. diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/InstanceResolverImpl.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/InstanceResolverImpl.java index 61e56632689..59bc2e15fa6 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/InstanceResolverImpl.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/InstanceResolverImpl.java @@ -23,21 +23,22 @@ */ package org.glassfish.webservices; +import com.sun.enterprise.container.common.spi.util.InjectionException; +import com.sun.enterprise.container.common.spi.util.InjectionManager; import com.sun.istack.NotNull; import com.sun.xml.ws.api.message.Packet; -import com.sun.xml.ws.api.server.ResourceInjector; import com.sun.xml.ws.api.server.InstanceResolver; +import com.sun.xml.ws.api.server.Invoker; +import com.sun.xml.ws.api.server.ResourceInjector; import com.sun.xml.ws.api.server.WSEndpoint; import com.sun.xml.ws.api.server.WSWebServiceContext; -import com.sun.xml.ws.api.server.Invoker; -import com.sun.enterprise.container.common.spi.util.InjectionManager; -import com.sun.enterprise.container.common.spi.util.InjectionException; -import java.lang.reflect.Method; -import java.lang.reflect.InvocationTargetException; import jakarta.xml.ws.Provider; import jakarta.xml.ws.WebServiceException; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + public final class InstanceResolverImpl extends InstanceResolver { diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/InvokerImpl.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/InvokerImpl.java index 69a9ba6caa0..23c6ad40ae4 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/InvokerImpl.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/InvokerImpl.java @@ -16,12 +16,18 @@ package org.glassfish.webservices; +import com.sun.xml.ws.api.message.Packet; +import com.sun.xml.ws.api.server.AsyncProvider; +import com.sun.xml.ws.api.server.AsyncProviderCallback; +import com.sun.xml.ws.api.server.Invoker; +import com.sun.xml.ws.api.server.WSEndpoint; +import com.sun.xml.ws.api.server.WSWebServiceContext; + import jakarta.xml.ws.Provider; import jakarta.xml.ws.WebServiceContext; -import java.lang.reflect.Method; + import java.lang.reflect.InvocationTargetException; -import com.sun.xml.ws.api.message.Packet; -import com.sun.xml.ws.api.server.*; +import java.lang.reflect.Method; /** * Implements JAXWS's Invoker interface to call the endpoint method diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSAdapterRegistry.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSAdapterRegistry.java index be73946a2c4..425ea9fd321 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSAdapterRegistry.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSAdapterRegistry.java @@ -18,7 +18,12 @@ import com.sun.xml.ws.api.server.Adapter; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSContainer.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSContainer.java index 9e66dd42f0c..66f55dab4a4 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSContainer.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSContainer.java @@ -16,9 +16,6 @@ package org.glassfish.webservices; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.internal.api.Globals; - import com.sun.enterprise.deployment.WebServiceEndpoint; import com.sun.xml.ws.api.server.Container; import com.sun.xml.ws.api.server.Module; @@ -28,6 +25,9 @@ import jakarta.servlet.ServletContext; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.internal.api.Globals; + public class JAXWSContainer extends Container { private final ServletContext servletContext; diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSServiceDelegate.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSServiceDelegate.java index bffc364ed57..e739fb351c3 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSServiceDelegate.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSServiceDelegate.java @@ -16,27 +16,25 @@ package org.glassfish.webservices; -import java.net.URL; -import java.net.URI; +import com.sun.enterprise.deployment.ServiceRefPortInfo; +import com.sun.enterprise.deployment.ServiceReferenceDescriptor; -import java.util.HashSet; -import java.util.Set; -import java.util.Map; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.ws.Dispatch; +import jakarta.xml.ws.Service; +import jakarta.xml.ws.handler.HandlerResolver; + +import java.lang.reflect.Method; +import java.net.URI; +import java.net.URL; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; +import java.util.Map; +import java.util.Set; import java.util.concurrent.Executor; -import java.lang.reflect.Method; - import javax.xml.namespace.QName; -import jakarta.xml.bind.JAXBContext; - -import jakarta.xml.ws.Service; -import jakarta.xml.ws.Dispatch; -import jakarta.xml.ws.handler.HandlerResolver; - -import com.sun.enterprise.deployment.ServiceReferenceDescriptor; -import com.sun.enterprise.deployment.ServiceRefPortInfo; /** * Used as a delegate to concrete JAXWS diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSServlet.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSServlet.java index 6f9b6d0a9d9..7008fa2917b 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSServlet.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSServlet.java @@ -16,19 +16,6 @@ package org.glassfish.webservices; -import java.io.IOException; -import java.text.MessageFormat; -import java.util.Collection; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.glassfish.external.probe.provider.annotations.Probe; -import org.glassfish.external.probe.provider.annotations.ProbeParam; -import org.glassfish.external.probe.provider.annotations.ProbeProvider; -import org.glassfish.webservices.monitoring.Endpoint; -import org.glassfish.webservices.monitoring.WebServiceEngineImpl; -import org.glassfish.webservices.monitoring.WebServiceTesterServlet; - //import com.sun.enterprise.Switch; import com.sun.enterprise.container.common.spi.util.ComponentEnvManager; @@ -48,6 +35,19 @@ import jakarta.xml.ws.WebServiceException; import jakarta.xml.ws.http.HTTPBinding; +import java.io.IOException; +import java.text.MessageFormat; +import java.util.Collection; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.glassfish.external.probe.provider.annotations.Probe; +import org.glassfish.external.probe.provider.annotations.ProbeParam; +import org.glassfish.external.probe.provider.annotations.ProbeProvider; +import org.glassfish.webservices.monitoring.Endpoint; +import org.glassfish.webservices.monitoring.WebServiceEngineImpl; +import org.glassfish.webservices.monitoring.WebServiceTesterServlet; + /** * The JAX-WS dispatcher servlet. * diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSServletModule.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSServletModule.java index f234ffac1b6..73de2d2dcbd 100755 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSServletModule.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSServletModule.java @@ -23,12 +23,13 @@ package org.glassfish.webservices; -import com.sun.xml.ws.transport.http.servlet.ServletModule; -import com.sun.xml.ws.transport.http.servlet.ServletAdapter; import com.sun.istack.NotNull; import com.sun.xml.ws.api.server.BoundEndpoint; -import java.util.List; +import com.sun.xml.ws.transport.http.servlet.ServletAdapter; +import com.sun.xml.ws.transport.http.servlet.ServletModule; + import java.util.ArrayList; +import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/LogUtils.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/LogUtils.java index 928e56317a6..1493c2bdf4f 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/LogUtils.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/LogUtils.java @@ -17,6 +17,7 @@ package org.glassfish.webservices; import java.util.logging.Logger; + import org.glassfish.logging.annotation.LogMessageInfo; import org.glassfish.logging.annotation.LogMessagesResourceBundle; import org.glassfish.logging.annotation.LoggerInfo; diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/MonitoringPipe.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/MonitoringPipe.java index 1e4bcfa5166..0c83551a36e 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/MonitoringPipe.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/MonitoringPipe.java @@ -17,12 +17,6 @@ package org.glassfish.webservices; -import org.glassfish.webservices.monitoring.EndpointImpl; -import org.glassfish.webservices.monitoring.HttpResponseInfoImpl; -import org.glassfish.webservices.monitoring.JAXWSEndpointImpl; -import org.glassfish.webservices.monitoring.ThreadLocalInfo; -import org.glassfish.webservices.monitoring.WebServiceEngineImpl; - import com.sun.enterprise.deployment.WebServiceEndpoint; import com.sun.xml.ws.api.message.Packet; import com.sun.xml.ws.api.model.SEIModel; @@ -36,6 +30,12 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import org.glassfish.webservices.monitoring.EndpointImpl; +import org.glassfish.webservices.monitoring.HttpResponseInfoImpl; +import org.glassfish.webservices.monitoring.JAXWSEndpointImpl; +import org.glassfish.webservices.monitoring.ThreadLocalInfo; +import org.glassfish.webservices.monitoring.WebServiceEngineImpl; + /** * This pipe is used to do app server monitoring */ diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/PortCreationCallbackImpl.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/PortCreationCallbackImpl.java index 3b5aeae1561..2dfa332979f 100755 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/PortCreationCallbackImpl.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/PortCreationCallbackImpl.java @@ -16,20 +16,19 @@ package org.glassfish.webservices; -import java.util.Set; -import java.util.Iterator; -import java.util.logging.Level; -import java.util.logging.Logger; +import com.sun.enterprise.deployment.NameValuePairDescriptor; +import com.sun.enterprise.deployment.ServiceRefPortInfo; +import com.sun.enterprise.deployment.ServiceReferenceDescriptor; +import com.sun.xml.ws.api.client.ServiceInterceptor; +import com.sun.xml.ws.developer.WSBindingProvider; import jakarta.xml.ws.Binding; import jakarta.xml.ws.soap.SOAPBinding; -import com.sun.xml.ws.api.client.ServiceInterceptor; -import com.sun.xml.ws.developer.WSBindingProvider; - -import com.sun.enterprise.deployment.ServiceReferenceDescriptor; -import com.sun.enterprise.deployment.ServiceRefPortInfo; -import com.sun.enterprise.deployment.NameValuePairDescriptor; +import java.util.Iterator; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; /** * This is way port creation calls are going to be intercepted in JAXWS2.1 diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/PortInfoImpl.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/PortInfoImpl.java index 416f7d0cfa7..422de898a4b 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/PortInfoImpl.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/PortInfoImpl.java @@ -18,9 +18,10 @@ import com.sun.xml.ws.api.BindingID; -import javax.xml.namespace.QName; import jakarta.xml.ws.handler.PortInfo; +import javax.xml.namespace.QName; + /** * Implementation of the PortInfo interface. This is just a simple * class used to hold the info necessary to uniquely identify a port, diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/SOAPMessageContextImpl.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/SOAPMessageContextImpl.java index 8c53496eb17..53c7dd047d3 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/SOAPMessageContextImpl.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/SOAPMessageContextImpl.java @@ -16,19 +16,20 @@ package org.glassfish.webservices; -import java.util.Set; -import java.util.Map; +import com.sun.xml.ws.api.message.Message; +import com.sun.xml.ws.api.message.Messages; +import com.sun.xml.ws.api.message.Packet; + +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.soap.SOAPMessage; + import java.util.Collection; +import java.util.Map; +import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; import javax.xml.namespace.QName; -import jakarta.xml.bind.JAXBContext; -import com.sun.xml.ws.api.message.Messages; -import com.sun.xml.ws.api.message.Message; -import com.sun.xml.ws.api.message.Packet; - -import jakarta.xml.soap.SOAPMessage; /** * Implementation of SOAPMessageContext diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/SecurityService.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/SecurityService.java index 3f8c7ce67f3..f0d8b82ed96 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/SecurityService.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/SecurityService.java @@ -19,8 +19,11 @@ import com.sun.enterprise.deployment.ServiceReferenceDescriptor; import com.sun.enterprise.web.WebModule; import com.sun.xml.ws.assembler.metro.dev.ClientPipelineHook; + import jakarta.servlet.http.HttpServletRequest; + import java.security.Principal; + import org.jvnet.hk2.annotations.Contract; /** diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/ServerPipeCreator.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/ServerPipeCreator.java index e205948d55d..00fcd2eeefd 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/ServerPipeCreator.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/ServerPipeCreator.java @@ -26,10 +26,10 @@ import com.sun.xml.ws.assembler.metro.ServerPipelineHook; import com.sun.xml.ws.policy.PolicyMap; -import org.jvnet.hk2.annotations.Contract; - import jakarta.xml.ws.http.HTTPBinding; +import org.jvnet.hk2.annotations.Contract; + /** * This is used by JAXWSContainer to return proper 196 security and * app server monitoing pipes to the StandAlonePipeAssembler and diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/ServletImplInvocationHandler.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/ServletImplInvocationHandler.java index 13ea51ba3ef..2bb61f2161f 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/ServletImplInvocationHandler.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/ServletImplInvocationHandler.java @@ -16,12 +16,11 @@ package org.glassfish.webservices; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; import java.util.logging.Level; - import java.util.logging.Logger; /** diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WSClientContainer.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WSClientContainer.java index 75c8620a2a1..e568e19556c 100755 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WSClientContainer.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WSClientContainer.java @@ -16,10 +16,10 @@ package org.glassfish.webservices; -import com.sun.xml.ws.api.server.Container; +import com.sun.enterprise.deployment.ServiceReferenceDescriptor; import com.sun.xml.ws.api.client.ServiceInterceptor; +import com.sun.xml.ws.api.server.Container; -import com.sun.enterprise.deployment.ServiceReferenceDescriptor; import org.glassfish.internal.api.Globals; public class WSClientContainer extends Container { diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WSContainerResolver.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WSContainerResolver.java index d45744c55a4..08b020be32c 100755 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WSContainerResolver.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WSContainerResolver.java @@ -16,11 +16,10 @@ package org.glassfish.webservices; +import com.sun.enterprise.deployment.ServiceReferenceDescriptor; import com.sun.xml.ws.api.server.Container; import com.sun.xml.ws.api.server.ContainerResolver; -import com.sun.enterprise.deployment.ServiceReferenceDescriptor; - /** * App Server container resolver for registering client side * security pipe diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WSServletContextListener.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WSServletContextListener.java index bda5b9e8699..4b266250dc8 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WSServletContextListener.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WSServletContextListener.java @@ -16,17 +16,6 @@ package org.glassfish.webservices; -import static java.util.logging.Level.WARNING; -import static org.glassfish.webservices.LogUtils.DEPLOYMENT_FAILED; - -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; -import java.util.Collection; -import java.util.logging.Level; -import java.util.logging.Logger; - import com.sun.enterprise.container.common.spi.util.ComponentEnvManager; import com.sun.enterprise.container.common.spi.util.InjectionException; import com.sun.enterprise.container.common.spi.util.InjectionManager; @@ -64,6 +53,17 @@ import jakarta.xml.ws.soap.AddressingFeature; import jakarta.xml.ws.soap.MTOMFeature; +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Collection; +import java.util.logging.Level; +import java.util.logging.Logger; + +import static java.util.logging.Level.WARNING; +import static org.glassfish.webservices.LogUtils.DEPLOYMENT_FAILED; + /** * This class serves for initialization of JAX-WS WSEndpoints when the context is initialized on deployment. * diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceContractImpl.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceContractImpl.java index 6629ced3566..09b5f183a7a 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceContractImpl.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceContractImpl.java @@ -16,27 +16,27 @@ package org.glassfish.webservices; +import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.container.common.spi.util.ComponentEnvManager; import com.sun.enterprise.container.common.spi.util.InjectionManager; -import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.api.container.Adapter; +import com.sun.enterprise.module.ModulesRegistry; import jakarta.inject.Inject; import jakarta.inject.Named; import jakarta.inject.Provider; +import java.util.Collections; +import java.util.logging.Logger; + +import org.glassfish.api.admin.ServerEnvironment; +import org.glassfish.api.container.Adapter; +import org.glassfish.api.invocation.InvocationManager; import org.glassfish.hk2.api.IterableProvider; -import org.jvnet.hk2.annotations.Optional; -import org.jvnet.hk2.annotations.Service; import org.glassfish.internal.api.Globals; import org.glassfish.internal.data.ApplicationRegistry; import org.glassfish.server.ServerEnvironmentImpl; -import org.glassfish.api.invocation.InvocationManager; -import com.sun.enterprise.module.ModulesRegistry; -import com.sun.enterprise.config.serverbeans.Config; - -import java.util.Collections; -import java.util.logging.Logger; +import org.jvnet.hk2.annotations.Optional; +import org.jvnet.hk2.annotations.Service; /** * This is the implementation class which will provide the implementation diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceDeploymentNotifierImpl.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceDeploymentNotifierImpl.java index 27507cb0cd8..66d0d9f8c9b 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceDeploymentNotifierImpl.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceDeploymentNotifierImpl.java @@ -17,6 +17,7 @@ package org.glassfish.webservices; import com.sun.enterprise.deployment.WebServiceEndpoint; + import java.util.Collection; import java.util.concurrent.CopyOnWriteArraySet; diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceEjbEndpointRegistry.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceEjbEndpointRegistry.java index 92e77015347..54d502bf0d7 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceEjbEndpointRegistry.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServiceEjbEndpointRegistry.java @@ -18,9 +18,13 @@ import com.sun.enterprise.container.common.spi.util.InjectionException; import com.sun.enterprise.container.common.spi.util.InjectionManager; -import com.sun.xml.ws.transport.http.servlet.ServletAdapterList; -import com.sun.xml.ws.transport.http.servlet.ServletAdapter; import com.sun.enterprise.deployment.WebServiceEndpoint; +import com.sun.xml.ws.transport.http.servlet.ServletAdapter; +import com.sun.xml.ws.transport.http.servlet.ServletAdapterList; + +import jakarta.inject.Singleton; +import jakarta.xml.ws.WebServiceException; +import jakarta.xml.ws.handler.Handler; import java.util.Collection; import java.util.HashMap; @@ -31,15 +35,11 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.inject.Singleton; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.webservices.monitoring.WebServiceEngineImpl; -import org.glassfish.ejb.spi.WSEjbEndpointRegistry; import org.glassfish.ejb.api.EjbEndpointFacade; - -import jakarta.xml.ws.WebServiceException; -import jakarta.xml.ws.handler.Handler; +import org.glassfish.ejb.spi.WSEjbEndpointRegistry; +import org.glassfish.webservices.monitoring.WebServiceEngineImpl; +import org.jvnet.hk2.annotations.Service; /** * This class acts as a registry of all the webservice EJB end points diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesContainer.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesContainer.java index d5d481fcf50..71a7f7c11d0 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesContainer.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesContainer.java @@ -17,22 +17,24 @@ package org.glassfish.webservices; import com.sun.xml.ws.api.server.LazyMOMProvider; + +import jakarta.inject.Singleton; + +import java.io.IOException; +import java.lang.management.ManagementFactory; + +import javax.management.ObjectName; + import org.glassfish.api.container.Container; import org.glassfish.api.deployment.Deployer; import org.glassfish.external.amx.AMXGlassfish; import org.glassfish.external.amx.MBeanListener; import org.glassfish.gmbal.ManagedObjectManager; import org.glassfish.gmbal.ManagedObjectManagerFactory; -import org.glassfish.webservices.deployment.WebServicesDeploymentMBean; - -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PostConstruct; import org.glassfish.hk2.api.PreDestroy; -import jakarta.inject.Singleton; - -import javax.management.ObjectName; -import java.io.IOException; -import java.lang.management.ManagementFactory; +import org.glassfish.webservices.deployment.WebServicesDeploymentMBean; +import org.jvnet.hk2.annotations.Service; /** * Web services container service diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesContract.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesContract.java index 38f952c716a..93c5d513f29 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesContract.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesContract.java @@ -16,10 +16,12 @@ package org.glassfish.webservices; -import org.jvnet.hk2.annotations.Contract; import com.sun.enterprise.container.common.spi.util.ComponentEnvManager; + import java.util.logging.Logger; +import org.jvnet.hk2.annotations.Contract; + /** * This is the interface which will define the contract diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/cli/ListWebServicesCommand.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/cli/ListWebServicesCommand.java index c39cefb4e2f..aeedeb6050b 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/cli/ListWebServicesCommand.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/cli/ListWebServicesCommand.java @@ -17,28 +17,29 @@ package org.glassfish.webservices.cli; import com.sun.enterprise.config.serverbeans.Application; + +import jakarta.inject.Inject; +import jakarta.inject.Provider; + +import java.util.Map; +import java.util.Properties; + import org.glassfish.api.ActionReport; import org.glassfish.api.Param; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.CommandLock; import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; +import org.glassfish.api.admin.RestParam; import org.glassfish.api.admin.RuntimeType; +import org.glassfish.hk2.api.PerLookup; import org.glassfish.webservices.WebServicesContainer; import org.glassfish.webservices.deployment.DeployedEndpointData; import org.glassfish.webservices.deployment.WebServicesDeploymentMBean; import org.jvnet.hk2.annotations.Optional; - import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; - -import java.util.Map; -import java.util.Properties; -import jakarta.inject.Inject; -import jakarta.inject.Provider; -import org.glassfish.api.admin.RestEndpoint; -import org.glassfish.api.admin.RestEndpoints; -import org.glassfish.api.admin.RestParam; /** * CLI for listing all web services. diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/deployment/DeployedEndpointData.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/deployment/DeployedEndpointData.java index 9cf65fe9a40..24cbb31cc3d 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/deployment/DeployedEndpointData.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/deployment/DeployedEndpointData.java @@ -16,21 +16,23 @@ package org.glassfish.webservices.deployment; -import org.glassfish.gmbal.ManagedData; -import org.glassfish.gmbal.Description; -import org.glassfish.gmbal.ManagedAttribute; -import org.glassfish.external.statistics.impl.StatisticImpl; -import com.sun.enterprise.deployment.WebServiceEndpoint; import com.sun.enterprise.deployment.Application; +import com.sun.enterprise.deployment.WebServiceEndpoint; import com.sun.xml.ws.api.server.WSEndpoint; import com.sun.xml.ws.transport.http.servlet.ServletAdapter; -import javax.xml.namespace.QName; import java.util.Collection; -import java.util.Map; import java.util.HashMap; +import java.util.Map; import java.util.Set; +import javax.xml.namespace.QName; + +import org.glassfish.external.statistics.impl.StatisticImpl; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedData; + /** * 109 and sun-jaxws.xml style deployed endpoint's info. * diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/deployment/WSDolSupportImpl.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/deployment/WSDolSupportImpl.java index ce39090d109..75e6e4165e1 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/deployment/WSDolSupportImpl.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/deployment/WSDolSupportImpl.java @@ -16,15 +16,16 @@ package org.glassfish.webservices.deployment; -import org.jvnet.hk2.annotations.Service; +import com.sun.enterprise.deployment.ServiceReferenceDescriptor; +import com.sun.enterprise.deployment.WSDolSupport; +import jakarta.xml.ws.WebServiceClient; import jakarta.xml.ws.http.HTTPBinding; import jakarta.xml.ws.soap.SOAPBinding; -import jakarta.xml.ws.WebServiceClient; + import javax.xml.namespace.QName; -import com.sun.enterprise.deployment.ServiceReferenceDescriptor; -import com.sun.enterprise.deployment.WSDolSupport; +import org.jvnet.hk2.annotations.Service; /** *Implementation of jaxws dependent services for the DOL diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/EndpointImpl.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/EndpointImpl.java index a10e7f3427c..b2c311267f4 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/EndpointImpl.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/EndpointImpl.java @@ -22,11 +22,11 @@ package org.glassfish.webservices.monitoring; -import java.util.List; -import java.util.ArrayList; - import com.sun.enterprise.deployment.WebServiceEndpoint; +import java.util.ArrayList; +import java.util.List; + /** * Implementation of the endpoint interface diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/JAXWSEndpointImpl.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/JAXWSEndpointImpl.java index a7df29e3cff..535323115e7 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/JAXWSEndpointImpl.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/JAXWSEndpointImpl.java @@ -16,14 +16,14 @@ package org.glassfish.webservices.monitoring; -import static java.util.logging.Level.WARNING; -import static org.glassfish.webservices.LogUtils.EXCEPTION_TRACING_RESPONSE; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.xml.ws.handler.MessageContext; import org.glassfish.webservices.LogUtils; import org.glassfish.webservices.SOAPMessageContext; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.xml.ws.handler.MessageContext; +import static java.util.logging.Level.WARNING; +import static org.glassfish.webservices.LogUtils.EXCEPTION_TRACING_RESPONSE; public class JAXWSEndpointImpl extends EndpointImpl { diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/LogAuthenticationListener.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/LogAuthenticationListener.java index fc48a2a2869..358cea54c90 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/LogAuthenticationListener.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/LogAuthenticationListener.java @@ -16,12 +16,13 @@ package org.glassfish.webservices.monitoring; +import com.sun.enterprise.deployment.BundleDescriptor; +import com.sun.enterprise.deployment.util.DOLUtils; + import java.security.Principal; -import java.util.logging.Logger; import java.util.logging.Level; +import java.util.logging.Logger; -import com.sun.enterprise.deployment.BundleDescriptor; -import com.sun.enterprise.deployment.util.DOLUtils; import org.glassfish.webservices.LogUtils; /** diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/MessageTraceImpl.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/MessageTraceImpl.java index 01681e75225..4683732dee5 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/MessageTraceImpl.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/MessageTraceImpl.java @@ -22,14 +22,13 @@ package org.glassfish.webservices.monitoring; -import org.glassfish.webservices.SOAPMessageContext; - -import java.util.logging.Level; import java.io.ByteArrayOutputStream; - +import java.util.logging.Level; import java.util.regex.Matcher; import java.util.regex.Pattern; + import org.glassfish.webservices.LogUtils; +import org.glassfish.webservices.SOAPMessageContext; /** * An invocation trace contains the timestamp os a particular diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/WebServiceEngineImpl.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/WebServiceEngineImpl.java index 661410605d9..49a7970a623 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/WebServiceEngineImpl.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/WebServiceEngineImpl.java @@ -24,14 +24,19 @@ import com.sun.enterprise.deployment.WebServiceEndpoint; import com.sun.enterprise.deployment.util.DOLUtils; -import org.glassfish.api.deployment.archive.ArchiveType; - -import org.glassfish.webservices.SOAPMessageContext; -import java.util.*; -import java.util.logging.Logger; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.logging.Level; +import java.util.logging.Logger; + +import org.glassfish.api.deployment.archive.ArchiveType; import org.glassfish.webservices.LogUtils; +import org.glassfish.webservices.SOAPMessageContext; /** * This class acts as a factory to create TracingSystemHandler diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/WebServiceStatsProvider.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/WebServiceStatsProvider.java index ebeb9ac9a1e..f0a9e6cde1a 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/WebServiceStatsProvider.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/WebServiceStatsProvider.java @@ -16,6 +16,10 @@ package org.glassfish.webservices.monitoring; +import com.sun.xml.ws.transport.http.servlet.ServletAdapter; + +import jakarta.servlet.ServletContext; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -34,9 +38,6 @@ import org.glassfish.gmbal.ManagedOperation; import org.glassfish.webservices.deployment.DeployedEndpointData; -import jakarta.servlet.ServletContext; -import com.sun.xml.ws.transport.http.servlet.ServletAdapter; - /** * Provides statistics for Web Service endpoints. diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/WebServiceTesterServlet.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/WebServiceTesterServlet.java index 93a804629e9..beda1643815 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/WebServiceTesterServlet.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/WebServiceTesterServlet.java @@ -23,6 +23,20 @@ package org.glassfish.webservices.monitoring; +import com.sun.enterprise.deployment.WebServiceEndpoint; +import com.sun.enterprise.module.HK2Module; +import com.sun.enterprise.module.ModuleDefinition; +import com.sun.enterprise.module.ModulesRegistry; +import com.sun.enterprise.util.LocalStringManagerImpl; +import com.sun.tools.ws.spi.WSToolsObjectFactory; + +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.xml.ws.Service; +import jakarta.xml.ws.WebEndpoint; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; @@ -52,20 +66,6 @@ import org.glassfish.webservices.LogUtils; import org.glassfish.webservices.WebServiceContractImpl; -import com.sun.enterprise.deployment.WebServiceEndpoint; -import com.sun.enterprise.module.HK2Module; -import com.sun.enterprise.module.ModuleDefinition; -import com.sun.enterprise.module.ModulesRegistry; -import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.tools.ws.spi.WSToolsObjectFactory; - -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.xml.ws.Service; -import jakarta.xml.ws.WebEndpoint; - /** * This servlet is responsible for testing web-services. * diff --git a/appserver/webservices/jsr109-impl/src/test/java/org/glassfish/webservices/JAXWSAdapterRegistryTest.java b/appserver/webservices/jsr109-impl/src/test/java/org/glassfish/webservices/JAXWSAdapterRegistryTest.java index cfc29ff4dc8..a5a9398b3dc 100644 --- a/appserver/webservices/jsr109-impl/src/test/java/org/glassfish/webservices/JAXWSAdapterRegistryTest.java +++ b/appserver/webservices/jsr109-impl/src/test/java/org/glassfish/webservices/JAXWSAdapterRegistryTest.java @@ -35,6 +35,8 @@ import com.sun.xml.ws.policy.PolicyMap; import com.sun.xml.ws.wsdl.OperationDispatcher; +import jakarta.xml.ws.EndpointReference; + import java.util.HashSet; import java.util.List; import java.util.Set; @@ -46,8 +48,6 @@ import org.junit.jupiter.api.Test; import org.w3c.dom.Element; -import jakarta.xml.ws.EndpointReference; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/appserver/webservices/metro-glue/src/main/java/org/glassfish/webservices/metroglue/LogUtils.java b/appserver/webservices/metro-glue/src/main/java/org/glassfish/webservices/metroglue/LogUtils.java index 550b349f4b5..56bd87fd51b 100644 --- a/appserver/webservices/metro-glue/src/main/java/org/glassfish/webservices/metroglue/LogUtils.java +++ b/appserver/webservices/metro-glue/src/main/java/org/glassfish/webservices/metroglue/LogUtils.java @@ -17,6 +17,7 @@ package org.glassfish.webservices.metroglue; import java.util.logging.Logger; + import org.glassfish.logging.annotation.LogMessageInfo; import org.glassfish.logging.annotation.LogMessagesResourceBundle; import org.glassfish.logging.annotation.LoggerInfo; diff --git a/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/AppServRegistry.java b/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/AppServRegistry.java index c3e1ed65770..4000ecb538d 100644 --- a/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/AppServRegistry.java +++ b/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/AppServRegistry.java @@ -17,17 +17,19 @@ package org.glassfish.webservices.transport.tcp; import com.sun.enterprise.deployment.WebBundleDescriptor; -import com.sun.istack.NotNull; -import com.sun.istack.Nullable; import com.sun.enterprise.deployment.WebServiceEndpoint; import com.sun.enterprise.web.WebApplication; import com.sun.enterprise.web.WebModule; +import com.sun.istack.NotNull; +import com.sun.istack.Nullable; import com.sun.xml.ws.transport.tcp.resources.MessagesMessages; + import java.util.Collection; import java.util.Iterator; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; + import org.glassfish.internal.data.ApplicationInfo; import org.glassfish.internal.data.ApplicationRegistry; import org.glassfish.internal.data.EngineRef; diff --git a/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/Connector.java b/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/Connector.java index 6761e040e5c..0401bf665b1 100644 --- a/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/Connector.java +++ b/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/Connector.java @@ -24,6 +24,7 @@ import com.sun.xml.ws.transport.tcp.server.IncomeMessageProcessor; import com.sun.xml.ws.transport.tcp.server.TCPMessageListener; import com.sun.xml.ws.transport.tcp.server.WSTCPConnector; + import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.SocketChannel; diff --git a/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/Ejb109Adapter.java b/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/Ejb109Adapter.java index 8ba64a867b5..7059ed717a2 100644 --- a/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/Ejb109Adapter.java +++ b/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/Ejb109Adapter.java @@ -17,6 +17,7 @@ package org.glassfish.webservices.transport.tcp; import com.sun.xml.ws.api.server.WSEndpoint; + import org.glassfish.webservices.AdapterInvocationInfo; import org.glassfish.webservices.EjbRuntimeEndpointInfo; diff --git a/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/LogUtils.java b/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/LogUtils.java index e368d3df6a9..8831cdb96ca 100644 --- a/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/LogUtils.java +++ b/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/LogUtils.java @@ -17,6 +17,7 @@ package org.glassfish.webservices.transport.tcp; import java.util.logging.Logger; + import org.glassfish.logging.annotation.LogMessageInfo; import org.glassfish.logging.annotation.LogMessagesResourceBundle; import org.glassfish.logging.annotation.LoggerInfo; diff --git a/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/TCP109Adapter.java b/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/TCP109Adapter.java index e2d2478e803..1513808da98 100644 --- a/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/TCP109Adapter.java +++ b/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/TCP109Adapter.java @@ -19,9 +19,10 @@ import com.sun.istack.NotNull; import com.sun.xml.ws.api.message.Packet; import com.sun.xml.ws.api.server.WSEndpoint; -import com.sun.xml.ws.transport.tcp.util.ChannelContext; import com.sun.xml.ws.transport.tcp.server.TCPAdapter; +import com.sun.xml.ws.transport.tcp.util.ChannelContext; import com.sun.xml.ws.transport.tcp.util.WSTCPException; + import java.io.IOException; /** diff --git a/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/V3Module.java b/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/V3Module.java index 5c1b477c21a..2112f2eb547 100644 --- a/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/V3Module.java +++ b/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/V3Module.java @@ -30,8 +30,11 @@ import com.sun.xml.ws.transport.tcp.server.WSTCPDelegate; import com.sun.xml.ws.transport.tcp.server.WSTCPModule; import com.sun.xml.ws.transport.tcp.servicechannel.ServiceChannelWSImpl; + import java.util.List; + import javax.xml.namespace.QName; + import org.glassfish.api.invocation.InvocationManager; import org.glassfish.ejb.spi.WSEjbEndpointRegistry; import org.glassfish.webservices.WebServiceDeploymentListener; diff --git a/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/WSEndpointDescriptor.java b/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/WSEndpointDescriptor.java index 1106078a0b2..adcc39588a8 100644 --- a/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/WSEndpointDescriptor.java +++ b/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/WSEndpointDescriptor.java @@ -16,10 +16,10 @@ package org.glassfish.webservices.transport.tcp; -import javax.xml.namespace.QName; - import com.sun.enterprise.deployment.WebServiceEndpoint; +import javax.xml.namespace.QName; + /** * @author Alexey Stashok */ diff --git a/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/WSEndpointLifeCycleListener.java b/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/WSEndpointLifeCycleListener.java index dcc21eca737..d69d64d698c 100644 --- a/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/WSEndpointLifeCycleListener.java +++ b/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/WSEndpointLifeCycleListener.java @@ -18,6 +18,7 @@ import java.util.logging.Level; import java.util.logging.Logger; + import org.glassfish.webservices.monitoring.Endpoint; import org.glassfish.webservices.monitoring.EndpointLifecycleListener; diff --git a/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/WSTCPAdapterRegistryImpl.java b/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/WSTCPAdapterRegistryImpl.java index b42b67f8ccc..702ced6117b 100644 --- a/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/WSTCPAdapterRegistryImpl.java +++ b/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/WSTCPAdapterRegistryImpl.java @@ -21,13 +21,15 @@ import com.sun.istack.NotNull; import com.sun.xml.ws.api.server.Adapter; import com.sun.xml.ws.transport.tcp.resources.MessagesMessages; -import com.sun.xml.ws.transport.tcp.util.WSTCPURI; import com.sun.xml.ws.transport.tcp.server.TCPAdapter; import com.sun.xml.ws.transport.tcp.server.WSTCPAdapterRegistry; +import com.sun.xml.ws.transport.tcp.util.WSTCPURI; + import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; + import org.glassfish.api.invocation.ComponentInvocation; import org.glassfish.webservices.AdapterInvocationInfo; import org.glassfish.webservices.EjbRuntimeEndpointInfo; diff --git a/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/WSTCPProtocolFilter.java b/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/WSTCPProtocolFilter.java index 8f681ae54d5..fca11309a0e 100644 --- a/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/WSTCPProtocolFilter.java +++ b/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/WSTCPProtocolFilter.java @@ -16,9 +16,6 @@ package org.glassfish.webservices.transport.tcp; -import org.glassfish.grizzly.Connection; -import org.glassfish.grizzly.filterchain.FilterChainContext; -import org.glassfish.grizzly.filterchain.NextAction; import java.io.IOException; import java.net.InetSocketAddress; import java.nio.ByteBuffer; @@ -26,8 +23,12 @@ import java.nio.channels.SocketChannel; import java.util.logging.Level; import java.util.logging.Logger; + import org.glassfish.grizzly.Buffer; +import org.glassfish.grizzly.Connection; import org.glassfish.grizzly.filterchain.BaseFilter; +import org.glassfish.grizzly.filterchain.FilterChainContext; +import org.glassfish.grizzly.filterchain.NextAction; import org.glassfish.grizzly.nio.NIOConnection; /** diff --git a/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/WSTCPProtocolFinder.java b/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/WSTCPProtocolFinder.java index acf803f0d82..cca64a4780d 100644 --- a/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/WSTCPProtocolFinder.java +++ b/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/WSTCPProtocolFinder.java @@ -17,9 +17,11 @@ package org.glassfish.webservices.transport.tcp; import com.sun.xml.ws.transport.tcp.util.TCPConstants; + import java.io.UnsupportedEncodingException; import java.util.logging.Level; import java.util.logging.Logger; + import org.glassfish.grizzly.Buffer; import org.glassfish.grizzly.filterchain.FilterChainContext; import org.glassfish.grizzly.portunif.PUContext; diff --git a/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/Web109Adapter.java b/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/Web109Adapter.java index 9796c9d1210..e18131a65aa 100644 --- a/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/Web109Adapter.java +++ b/appserver/webservices/soap-tcp/src/main/java/org/glassfish/webservices/transport/tcp/Web109Adapter.java @@ -17,6 +17,7 @@ package org.glassfish.webservices.transport.tcp; import com.sun.xml.ws.api.server.WSEndpoint; + import org.glassfish.api.invocation.ComponentInvocation; import org.glassfish.api.invocation.InvocationManager; From 595292e6ff6875758d437c5903701c1ad2deb9c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 10:50:10 +0200 Subject: [PATCH 29/40] Imports: microprofile modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../config/ConfigCdiExtension.java | 49 ++++++++++--------- .../config/ApplicationClassConverter.java | 1 + .../config/ConfigApplicationContainer.java | 4 +- .../microprofile/config/ConfigDeployer.java | 4 +- .../microprofile/connector/ConfigSniffer.java | 6 +-- 5 files changed, 33 insertions(+), 31 deletions(-) diff --git a/appserver/microprofile/config/src/main/java/io/helidon/microprofile/config/ConfigCdiExtension.java b/appserver/microprofile/config/src/main/java/io/helidon/microprofile/config/ConfigCdiExtension.java index 0bca88e867c..e37b5afb775 100644 --- a/appserver/microprofile/config/src/main/java/io/helidon/microprofile/config/ConfigCdiExtension.java +++ b/appserver/microprofile/config/src/main/java/io/helidon/microprofile/config/ConfigCdiExtension.java @@ -17,7 +17,30 @@ package io.helidon.microprofile.config; -import static java.util.Optional.ofNullable; +import io.helidon.common.NativeImageHelper; +import io.helidon.config.ConfigException; +import io.helidon.config.mp.MpConfig; + +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.spi.AfterBeanDiscovery; +import jakarta.enterprise.inject.spi.AfterDeploymentValidation; +import jakarta.enterprise.inject.spi.Annotated; +import jakarta.enterprise.inject.spi.AnnotatedField; +import jakarta.enterprise.inject.spi.AnnotatedMethod; +import jakarta.enterprise.inject.spi.AnnotatedParameter; +import jakarta.enterprise.inject.spi.AnnotatedType; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.Extension; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.inject.spi.ProcessAnnotatedType; +import jakarta.enterprise.inject.spi.ProcessBean; +import jakarta.enterprise.inject.spi.ProcessObserverMethod; +import jakarta.enterprise.inject.spi.ProcessSyntheticObserverMethod; +import jakarta.enterprise.inject.spi.WithAnnotations; import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; @@ -49,29 +72,7 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.config.spi.Converter; -import io.helidon.common.NativeImageHelper; -import io.helidon.config.ConfigException; -import io.helidon.config.mp.MpConfig; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.context.spi.CreationalContext; -import jakarta.enterprise.event.Observes; -import jakarta.enterprise.inject.spi.AfterBeanDiscovery; -import jakarta.enterprise.inject.spi.AfterDeploymentValidation; -import jakarta.enterprise.inject.spi.Annotated; -import jakarta.enterprise.inject.spi.AnnotatedField; -import jakarta.enterprise.inject.spi.AnnotatedMethod; -import jakarta.enterprise.inject.spi.AnnotatedParameter; -import jakarta.enterprise.inject.spi.AnnotatedType; -import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.inject.spi.BeanManager; -import jakarta.enterprise.inject.spi.Extension; -import jakarta.enterprise.inject.spi.InjectionPoint; -import jakarta.enterprise.inject.spi.ProcessAnnotatedType; -import jakarta.enterprise.inject.spi.ProcessBean; -import jakarta.enterprise.inject.spi.ProcessObserverMethod; -import jakarta.enterprise.inject.spi.ProcessSyntheticObserverMethod; -import jakarta.enterprise.inject.spi.WithAnnotations; +import static java.util.Optional.ofNullable; /** * Extension to enable config injection in CDI container (all of {@link io.helidon.config.Config}, diff --git a/appserver/microprofile/config/src/main/java/org/glassfish/microprofile/config/ApplicationClassConverter.java b/appserver/microprofile/config/src/main/java/org/glassfish/microprofile/config/ApplicationClassConverter.java index 64cdf7a7de8..c5ceae8135f 100644 --- a/appserver/microprofile/config/src/main/java/org/glassfish/microprofile/config/ApplicationClassConverter.java +++ b/appserver/microprofile/config/src/main/java/org/glassfish/microprofile/config/ApplicationClassConverter.java @@ -16,6 +16,7 @@ package org.glassfish.microprofile.config; import jakarta.annotation.Priority; + import org.eclipse.microprofile.config.spi.Converter; /** diff --git a/appserver/microprofile/config/src/main/java/org/glassfish/microprofile/config/ConfigApplicationContainer.java b/appserver/microprofile/config/src/main/java/org/glassfish/microprofile/config/ConfigApplicationContainer.java index ecf54ce25e1..9544944dcf2 100644 --- a/appserver/microprofile/config/src/main/java/org/glassfish/microprofile/config/ConfigApplicationContainer.java +++ b/appserver/microprofile/config/src/main/java/org/glassfish/microprofile/config/ConfigApplicationContainer.java @@ -15,13 +15,13 @@ */ package org.glassfish.microprofile.config; +import java.net.JarURLConnection; + import org.eclipse.microprofile.config.ConfigProvider; import org.glassfish.api.deployment.ApplicationContainer; import org.glassfish.api.deployment.ApplicationContext; import org.glassfish.api.deployment.DeploymentContext; -import java.net.JarURLConnection; - public class ConfigApplicationContainer implements ApplicationContainer { private static final String JAR_URL_PROTOCOL = "jar"; diff --git a/appserver/microprofile/config/src/main/java/org/glassfish/microprofile/config/ConfigDeployer.java b/appserver/microprofile/config/src/main/java/org/glassfish/microprofile/config/ConfigDeployer.java index 11a9e72249b..babc296ceac 100644 --- a/appserver/microprofile/config/src/main/java/org/glassfish/microprofile/config/ConfigDeployer.java +++ b/appserver/microprofile/config/src/main/java/org/glassfish/microprofile/config/ConfigDeployer.java @@ -15,6 +15,8 @@ */ package org.glassfish.microprofile.config; +import java.util.ServiceLoader; + import org.eclipse.microprofile.config.spi.ConfigProviderResolver; import org.glassfish.api.container.Container; import org.glassfish.api.deployment.ApplicationContainer; @@ -23,8 +25,6 @@ import org.glassfish.api.deployment.MetaData; import org.jvnet.hk2.annotations.Service; -import java.util.ServiceLoader; - @Service public class ConfigDeployer implements Deployer { diff --git a/appserver/microprofile/connectors/src/main/java/org/glassfish/microprofile/connector/ConfigSniffer.java b/appserver/microprofile/connectors/src/main/java/org/glassfish/microprofile/connector/ConfigSniffer.java index a5e7efe75fa..2320bb2766f 100644 --- a/appserver/microprofile/connectors/src/main/java/org/glassfish/microprofile/connector/ConfigSniffer.java +++ b/appserver/microprofile/connectors/src/main/java/org/glassfish/microprofile/connector/ConfigSniffer.java @@ -15,6 +15,9 @@ */ package org.glassfish.microprofile.connector; +import java.io.IOException; +import java.lang.annotation.Annotation; + import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.inject.ConfigProperties; import org.eclipse.microprofile.config.inject.ConfigProperty; @@ -25,9 +28,6 @@ import org.glassfish.internal.deployment.GenericSniffer; import org.jvnet.hk2.annotations.Service; -import java.io.IOException; -import java.lang.annotation.Annotation; - @Service public class ConfigSniffer extends GenericSniffer { From 188e1a1a0a95032257cd30ec8c378770b466fb38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 11:00:03 +0200 Subject: [PATCH 30/40] Imports: ant-tasks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../org/glassfish/ant/embedded/tasks/DeployTask.java | 4 ++-- .../org/glassfish/ant/embedded/tasks/TaskBase.java | 2 +- .../java/org/glassfish/ant/embedded/tasks/Util.java | 10 +++++----- .../main/java/org/glassfish/ant/tasks/AdminTask.java | 10 ++++++---- .../java/org/glassfish/ant/tasks/ComponentTask.java | 7 ++++--- .../main/java/org/glassfish/ant/tasks/DeployTask.java | 7 ++++--- .../java/org/glassfish/ant/tasks/UndeployTask.java | 6 ++++-- 7 files changed, 26 insertions(+), 20 deletions(-) diff --git a/appserver/ant-tasks/src/main/java/org/glassfish/ant/embedded/tasks/DeployTask.java b/appserver/ant-tasks/src/main/java/org/glassfish/ant/embedded/tasks/DeployTask.java index f35f1ed73a9..117b00c3d6b 100644 --- a/appserver/ant-tasks/src/main/java/org/glassfish/ant/embedded/tasks/DeployTask.java +++ b/appserver/ant-tasks/src/main/java/org/glassfish/ant/embedded/tasks/DeployTask.java @@ -16,11 +16,11 @@ package org.glassfish.ant.embedded.tasks; -import org.apache.tools.ant.BuildException; - import java.util.ArrayList; import java.util.List; +import org.apache.tools.ant.BuildException; + public class DeployTask extends TaskBase { diff --git a/appserver/ant-tasks/src/main/java/org/glassfish/ant/embedded/tasks/TaskBase.java b/appserver/ant-tasks/src/main/java/org/glassfish/ant/embedded/tasks/TaskBase.java index f65d0176c04..417b065c4cf 100644 --- a/appserver/ant-tasks/src/main/java/org/glassfish/ant/embedded/tasks/TaskBase.java +++ b/appserver/ant-tasks/src/main/java/org/glassfish/ant/embedded/tasks/TaskBase.java @@ -16,8 +16,8 @@ package org.glassfish.ant.embedded.tasks; -import org.apache.tools.ant.Task; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Task; public class TaskBase extends Task { diff --git a/appserver/ant-tasks/src/main/java/org/glassfish/ant/embedded/tasks/Util.java b/appserver/ant-tasks/src/main/java/org/glassfish/ant/embedded/tasks/Util.java index 4cd6a0e0560..41f63b7f796 100644 --- a/appserver/ant-tasks/src/main/java/org/glassfish/ant/embedded/tasks/Util.java +++ b/appserver/ant-tasks/src/main/java/org/glassfish/ant/embedded/tasks/Util.java @@ -16,6 +16,11 @@ package org.glassfish.ant.embedded.tasks; +import java.io.File; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.glassfish.embeddable.BootstrapProperties; import org.glassfish.embeddable.CommandResult; import org.glassfish.embeddable.CommandRunner; @@ -25,11 +30,6 @@ import org.glassfish.embeddable.GlassFishProperties; import org.glassfish.embeddable.GlassFishRuntime; -import java.io.File; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - public class Util { diff --git a/appserver/ant-tasks/src/main/java/org/glassfish/ant/tasks/AdminTask.java b/appserver/ant-tasks/src/main/java/org/glassfish/ant/tasks/AdminTask.java index 10ededc86b6..6f74cb30008 100644 --- a/appserver/ant-tasks/src/main/java/org/glassfish/ant/tasks/AdminTask.java +++ b/appserver/ant-tasks/src/main/java/org/glassfish/ant/tasks/AdminTask.java @@ -16,11 +16,13 @@ package org.glassfish.ant.tasks; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.BuildException; +import java.io.BufferedReader; +import java.io.File; +import java.io.InputStreamReader; -import java.io.*; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; public class AdminTask extends Task { diff --git a/appserver/ant-tasks/src/main/java/org/glassfish/ant/tasks/ComponentTask.java b/appserver/ant-tasks/src/main/java/org/glassfish/ant/tasks/ComponentTask.java index 056db2ae885..21d8046c3cb 100644 --- a/appserver/ant-tasks/src/main/java/org/glassfish/ant/tasks/ComponentTask.java +++ b/appserver/ant-tasks/src/main/java/org/glassfish/ant/tasks/ComponentTask.java @@ -15,10 +15,11 @@ */ package org.glassfish.ant.tasks; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.BuildException; +import java.util.ArrayList; +import java.util.List; -import java.util.*; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; public class ComponentTask extends DeployTask { diff --git a/appserver/ant-tasks/src/main/java/org/glassfish/ant/tasks/DeployTask.java b/appserver/ant-tasks/src/main/java/org/glassfish/ant/tasks/DeployTask.java index f0dbd014028..e9cd5b27c8d 100644 --- a/appserver/ant-tasks/src/main/java/org/glassfish/ant/tasks/DeployTask.java +++ b/appserver/ant-tasks/src/main/java/org/glassfish/ant/tasks/DeployTask.java @@ -16,10 +16,11 @@ package org.glassfish.ant.tasks; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.BuildException; +import java.util.ArrayList; +import java.util.List; -import java.util.*; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; public class DeployTask extends AdminTask { diff --git a/appserver/ant-tasks/src/main/java/org/glassfish/ant/tasks/UndeployTask.java b/appserver/ant-tasks/src/main/java/org/glassfish/ant/tasks/UndeployTask.java index b688fcbc84e..6826dd0422e 100644 --- a/appserver/ant-tasks/src/main/java/org/glassfish/ant/tasks/UndeployTask.java +++ b/appserver/ant-tasks/src/main/java/org/glassfish/ant/tasks/UndeployTask.java @@ -16,9 +16,11 @@ package org.glassfish.ant.tasks; -import org.apache.tools.ant.Project; +import java.util.ArrayList; +import java.util.List; + import org.apache.tools.ant.BuildException; -import java.util.*; +import org.apache.tools.ant.Project; public class UndeployTask extends AdminTask { From 9a51218cf0a23d3341be0ca9cd9f80c8a0dee882 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 11:02:27 +0200 Subject: [PATCH 31/40] Imports: distributions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../distributions/test/EmbeddedTest.java | 20 ++++++++++--------- .../distributions/test/UnitTest.java | 10 ++++++---- .../distributions/test/web/WebHello.java | 9 ++++++--- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/appserver/distributions/web/src/test/java/org/glassfish/distributions/test/EmbeddedTest.java b/appserver/distributions/web/src/test/java/org/glassfish/distributions/test/EmbeddedTest.java index 12aa5cab142..147707603f3 100644 --- a/appserver/distributions/web/src/test/java/org/glassfish/distributions/test/EmbeddedTest.java +++ b/appserver/distributions/web/src/test/java/org/glassfish/distributions/test/EmbeddedTest.java @@ -16,6 +16,16 @@ package org.glassfish.distributions.test; +import java.io.BufferedReader; +import java.io.File; +import java.io.InputStreamReader; +import java.net.URL; +import java.net.URLConnection; +import java.util.Collection; + +import javax.naming.InitialContext; +import javax.naming.NamingException; + import org.glassfish.distributions.test.ejb.SampleEjb; import org.glassfish.embeddable.CommandResult; import org.glassfish.embeddable.CommandRunner; @@ -23,17 +33,9 @@ import org.glassfish.embeddable.GlassFish; import org.glassfish.embeddable.GlassFishException; import org.glassfish.embeddable.GlassFishRuntime; -import org.glassfish.embeddable.web.WebContainer; import org.glassfish.embeddable.web.HttpListener; +import org.glassfish.embeddable.web.WebContainer; import org.glassfish.embeddable.web.WebListener; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import java.io.BufferedReader; -import java.io.File; -import java.io.InputStreamReader; -import java.net.URL; -import java.net.URLConnection; -import java.util.Collection; public class EmbeddedTest { diff --git a/appserver/distributions/web/src/test/java/org/glassfish/distributions/test/UnitTest.java b/appserver/distributions/web/src/test/java/org/glassfish/distributions/test/UnitTest.java index d411f57b19e..822b75ca93a 100644 --- a/appserver/distributions/web/src/test/java/org/glassfish/distributions/test/UnitTest.java +++ b/appserver/distributions/web/src/test/java/org/glassfish/distributions/test/UnitTest.java @@ -16,16 +16,18 @@ package org.glassfish.distributions.test; -import org.glassfish.distributions.test.ejb.SampleEjb; +import jakarta.ejb.EJBException; +import jakarta.ejb.embeddable.EJBContainer; import java.io.File; import java.net.URL; -import java.util.Map; import java.util.HashMap; -import jakarta.ejb.*; -import jakarta.ejb.embeddable.EJBContainer; +import java.util.Map; + import javax.naming.Context; +import org.glassfish.distributions.test.ejb.SampleEjb; + public class UnitTest { @Test diff --git a/appserver/distributions/web/src/test/java/org/glassfish/distributions/test/web/WebHello.java b/appserver/distributions/web/src/test/java/org/glassfish/distributions/test/web/WebHello.java index 579a955ab28..f372d16576f 100644 --- a/appserver/distributions/web/src/test/java/org/glassfish/distributions/test/web/WebHello.java +++ b/appserver/distributions/web/src/test/java/org/glassfish/distributions/test/web/WebHello.java @@ -16,11 +16,14 @@ package org.glassfish.distributions.test.web; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.io.PrintWriter; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.*; -import jakarta.servlet.http.*; @WebServlet(urlPatterns={"/hello"}) From 0daf5e9b55cb6422e12a651130a77caca2b3b8ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 11:09:20 +0200 Subject: [PATCH 32/40] Imports - test modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../itest/tools/asadmin/CollectLogFiles.java | 13 +++--- .../asadmin/DetachedTerseAsadminResult.java | 1 + .../main/admin/test/ClusterITest.java | 27 +++++------ .../main/admin/test/ConnectionUtils.java | 6 +-- .../main/admin/test/StartServITest.java | 14 +++--- .../main/admin/test/TestResources.java | 1 + .../admin/test/progress/JobManagerITest.java | 2 +- .../admin/test/rest/ApplicationITest.java | 2 +- .../main/admin/test/rest/AuthRealmITest.java | 23 ++++++---- .../admin/test/rest/LoggingRestITest.java | 4 +- .../main/admin/test/rest/MailITest.java | 3 +- .../admin/test/rest/ResourceRefITest.java | 1 + .../admin/test/rest/SecuredRestTestBase.java | 6 +-- .../test/webapp/HttpServerNameITest.java | 11 +++-- ...TasksSubmittedDuringDeploymentServlet.java | 2 +- .../app/concurrency/executor/StartupBean.java | 1 + .../app/ejb/AccessLocalEJBByJNDIServlet.java | 5 +- .../app/ejb/AccessRemoteEJBByJNDIServlet.java | 5 +- .../security/jsp2sful/ProfileInfoRemote.java | 3 +- .../main/test/app/ejb/AccessEJBWebTest.java | 12 ++--- .../CciConnectionEventListener.java | 4 +- .../cciblackbox/CciConnectionFactory.java | 7 +-- .../cciblackbox/CciConnectionManager.java | 4 +- .../connector/cciblackbox/CciInteraction.java | 12 ++--- .../cciblackbox/CciInteractionSpec.java | 4 +- .../CciManagedConnectionMetaDataImpl.java | 6 +-- .../com/sun/connector/cciblackbox/Util.java | 11 +++-- .../com/sun/jdbcra/spi/ConnectionHolder.java | 17 ++++++- .../com/sun/appserv/test/BaseDevTest.java | 10 ++-- .../process/ProcessStreamDrainerWorker.java | 5 +- .../com/sun/ejte/ccl/reporter/ParseML.java | 19 ++++++-- .../com/sun/ejte/ccl/reporter/Reporter.java | 46 +++++++++---------- .../ccl/reporter/SimpleReporterAdapter.java | 6 ++- .../ejte/ccl/webrunner/proxy/MimeHeader.java | 4 +- .../sun/ejte/ccl/webrunner/proxy/httpd.java | 11 +++-- .../ccl/webrunner/webtest/MimeHeader.java | 4 +- .../ejte/ccl/webrunner/webtest/WebTest.java | 2 +- .../grizzly/test/http2/HttpRequest.java | 1 + .../grizzly/test/http2/HttpResponse.java | 2 +- .../tests/utils/junit/HK2JUnit5Extension.java | 3 +- .../junit/matcher/DirectoryMatchers.java | 6 +-- .../utils/junit/matcher/TextFileMatchers.java | 8 ++-- 42 files changed, 196 insertions(+), 138 deletions(-) diff --git a/appserver/itest-tools/src/main/java/org/glassfish/main/itest/tools/asadmin/CollectLogFiles.java b/appserver/itest-tools/src/main/java/org/glassfish/main/itest/tools/asadmin/CollectLogFiles.java index 9af9131febc..87f8cace319 100644 --- a/appserver/itest-tools/src/main/java/org/glassfish/main/itest/tools/asadmin/CollectLogFiles.java +++ b/appserver/itest-tools/src/main/java/org/glassfish/main/itest/tools/asadmin/CollectLogFiles.java @@ -15,12 +15,6 @@ */ package org.glassfish.main.itest.tools.asadmin; -import static org.glassfish.main.itest.tools.GlassFishTestEnvironment.getAsadmin; -import static org.glassfish.main.itest.tools.asadmin.AsadminResultMatcher.asadminOK; -import static org.hamcrest.CoreMatchers.endsWith; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.MatcherAssert.assertThat; - import java.io.BufferedReader; import java.io.File; import java.io.IOException; @@ -29,8 +23,15 @@ import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; + import org.apache.commons.lang3.StringUtils; +import static org.glassfish.main.itest.tools.GlassFishTestEnvironment.getAsadmin; +import static org.glassfish.main.itest.tools.asadmin.AsadminResultMatcher.asadminOK; +import static org.hamcrest.CoreMatchers.endsWith; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.MatcherAssert.assertThat; + /** * * @author Ondro Mihalyi diff --git a/appserver/itest-tools/src/main/java/org/glassfish/main/itest/tools/asadmin/DetachedTerseAsadminResult.java b/appserver/itest-tools/src/main/java/org/glassfish/main/itest/tools/asadmin/DetachedTerseAsadminResult.java index 6b112220fbe..01a0d0a88c6 100644 --- a/appserver/itest-tools/src/main/java/org/glassfish/main/itest/tools/asadmin/DetachedTerseAsadminResult.java +++ b/appserver/itest-tools/src/main/java/org/glassfish/main/itest/tools/asadmin/DetachedTerseAsadminResult.java @@ -18,6 +18,7 @@ package org.glassfish.main.itest.tools.asadmin; import java.util.Arrays; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.arrayWithSize; diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/ClusterITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/ClusterITest.java index cbb4e218cfa..28ce29e0b7a 100644 --- a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/ClusterITest.java +++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/ClusterITest.java @@ -16,24 +16,12 @@ */ package org.glassfish.main.admin.test; -import static org.glassfish.main.admin.test.ConnectionUtils.getURL; -import static org.glassfish.main.itest.tools.asadmin.AsadminResultMatcher.asadminOK; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.allOf; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.endsWith; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.startsWith; -import static org.hamcrest.Matchers.stringContainsInOrder; -import static org.junit.jupiter.api.Assertions.assertAll; -import static org.junit.jupiter.api.Assertions.assertNotNull; - import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.concurrent.atomic.AtomicBoolean; + import org.apache.commons.lang3.StringUtils; import org.glassfish.main.itest.tools.GlassFishTestEnvironment; import org.glassfish.main.itest.tools.asadmin.Asadmin; @@ -45,6 +33,19 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; +import static org.glassfish.main.admin.test.ConnectionUtils.getURL; +import static org.glassfish.main.itest.tools.asadmin.AsadminResultMatcher.asadminOK; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.allOf; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.endsWith; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.startsWith; +import static org.hamcrest.Matchers.stringContainsInOrder; +import static org.junit.jupiter.api.Assertions.assertAll; +import static org.junit.jupiter.api.Assertions.assertNotNull; + /** * @author Tom Mueller */ diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/ConnectionUtils.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/ConnectionUtils.java index 4d6bfddf34d..7b99ffd8a63 100644 --- a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/ConnectionUtils.java +++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/ConnectionUtils.java @@ -15,9 +15,6 @@ */ package org.glassfish.main.admin.test; -import static java.nio.charset.StandardCharsets.ISO_8859_1; -import static org.junit.jupiter.api.Assertions.fail; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -25,6 +22,9 @@ import java.net.URL; import java.net.URLConnection; +import static java.nio.charset.StandardCharsets.ISO_8859_1; +import static org.junit.jupiter.api.Assertions.fail; + public class ConnectionUtils { /** * This method opens a connection to the given URL and returns the string that is returned from that URL. This is diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/StartServITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/StartServITest.java index 5ce74df3a0f..d05b7f8daf8 100644 --- a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/StartServITest.java +++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/StartServITest.java @@ -15,15 +15,11 @@ */ package org.glassfish.main.admin.test; -import org.glassfish.main.itest.tools.GlassFishTestEnvironment; -import org.glassfish.main.itest.tools.asadmin.AsadminResult; - -import static org.glassfish.main.itest.tools.asadmin.AsadminResultMatcher.asadminOK; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; - import java.util.stream.Stream; + +import org.glassfish.main.itest.tools.GlassFishTestEnvironment; import org.glassfish.main.itest.tools.asadmin.Asadmin; +import org.glassfish.main.itest.tools.asadmin.AsadminResult; import org.glassfish.main.itest.tools.asadmin.StartServ; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -33,6 +29,10 @@ import org.junit.jupiter.params.provider.ArgumentsProvider; import org.junit.jupiter.params.provider.ArgumentsSource; +import static org.glassfish.main.itest.tools.asadmin.AsadminResultMatcher.asadminOK; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; + /** * @author Ondro Mihalyi */ diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/TestResources.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/TestResources.java index 524757d16a2..c6153a9dd0b 100644 --- a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/TestResources.java +++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/TestResources.java @@ -17,6 +17,7 @@ import java.io.File; import java.io.IOException; + import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.exporter.ZipExporter; diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/JobManagerITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/JobManagerITest.java index 1d82d427708..a5c6ef8a9bd 100644 --- a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/JobManagerITest.java +++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/JobManagerITest.java @@ -17,10 +17,10 @@ package org.glassfish.main.admin.test.progress; -import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.glassfish.main.itest.tools.asadmin.Asadmin; import org.glassfish.main.itest.tools.asadmin.AsadminResult; import org.glassfish.main.itest.tools.asadmin.DetachedTerseAsadminResult; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ApplicationITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ApplicationITest.java index 6858eed4330..388a4d5f9a3 100644 --- a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ApplicationITest.java +++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ApplicationITest.java @@ -18,8 +18,8 @@ package org.glassfish.main.admin.test.rest; import jakarta.ws.rs.core.Response; -import java.io.File; +import java.io.File; import java.net.URISyntaxException; import java.util.Map; diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/AuthRealmITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/AuthRealmITest.java index 734ff53ba4e..2a8a808454d 100644 --- a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/AuthRealmITest.java +++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/AuthRealmITest.java @@ -17,30 +17,33 @@ package org.glassfish.main.admin.test.rest; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.hasItem; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.collection.IsMapWithSize.aMapWithSize; -import static org.junit.jupiter.api.Assertions.assertEquals; - import com.sun.enterprise.security.auth.realm.certificate.CertificateRealm; import com.sun.enterprise.security.auth.realm.file.FileRealm; import com.sun.enterprise.security.auth.realm.ldap.LDAPRealm; import com.sun.enterprise.security.auth.realm.solaris.SolarisRealm; import com.sun.enterprise.security.ee.authentication.glassfish.jdbc.JDBCRealm; import com.sun.enterprise.security.ee.authentication.glassfish.pam.PamRealm; + import jakarta.ws.rs.core.Response; + import java.util.List; import java.util.Map; import java.util.stream.Stream; + import org.glassfish.admin.rest.client.utils.MarshallingUtils; import org.glassfish.main.itest.tools.RandomGenerator; import org.junit.jupiter.api.Test; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.collection.IsMapWithSize.aMapWithSize; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class AuthRealmITest extends RestTestBase { private static final String URL_LIST_GROUP_NAMES = "/domain/configs/config/server-config/security-service/auth-realm/admin-realm/list-group-names"; private static final String URL_SUPPORTS_USER_MANAGEMENT = "/domain/configs/config/server-config/security-service/auth-realm/admin-realm/supports-user-management"; diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/LoggingRestITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/LoggingRestITest.java index 9a5d86e5278..589d7bc0d73 100644 --- a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/LoggingRestITest.java +++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/LoggingRestITest.java @@ -16,11 +16,11 @@ package org.glassfish.main.admin.test.rest; +import jakarta.ws.rs.core.Response; + import java.util.Arrays; import java.util.Map; -import jakarta.ws.rs.core.Response; - import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONObject; import org.glassfish.main.itest.tools.DomainAdminRestClient; diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/MailITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/MailITest.java index e7bb89e67cb..5269501f130 100644 --- a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/MailITest.java +++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/MailITest.java @@ -17,11 +17,12 @@ package org.glassfish.main.admin.test.rest; import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Test; import java.util.List; import java.util.Map; +import org.junit.jupiter.api.Test; + import static org.glassfish.main.itest.tools.RandomGenerator.generateRandomString; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ResourceRefITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ResourceRefITest.java index d0276a2b6db..0e9a094836a 100644 --- a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ResourceRefITest.java +++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ResourceRefITest.java @@ -26,6 +26,7 @@ import org.glassfish.main.itest.tools.asadmin.Asadmin; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/SecuredRestTestBase.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/SecuredRestTestBase.java index 587b47701a1..7bb314241d6 100644 --- a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/SecuredRestTestBase.java +++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/SecuredRestTestBase.java @@ -18,17 +18,17 @@ import jakarta.ws.rs.core.Response; +import java.util.Map; + import org.glassfish.admin.rest.client.ClientWrapper; import org.glassfish.main.itest.tools.DomainAdminRestClient; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; -import java.util.Map; - import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.glassfish.jersey.client.authentication.HttpAuthenticationFeature.basic; -import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; public class SecuredRestTestBase extends RestTestBase { diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/webapp/HttpServerNameITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/webapp/HttpServerNameITest.java index ddd9710ad1b..6000e5d90b5 100644 --- a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/webapp/HttpServerNameITest.java +++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/webapp/HttpServerNameITest.java @@ -15,14 +15,10 @@ */ package org.glassfish.main.admin.test.webapp; -import static org.glassfish.main.admin.test.ConnectionUtils.getContent; -import static org.glassfish.main.itest.tools.asadmin.AsadminResultMatcher.asadminOK; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.stringContainsInOrder; - import java.io.IOException; import java.net.HttpURLConnection; import java.util.concurrent.atomic.AtomicBoolean; + import org.glassfish.main.admin.test.TestResources; import org.glassfish.main.itest.tools.GlassFishTestEnvironment; import org.glassfish.main.itest.tools.asadmin.Asadmin; @@ -33,6 +29,11 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; +import static org.glassfish.main.admin.test.ConnectionUtils.getContent; +import static org.glassfish.main.itest.tools.asadmin.AsadminResultMatcher.asadminOK; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.stringContainsInOrder; + public class HttpServerNameITest { private static final String TEST_APP_NAME = HttpServerNameITest.class.getSimpleName(); diff --git a/appserver/tests/application/src/main/java/org/glassfish/main/test/app/concurrency/executor/ManagedExecutorTasksSubmittedDuringDeploymentServlet.java b/appserver/tests/application/src/main/java/org/glassfish/main/test/app/concurrency/executor/ManagedExecutorTasksSubmittedDuringDeploymentServlet.java index 7bf6dc50f14..dc49d202b2c 100644 --- a/appserver/tests/application/src/main/java/org/glassfish/main/test/app/concurrency/executor/ManagedExecutorTasksSubmittedDuringDeploymentServlet.java +++ b/appserver/tests/application/src/main/java/org/glassfish/main/test/app/concurrency/executor/ManagedExecutorTasksSubmittedDuringDeploymentServlet.java @@ -15,12 +15,12 @@ */ package org.glassfish.main.test.app.concurrency.executor; +import jakarta.ejb.EJB; import jakarta.servlet.annotation.WebServlet; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import jakarta.ejb.EJB; import java.io.IOException; @WebServlet("/") diff --git a/appserver/tests/application/src/main/java/org/glassfish/main/test/app/concurrency/executor/StartupBean.java b/appserver/tests/application/src/main/java/org/glassfish/main/test/app/concurrency/executor/StartupBean.java index 5be009f3e27..b2af00c35c4 100644 --- a/appserver/tests/application/src/main/java/org/glassfish/main/test/app/concurrency/executor/StartupBean.java +++ b/appserver/tests/application/src/main/java/org/glassfish/main/test/app/concurrency/executor/StartupBean.java @@ -20,6 +20,7 @@ import jakarta.ejb.Singleton; import jakarta.ejb.Startup; import jakarta.enterprise.concurrent.ManagedExecutorService; + import java.util.logging.Level; import java.util.logging.Logger; diff --git a/appserver/tests/application/src/main/java/org/glassfish/main/test/app/ejb/AccessLocalEJBByJNDIServlet.java b/appserver/tests/application/src/main/java/org/glassfish/main/test/app/ejb/AccessLocalEJBByJNDIServlet.java index 18ccff3a9dd..d2ea021bc0d 100644 --- a/appserver/tests/application/src/main/java/org/glassfish/main/test/app/ejb/AccessLocalEJBByJNDIServlet.java +++ b/appserver/tests/application/src/main/java/org/glassfish/main/test/app/ejb/AccessLocalEJBByJNDIServlet.java @@ -5,12 +5,13 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import javax.naming.Context; -import javax.naming.InitialContext; import java.io.IOException; import java.io.PrintWriter; import java.util.Hashtable; +import javax.naming.Context; +import javax.naming.InitialContext; + @WebServlet(name = "AccessLocalEJBByJNDIServlet", urlPatterns = {"/local_ejb_jndi"}) public class AccessLocalEJBByJNDIServlet extends HttpServlet { @Override diff --git a/appserver/tests/application/src/main/java/org/glassfish/main/test/app/ejb/AccessRemoteEJBByJNDIServlet.java b/appserver/tests/application/src/main/java/org/glassfish/main/test/app/ejb/AccessRemoteEJBByJNDIServlet.java index a372c7bf9dd..fc28d5c0ca7 100644 --- a/appserver/tests/application/src/main/java/org/glassfish/main/test/app/ejb/AccessRemoteEJBByJNDIServlet.java +++ b/appserver/tests/application/src/main/java/org/glassfish/main/test/app/ejb/AccessRemoteEJBByJNDIServlet.java @@ -5,12 +5,13 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import javax.naming.Context; -import javax.naming.InitialContext; import java.io.IOException; import java.io.PrintWriter; import java.util.Hashtable; +import javax.naming.Context; +import javax.naming.InitialContext; + @WebServlet(name = "AccessRemoteEJBServlet", urlPatterns = {"/remote_ejb_jndi"}) public class AccessRemoteEJBByJNDIServlet extends HttpServlet { diff --git a/appserver/tests/application/src/main/java/org/glassfish/main/test/app/security/jsp2sful/ProfileInfoRemote.java b/appserver/tests/application/src/main/java/org/glassfish/main/test/app/security/jsp2sful/ProfileInfoRemote.java index 3f89e365945..3aaead94e7e 100644 --- a/appserver/tests/application/src/main/java/org/glassfish/main/test/app/security/jsp2sful/ProfileInfoRemote.java +++ b/appserver/tests/application/src/main/java/org/glassfish/main/test/app/security/jsp2sful/ProfileInfoRemote.java @@ -17,9 +17,10 @@ package org.glassfish.main.test.app.security.jsp2sful; -import java.rmi.RemoteException; import jakarta.ejb.EJBObject; +import java.rmi.RemoteException; + /** * ProfileInfo Stateful Session Bean. Test JSR 115 authorization. * diff --git a/appserver/tests/application/src/test/java/org/glassfish/main/test/app/ejb/AccessEJBWebTest.java b/appserver/tests/application/src/test/java/org/glassfish/main/test/app/ejb/AccessEJBWebTest.java index 89a2845c2a8..c1827dcf3e6 100644 --- a/appserver/tests/application/src/test/java/org/glassfish/main/test/app/ejb/AccessEJBWebTest.java +++ b/appserver/tests/application/src/test/java/org/glassfish/main/test/app/ejb/AccessEJBWebTest.java @@ -1,5 +1,11 @@ package org.glassfish.main.test.app.ejb; +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; + import org.glassfish.main.itest.tools.GlassFishTestEnvironment; import org.glassfish.main.itest.tools.RandomGenerator; import org.glassfish.main.itest.tools.asadmin.Asadmin; @@ -12,12 +18,6 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import java.io.BufferedReader; -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; - import static java.lang.System.Logger.Level.INFO; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; diff --git a/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciConnectionEventListener.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciConnectionEventListener.java index 41f3c94671d..15521040120 100644 --- a/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciConnectionEventListener.java +++ b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciConnectionEventListener.java @@ -16,12 +16,12 @@ package com.sun.connector.cciblackbox; -import java.util.Vector; - import jakarta.resource.spi.ConnectionEvent; import jakarta.resource.spi.ConnectionEventListener; import jakarta.resource.spi.ManagedConnection; +import java.util.Vector; + /** * The connector architecture provides an event callback mechanism that * enables an application server to receive notifications from a diff --git a/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciConnectionFactory.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciConnectionFactory.java index 38e8376410d..3f2b98fe1f1 100644 --- a/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciConnectionFactory.java +++ b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciConnectionFactory.java @@ -16,9 +16,6 @@ package com.sun.connector.cciblackbox; -import java.io.Serializable; - -import javax.naming.Reference; import jakarta.resource.Referenceable; import jakarta.resource.ResourceException; import jakarta.resource.cci.ConnectionFactory; @@ -29,6 +26,10 @@ import jakarta.resource.spi.ConnectionRequestInfo; import jakarta.resource.spi.ManagedConnectionFactory; +import java.io.Serializable; + +import javax.naming.Reference; + /** * This implementation class provides provides an inteface for getting * connection to an EIS instance. diff --git a/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciConnectionManager.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciConnectionManager.java index 025c2c7cc07..a4cc2e315f2 100644 --- a/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciConnectionManager.java +++ b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciConnectionManager.java @@ -16,14 +16,14 @@ package com.sun.connector.cciblackbox; -import java.io.Serializable; - import jakarta.resource.ResourceException; import jakarta.resource.spi.ConnectionManager; import jakarta.resource.spi.ConnectionRequestInfo; import jakarta.resource.spi.ManagedConnection; import jakarta.resource.spi.ManagedConnectionFactory; +import java.io.Serializable; + /** * The default ConnectionManager implementation for the * non-managed scenario diff --git a/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciInteraction.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciInteraction.java index 37c40897c43..561a08ecb5e 100644 --- a/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciInteraction.java +++ b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciInteraction.java @@ -16,6 +16,12 @@ package com.sun.connector.cciblackbox; +import jakarta.resource.ResourceException; +import jakarta.resource.cci.IndexedRecord; +import jakarta.resource.cci.Interaction; +import jakarta.resource.cci.InteractionSpec; +import jakarta.resource.cci.ResourceWarning; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.sql.CallableStatement; @@ -26,12 +32,6 @@ import java.util.ArrayList; import java.util.List; -import jakarta.resource.ResourceException; -import jakarta.resource.cci.IndexedRecord; -import jakarta.resource.cci.Interaction; -import jakarta.resource.cci.InteractionSpec; -import jakarta.resource.cci.ResourceWarning; - /** * This implementation class enables a component to execute EIS functions. * @author Sheetal Vartak diff --git a/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciInteractionSpec.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciInteractionSpec.java index 5385f882329..54422d11af5 100644 --- a/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciInteractionSpec.java +++ b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciInteractionSpec.java @@ -16,11 +16,11 @@ package com.sun.connector.cciblackbox; +import jakarta.resource.cci.InteractionSpec; + import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; -import jakarta.resource.cci.InteractionSpec; - /** * This implementation class holds properties for driving an Interaction * with an EIS instance. This class is a Java Bean, hence it supports diff --git a/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciManagedConnectionMetaDataImpl.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciManagedConnectionMetaDataImpl.java index 12b323863d2..de7c054193d 100644 --- a/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciManagedConnectionMetaDataImpl.java +++ b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciManagedConnectionMetaDataImpl.java @@ -17,14 +17,14 @@ package com.sun.connector.cciblackbox; -import java.sql.Connection; -import java.sql.SQLException; - import jakarta.resource.ResourceException; import jakarta.resource.spi.EISSystemException; import jakarta.resource.spi.IllegalStateException; import jakarta.resource.spi.ManagedConnectionMetaData; +import java.sql.Connection; +import java.sql.SQLException; + /** * This class gives info about a ManagedConnection and the connected EIS * instance. diff --git a/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/Util.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/Util.java index c52d5024599..d9699d2eeef 100644 --- a/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/Util.java +++ b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/Util.java @@ -16,16 +16,17 @@ package com.sun.connector.cciblackbox; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.util.Iterator; -import java.util.Set; - import jakarta.resource.ResourceException; import jakarta.resource.spi.ConnectionRequestInfo; import jakarta.resource.spi.ManagedConnectionFactory; import jakarta.resource.spi.SecurityException; import jakarta.resource.spi.security.PasswordCredential; + +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.Iterator; +import java.util.Set; + import javax.security.auth.Subject; /** diff --git a/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ConnectionHolder.java b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ConnectionHolder.java index 137341425be..4cc2efd6fe4 100755 --- a/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ConnectionHolder.java +++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ConnectionHolder.java @@ -17,7 +17,22 @@ package com.sun.jdbcra.spi; -import java.sql.*; +import java.sql.Array; +import java.sql.Blob; +import java.sql.CallableStatement; +import java.sql.Clob; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.NClob; +import java.sql.PreparedStatement; +import java.sql.SQLClientInfoException; +import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; +import java.sql.SQLWarning; +import java.sql.SQLXML; +import java.sql.Savepoint; +import java.sql.Statement; +import java.sql.Struct; import java.util.Map; import java.util.Properties; import java.util.concurrent.Executor; diff --git a/appserver/tests/appserv-tests/report-builder/src/main/java/com/sun/appserv/test/BaseDevTest.java b/appserver/tests/appserv-tests/report-builder/src/main/java/com/sun/appserv/test/BaseDevTest.java index 7cc69951249..7ecd469625e 100644 --- a/appserver/tests/appserv-tests/report-builder/src/main/java/com/sun/appserv/test/BaseDevTest.java +++ b/appserver/tests/appserv-tests/report-builder/src/main/java/com/sun/appserv/test/BaseDevTest.java @@ -16,6 +16,11 @@ package com.sun.appserv.test; +import com.sun.appserv.test.util.process.ProcessManager; +import com.sun.appserv.test.util.process.ProcessManagerException; +import com.sun.appserv.test.util.process.ProcessManagerTimeoutException; +import com.sun.appserv.test.util.results.SimpleReporterAdapter; + import java.io.File; import java.io.FileReader; import java.io.IOException; @@ -23,6 +28,7 @@ import java.util.Arrays; import java.util.List; import java.util.Properties; + import javax.xml.namespace.QName; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -32,10 +38,6 @@ import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; -import com.sun.appserv.test.util.process.ProcessManager; -import com.sun.appserv.test.util.process.ProcessManagerException; -import com.sun.appserv.test.util.process.ProcessManagerTimeoutException; -import com.sun.appserv.test.util.results.SimpleReporterAdapter; import org.w3c.dom.Document; import org.xml.sax.SAXException; diff --git a/appserver/tests/appserv-tests/report-builder/src/main/java/com/sun/appserv/test/util/process/ProcessStreamDrainerWorker.java b/appserver/tests/appserv-tests/report-builder/src/main/java/com/sun/appserv/test/util/process/ProcessStreamDrainerWorker.java index 09e90cdabe3..d96777fd771 100644 --- a/appserver/tests/appserv-tests/report-builder/src/main/java/com/sun/appserv/test/util/process/ProcessStreamDrainerWorker.java +++ b/appserver/tests/appserv-tests/report-builder/src/main/java/com/sun/appserv/test/util/process/ProcessStreamDrainerWorker.java @@ -16,7 +16,10 @@ package com.sun.appserv.test.util.process; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintStream; /////////////////////////////////////////////////////////////////////////// diff --git a/appserver/tests/appserv-tests/reporter/src/main/java/com/sun/ejte/ccl/reporter/ParseML.java b/appserver/tests/appserv-tests/reporter/src/main/java/com/sun/ejte/ccl/reporter/ParseML.java index 98b508825de..6fa473bfd0f 100644 --- a/appserver/tests/appserv-tests/reporter/src/main/java/com/sun/ejte/ccl/reporter/ParseML.java +++ b/appserver/tests/appserv-tests/reporter/src/main/java/com/sun/ejte/ccl/reporter/ParseML.java @@ -16,10 +16,21 @@ package com.sun.ejte.ccl.reporter; -import org.xml.sax.*; -import org.xml.sax.helpers.*; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileWriter; +import java.util.Collection; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import org.xml.sax.Attributes; +import org.xml.sax.ContentHandler; +import org.xml.sax.InputSource; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; +import org.xml.sax.XMLReader; +import org.xml.sax.helpers.XMLReaderFactory; public class ParseML{ private String vendorParserClass = diff --git a/appserver/tests/appserv-tests/reporter/src/main/java/com/sun/ejte/ccl/reporter/Reporter.java b/appserver/tests/appserv-tests/reporter/src/main/java/com/sun/ejte/ccl/reporter/Reporter.java index 64265057103..5eb678604d1 100644 --- a/appserver/tests/appserv-tests/reporter/src/main/java/com/sun/ejte/ccl/reporter/Reporter.java +++ b/appserver/tests/appserv-tests/reporter/src/main/java/com/sun/ejte/ccl/reporter/Reporter.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2024 Contributors to the Eclipse Foundation. * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -16,33 +17,30 @@ package com.sun.ejte.ccl.reporter; -/** - * @Class : Reporter - @Description : Main class used for Uniform reporting of results - @Author : Ramesh Mandava - @Last Modified : Initial Creation by Ramesh Mandava after taking input from - Jeanfrancois and other Team members - @Last Modified : By Ramesh on 1/20/2002 , Added code to use new testIdVector and - testCaseIdVector for preserving order of entry of them and now - element is added around multiple tests - @Last Modified : By Ramesh on 4/5/2002, Taken care of machine name unavailability - under J2EE. And allowed having . in the path of result file - - * - */ - - -import java.util.Hashtable; -import java.util.Vector; -import java.util.Enumeration; -import java.util.Date; -import java.util.Calendar; -import java.io.*; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.PrintWriter; +import java.io.Serializable; +import java.io.Writer; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; +import java.util.Calendar; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; - - +/** + * Main class used for Uniform reporting of results + * + * @author : Ramesh Mandava + */ public class Reporter extends Thread implements Serializable { /* FIELDS */ diff --git a/appserver/tests/appserv-tests/reporter/src/main/java/com/sun/ejte/ccl/reporter/SimpleReporterAdapter.java b/appserver/tests/appserv-tests/reporter/src/main/java/com/sun/ejte/ccl/reporter/SimpleReporterAdapter.java index 494fdb38575..8472d21427c 100644 --- a/appserver/tests/appserv-tests/reporter/src/main/java/com/sun/ejte/ccl/reporter/SimpleReporterAdapter.java +++ b/appserver/tests/appserv-tests/reporter/src/main/java/com/sun/ejte/ccl/reporter/SimpleReporterAdapter.java @@ -16,11 +16,15 @@ package com.sun.ejte.ccl.reporter; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileOutputStream; +import java.io.InputStreamReader; +import java.io.Serializable; import java.util.HashMap; import java.util.Iterator; import java.util.Properties; import java.util.Set; -import java.io.*; //public class SimpleReporterAdapter extends Thread implements Serializable { public class SimpleReporterAdapter implements Serializable { diff --git a/appserver/tests/appserv-tests/webtest/src/main/java/com/sun/ejte/ccl/webrunner/proxy/MimeHeader.java b/appserver/tests/appserv-tests/webtest/src/main/java/com/sun/ejte/ccl/webrunner/proxy/MimeHeader.java index 1fd8300fa28..9a32a95371a 100644 --- a/appserver/tests/appserv-tests/webtest/src/main/java/com/sun/ejte/ccl/webrunner/proxy/MimeHeader.java +++ b/appserver/tests/appserv-tests/webtest/src/main/java/com/sun/ejte/ccl/webrunner/proxy/MimeHeader.java @@ -16,7 +16,9 @@ package com.sun.ejte.ccl.webrunner.proxy; -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.StringTokenizer; /** * MIME is an internet standard for communicating multimedia content over e-mail systems.MimeHeader extends HashTable so that it can store key value pairs. diff --git a/appserver/tests/appserv-tests/webtest/src/main/java/com/sun/ejte/ccl/webrunner/proxy/httpd.java b/appserver/tests/appserv-tests/webtest/src/main/java/com/sun/ejte/ccl/webrunner/proxy/httpd.java index 69250136dd3..a9ec1777d8f 100644 --- a/appserver/tests/appserv-tests/webtest/src/main/java/com/sun/ejte/ccl/webrunner/proxy/httpd.java +++ b/appserver/tests/appserv-tests/webtest/src/main/java/com/sun/ejte/ccl/webrunner/proxy/httpd.java @@ -16,9 +16,14 @@ package com.sun.ejte.ccl.webrunner.proxy; -import java.net.*; -import java.io.*; -import java.util.*; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.ServerSocket; +import java.net.Socket; +import java.net.URL; +import java.util.Date; /** * This is the Main class for proxy functionality.http supports GET,POST,HEAD requests.The proxy HTTP server is single diff --git a/appserver/tests/appserv-tests/webtest/src/main/java/com/sun/ejte/ccl/webrunner/webtest/MimeHeader.java b/appserver/tests/appserv-tests/webtest/src/main/java/com/sun/ejte/ccl/webrunner/webtest/MimeHeader.java index da33c99905a..33884d24e1e 100644 --- a/appserver/tests/appserv-tests/webtest/src/main/java/com/sun/ejte/ccl/webrunner/webtest/MimeHeader.java +++ b/appserver/tests/appserv-tests/webtest/src/main/java/com/sun/ejte/ccl/webrunner/webtest/MimeHeader.java @@ -16,7 +16,9 @@ package com.sun.ejte.ccl.webrunner.webtest; -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.StringTokenizer; /** * diff --git a/appserver/tests/appserv-tests/webtest/src/main/java/com/sun/ejte/ccl/webrunner/webtest/WebTest.java b/appserver/tests/appserv-tests/webtest/src/main/java/com/sun/ejte/ccl/webrunner/webtest/WebTest.java index 855b44640f6..f01fac11fb3 100644 --- a/appserver/tests/appserv-tests/webtest/src/main/java/com/sun/ejte/ccl/webrunner/webtest/WebTest.java +++ b/appserver/tests/appserv-tests/webtest/src/main/java/com/sun/ejte/ccl/webrunner/webtest/WebTest.java @@ -16,8 +16,8 @@ package com.sun.ejte.ccl.webrunner.webtest; -import java.io.FileInputStream; import java.io.File; +import java.io.FileInputStream; /** *This is the main class for Web Test.It takes a text script file as an argument. diff --git a/appserver/tests/appserv-tests/webtest/src/main/java/org/glassfish/grizzly/test/http2/HttpRequest.java b/appserver/tests/appserv-tests/webtest/src/main/java/org/glassfish/grizzly/test/http2/HttpRequest.java index 34a718510dd..18cb5dbb58e 100644 --- a/appserver/tests/appserv-tests/webtest/src/main/java/org/glassfish/grizzly/test/http2/HttpRequest.java +++ b/appserver/tests/appserv-tests/webtest/src/main/java/org/glassfish/grizzly/test/http2/HttpRequest.java @@ -19,6 +19,7 @@ import java.io.UnsupportedEncodingException; import java.util.HashMap; import java.util.Map; + import org.glassfish.grizzly.Buffer; import org.glassfish.grizzly.Connection; import org.glassfish.grizzly.http.HttpContent; diff --git a/appserver/tests/appserv-tests/webtest/src/main/java/org/glassfish/grizzly/test/http2/HttpResponse.java b/appserver/tests/appserv-tests/webtest/src/main/java/org/glassfish/grizzly/test/http2/HttpResponse.java index 940f77c23fe..de9c155a7e1 100644 --- a/appserver/tests/appserv-tests/webtest/src/main/java/org/glassfish/grizzly/test/http2/HttpResponse.java +++ b/appserver/tests/appserv-tests/webtest/src/main/java/org/glassfish/grizzly/test/http2/HttpResponse.java @@ -24,8 +24,8 @@ import java.util.Map; import org.glassfish.grizzly.http.HttpContent; -import org.glassfish.grizzly.http.util.MimeHeaders; import org.glassfish.grizzly.http.HttpResponsePacket; +import org.glassfish.grizzly.http.util.MimeHeaders; import org.glassfish.grizzly.http2.Http2Stream; /** diff --git a/nucleus/test-utils/src/main/java/org/glassfish/tests/utils/junit/HK2JUnit5Extension.java b/nucleus/test-utils/src/main/java/org/glassfish/tests/utils/junit/HK2JUnit5Extension.java index b27afe9a6ae..3ed7036d955 100644 --- a/nucleus/test-utils/src/main/java/org/glassfish/tests/utils/junit/HK2JUnit5Extension.java +++ b/nucleus/test-utils/src/main/java/org/glassfish/tests/utils/junit/HK2JUnit5Extension.java @@ -48,6 +48,7 @@ import org.glassfish.hk2.api.DynamicConfiguration; import org.glassfish.hk2.api.DynamicConfigurationService; import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.hk2.extras.ExtrasUtilities; import org.glassfish.hk2.utilities.DescriptorImpl; import org.glassfish.hk2.utilities.ServiceLocatorUtilities; import org.glassfish.server.ServerEnvironmentImpl; @@ -72,8 +73,6 @@ import static org.glassfish.hk2.utilities.ServiceLocatorUtilities.createAndPopulateServiceLocator; import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.glassfish.hk2.extras.ExtrasUtilities; - /** * This JUnit5 extension allows to use HK2 services in tests. * You can also override methods in your own {@link Extension} and add features. diff --git a/nucleus/test-utils/src/main/java/org/glassfish/tests/utils/junit/matcher/DirectoryMatchers.java b/nucleus/test-utils/src/main/java/org/glassfish/tests/utils/junit/matcher/DirectoryMatchers.java index 8525ec2057b..6467c44cf54 100644 --- a/nucleus/test-utils/src/main/java/org/glassfish/tests/utils/junit/matcher/DirectoryMatchers.java +++ b/nucleus/test-utils/src/main/java/org/glassfish/tests/utils/junit/matcher/DirectoryMatchers.java @@ -16,13 +16,13 @@ package org.glassfish.tests.utils.junit.matcher; +import java.io.File; +import java.nio.file.NotDirectoryException; + import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeDiagnosingMatcher; -import java.io.File; -import java.nio.file.NotDirectoryException; - import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.jupiter.api.Assertions.fail; diff --git a/nucleus/test-utils/src/main/java/org/glassfish/tests/utils/junit/matcher/TextFileMatchers.java b/nucleus/test-utils/src/main/java/org/glassfish/tests/utils/junit/matcher/TextFileMatchers.java index f2d8eec2fd5..b44f99a2ba3 100644 --- a/nucleus/test-utils/src/main/java/org/glassfish/tests/utils/junit/matcher/TextFileMatchers.java +++ b/nucleus/test-utils/src/main/java/org/glassfish/tests/utils/junit/matcher/TextFileMatchers.java @@ -16,16 +16,16 @@ package org.glassfish.tests.utils.junit.matcher; -import org.hamcrest.Description; -import org.hamcrest.Matcher; -import org.hamcrest.TypeSafeDiagnosingMatcher; - import java.io.File; import java.io.FileReader; import java.io.IOException; import java.io.LineNumberReader; import java.util.function.Function; +import org.hamcrest.Description; +import org.hamcrest.Matcher; +import org.hamcrest.TypeSafeDiagnosingMatcher; + import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.jupiter.api.Assertions.fail; From 53c278029dff0e3db27133d0f73452b3036a2f2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 11:09:47 +0200 Subject: [PATCH 33/40] Checkstyle - added io group MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../resources/org/glassfish/qa/config/checkstyle/checkstyle.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa/src/main/resources/org/glassfish/qa/config/checkstyle/checkstyle.xml b/qa/src/main/resources/org/glassfish/qa/config/checkstyle/checkstyle.xml index 2634d8d0214..8574d5a137c 100644 --- a/qa/src/main/resources/org/glassfish/qa/config/checkstyle/checkstyle.xml +++ b/qa/src/main/resources/org/glassfish/qa/config/checkstyle/checkstyle.xml @@ -85,7 +85,7 @@ - + From 9fa9acedd1ab3c160d0f2f61dc22e7827b8dcc75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 11:10:34 +0200 Subject: [PATCH 34/40] Imports: embedded modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../java/org/glassfish/uberjar/bootstrap/Util.java | 10 +++++++--- .../builder/installroot/InstallRootBuilder.java | 8 ++++---- .../builder/instanceroot/InstanceRootBuilder.java | 8 ++++---- .../java/org/glassfish/uberjar/osgimain/Main.java | 14 +++++++++----- .../uberjar/osgimain/ModuleExtractor.java | 14 ++++++++++++-- .../GlassFishOSGiModuleUninstaller.java | 8 ++++++-- 6 files changed, 42 insertions(+), 20 deletions(-) diff --git a/appserver/extras/embedded/common/bootstrap/src/main/java/org/glassfish/uberjar/bootstrap/Util.java b/appserver/extras/embedded/common/bootstrap/src/main/java/org/glassfish/uberjar/bootstrap/Util.java index 28be6662647..29370166e83 100644 --- a/appserver/extras/embedded/common/bootstrap/src/main/java/org/glassfish/uberjar/bootstrap/Util.java +++ b/appserver/extras/embedded/common/bootstrap/src/main/java/org/glassfish/uberjar/bootstrap/Util.java @@ -16,8 +16,6 @@ package org.glassfish.uberjar.bootstrap; -import org.glassfish.embeddable.GlassFish; - import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -29,11 +27,17 @@ import java.nio.channels.Channels; import java.nio.channels.FileChannel; import java.nio.channels.ReadableByteChannel; -import java.util.*; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.logging.Logger; +import org.glassfish.embeddable.GlassFish; + /** * @author bhavanishankar@dev.java.net */ diff --git a/appserver/extras/embedded/common/installroot-builder/src/main/java/org/glassfish/uberjar/builder/installroot/InstallRootBuilder.java b/appserver/extras/embedded/common/installroot-builder/src/main/java/org/glassfish/uberjar/builder/installroot/InstallRootBuilder.java index 312f466bfa5..d20356c2d14 100644 --- a/appserver/extras/embedded/common/installroot-builder/src/main/java/org/glassfish/uberjar/builder/installroot/InstallRootBuilder.java +++ b/appserver/extras/embedded/common/installroot-builder/src/main/java/org/glassfish/uberjar/builder/installroot/InstallRootBuilder.java @@ -16,15 +16,15 @@ package org.glassfish.uberjar.builder.installroot; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - import java.util.ArrayList; import java.util.Enumeration; import java.util.List; import java.util.logging.Logger; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + /** * @author bhavanishankar@dev.java.net */ diff --git a/appserver/extras/embedded/common/instanceroot-builder/src/main/java/org/glassfish/uberjar/builder/instanceroot/InstanceRootBuilder.java b/appserver/extras/embedded/common/instanceroot-builder/src/main/java/org/glassfish/uberjar/builder/instanceroot/InstanceRootBuilder.java index 2052ac67e4a..0fd0e0d4558 100644 --- a/appserver/extras/embedded/common/instanceroot-builder/src/main/java/org/glassfish/uberjar/builder/instanceroot/InstanceRootBuilder.java +++ b/appserver/extras/embedded/common/instanceroot-builder/src/main/java/org/glassfish/uberjar/builder/instanceroot/InstanceRootBuilder.java @@ -16,15 +16,15 @@ package org.glassfish.uberjar.builder.instanceroot; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - import java.util.ArrayList; import java.util.Enumeration; import java.util.List; import java.util.logging.Logger; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + /** * @author bhavanishankar@dev.java.net */ diff --git a/appserver/extras/embedded/common/osgi-main/src/main/java/org/glassfish/uberjar/osgimain/Main.java b/appserver/extras/embedded/common/osgi-main/src/main/java/org/glassfish/uberjar/osgimain/Main.java index 4d6bcb9d6aa..5c3d1d57186 100644 --- a/appserver/extras/embedded/common/osgi-main/src/main/java/org/glassfish/uberjar/osgimain/Main.java +++ b/appserver/extras/embedded/common/osgi-main/src/main/java/org/glassfish/uberjar/osgimain/Main.java @@ -16,19 +16,23 @@ package org.glassfish.uberjar.osgimain; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - import java.io.File; import java.net.URI; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.StringTokenizer; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + /** * @author bhavanishankar@dev.java.net */ diff --git a/appserver/extras/embedded/common/osgi-main/src/main/java/org/glassfish/uberjar/osgimain/ModuleExtractor.java b/appserver/extras/embedded/common/osgi-main/src/main/java/org/glassfish/uberjar/osgimain/ModuleExtractor.java index 627aa3d264c..0a7563fbf6d 100644 --- a/appserver/extras/embedded/common/osgi-main/src/main/java/org/glassfish/uberjar/osgimain/ModuleExtractor.java +++ b/appserver/extras/embedded/common/osgi-main/src/main/java/org/glassfish/uberjar/osgimain/ModuleExtractor.java @@ -16,14 +16,24 @@ package org.glassfish.uberjar.osgimain; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.PipedInputStream; +import java.io.PipedOutputStream; import java.nio.ByteBuffer; import java.nio.channels.Channels; import java.nio.channels.ReadableByteChannel; import java.nio.channels.WritableByteChannel; import java.util.Enumeration; import java.util.Iterator; -import java.util.jar.*; +import java.util.jar.Attributes; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; +import java.util.jar.JarOutputStream; +import java.util.jar.Manifest; import java.util.logging.Level; import java.util.logging.Logger; import java.util.zip.Deflater; diff --git a/appserver/extras/embedded/common/osgi-modules-uninstaller/src/main/java/org/glassfish/uberjar/uninstaller/GlassFishOSGiModuleUninstaller.java b/appserver/extras/embedded/common/osgi-modules-uninstaller/src/main/java/org/glassfish/uberjar/uninstaller/GlassFishOSGiModuleUninstaller.java index bd420e99817..53020945aa5 100644 --- a/appserver/extras/embedded/common/osgi-modules-uninstaller/src/main/java/org/glassfish/uberjar/uninstaller/GlassFishOSGiModuleUninstaller.java +++ b/appserver/extras/embedded/common/osgi-modules-uninstaller/src/main/java/org/glassfish/uberjar/uninstaller/GlassFishOSGiModuleUninstaller.java @@ -16,12 +16,16 @@ package org.glassfish.uberjar.uninstaller; -import org.osgi.framework.*; - import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleEvent; +import org.osgi.framework.BundleListener; + /** * @author bhavanishankar@dev.java.net */ From e1a790d435b87823737872cf208fd71c9b567568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 11:11:06 +0200 Subject: [PATCH 35/40] Imports: grizzly modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../extras/addons/AjpAddOnProvider.java | 1 + .../extras/addons/WebSocketAddOnProvider.java | 1 + .../glassfish/extras/grizzly/GrizzlyApp.java | 12 +++++----- .../extras/grizzly/GrizzlyContainer.java | 2 +- .../grizzly/GrizzlyModuleDescriptor.java | 23 +++++++++++-------- .../extras/grizzly/IntrospectionUtils.java | 2 +- 6 files changed, 24 insertions(+), 17 deletions(-) diff --git a/appserver/grizzly/glassfish-grizzly-extra-all/src/main/java/org/glassfish/grizzly/extras/addons/AjpAddOnProvider.java b/appserver/grizzly/glassfish-grizzly-extra-all/src/main/java/org/glassfish/grizzly/extras/addons/AjpAddOnProvider.java index dbb74ed2304..176415b5494 100644 --- a/appserver/grizzly/glassfish-grizzly-extra-all/src/main/java/org/glassfish/grizzly/extras/addons/AjpAddOnProvider.java +++ b/appserver/grizzly/glassfish-grizzly-extra-all/src/main/java/org/glassfish/grizzly/extras/addons/AjpAddOnProvider.java @@ -24,6 +24,7 @@ import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; + import org.glassfish.grizzly.config.ConfigAwareElement; import org.glassfish.grizzly.config.dom.Http; import org.glassfish.grizzly.config.dom.NetworkListener; diff --git a/appserver/grizzly/glassfish-grizzly-extra-all/src/main/java/org/glassfish/grizzly/extras/addons/WebSocketAddOnProvider.java b/appserver/grizzly/glassfish-grizzly-extra-all/src/main/java/org/glassfish/grizzly/extras/addons/WebSocketAddOnProvider.java index 7ba8b3b10ab..8413157231a 100644 --- a/appserver/grizzly/glassfish-grizzly-extra-all/src/main/java/org/glassfish/grizzly/extras/addons/WebSocketAddOnProvider.java +++ b/appserver/grizzly/glassfish-grizzly-extra-all/src/main/java/org/glassfish/grizzly/extras/addons/WebSocketAddOnProvider.java @@ -17,6 +17,7 @@ package org.glassfish.grizzly.extras.addons; import java.io.IOException; + import org.glassfish.grizzly.config.ConfigAwareElement; import org.glassfish.grizzly.config.dom.Http; import org.glassfish.grizzly.config.dom.NetworkListener; diff --git a/appserver/grizzly/grizzly-container/src/main/java/org/glassfish/extras/grizzly/GrizzlyApp.java b/appserver/grizzly/grizzly-container/src/main/java/org/glassfish/extras/grizzly/GrizzlyApp.java index adc069f3be2..1eba36965b2 100644 --- a/appserver/grizzly/grizzly-container/src/main/java/org/glassfish/extras/grizzly/GrizzlyApp.java +++ b/appserver/grizzly/grizzly-container/src/main/java/org/glassfish/extras/grizzly/GrizzlyApp.java @@ -16,17 +16,17 @@ package org.glassfish.extras.grizzly; -import org.glassfish.api.deployment.ApplicationContainer; -import org.glassfish.api.deployment.ApplicationContext; -import org.glassfish.api.container.RequestDispatcher; -import org.glassfish.api.container.EndpointRegistrationException; - import com.sun.logging.LogDomains; -import org.glassfish.grizzly.http.server.HttpHandler; import java.util.Collection; import java.util.logging.Level; +import org.glassfish.api.container.EndpointRegistrationException; +import org.glassfish.api.container.RequestDispatcher; +import org.glassfish.api.deployment.ApplicationContainer; +import org.glassfish.api.deployment.ApplicationContext; +import org.glassfish.grizzly.http.server.HttpHandler; + /** * Deployed grizzly application. * diff --git a/appserver/grizzly/grizzly-container/src/main/java/org/glassfish/extras/grizzly/GrizzlyContainer.java b/appserver/grizzly/grizzly-container/src/main/java/org/glassfish/extras/grizzly/GrizzlyContainer.java index 5755de2ecaa..078d4ff3b16 100644 --- a/appserver/grizzly/grizzly-container/src/main/java/org/glassfish/extras/grizzly/GrizzlyContainer.java +++ b/appserver/grizzly/grizzly-container/src/main/java/org/glassfish/extras/grizzly/GrizzlyContainer.java @@ -16,9 +16,9 @@ package org.glassfish.extras.grizzly; -import org.jvnet.hk2.annotations.Service; import org.glassfish.api.container.Container; import org.glassfish.api.deployment.Deployer; +import org.jvnet.hk2.annotations.Service; @Service(name="grizzly") diff --git a/appserver/grizzly/grizzly-container/src/main/java/org/glassfish/extras/grizzly/GrizzlyModuleDescriptor.java b/appserver/grizzly/grizzly-container/src/main/java/org/glassfish/extras/grizzly/GrizzlyModuleDescriptor.java index 315ee209d2c..f326b83cc9d 100644 --- a/appserver/grizzly/grizzly-container/src/main/java/org/glassfish/extras/grizzly/GrizzlyModuleDescriptor.java +++ b/appserver/grizzly/grizzly-container/src/main/java/org/glassfish/extras/grizzly/GrizzlyModuleDescriptor.java @@ -16,18 +16,23 @@ package org.glassfish.extras.grizzly; -import org.glassfish.api.deployment.archive.ReadableArchive; -import org.xml.sax.SAXException; -import org.w3c.dom.*; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import java.util.Map; -import java.util.HashMap; -import java.util.logging.Logger; -import java.util.logging.Level; -import java.io.IOException; -import java.util.ArrayList; + +import org.glassfish.api.deployment.archive.ReadableArchive; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.SAXException; /** * Descriptor for a grizzly application. diff --git a/appserver/grizzly/grizzly-container/src/main/java/org/glassfish/extras/grizzly/IntrospectionUtils.java b/appserver/grizzly/grizzly-container/src/main/java/org/glassfish/extras/grizzly/IntrospectionUtils.java index 401c93dc518..1e3134f8b7f 100644 --- a/appserver/grizzly/grizzly-container/src/main/java/org/glassfish/extras/grizzly/IntrospectionUtils.java +++ b/appserver/grizzly/grizzly-container/src/main/java/org/glassfish/extras/grizzly/IntrospectionUtils.java @@ -23,9 +23,9 @@ import java.net.UnknownHostException; import java.util.HashMap; import java.util.Map; - import java.util.logging.Level; import java.util.logging.Logger; + import org.glassfish.grizzly.Grizzly; /** From b5f05aa3ab5474948f1c8ec32bc771b99e2470e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 11:12:04 +0200 Subject: [PATCH 36/40] Imports: osgi modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../GlassFishBrandingPlugin.java | 6 +++--- .../GlassFishSecurityProvider.java | 8 ++++---- .../glassfish/osgi/admingui/OSGIConsoleHandlers.java | 3 ++- .../glassfish/osgi/admingui/OSGIConsoleProvider.java | 3 ++- .../extras/osgicontainer/OSGiArchiveDetector.java | 12 ++++++------ .../extras/osgicontainer/OSGiContainer.java | 4 ++-- .../extras/osgicontainer/OSGiDeployedBundle.java | 10 +++++----- .../glassfish/extras/osgicontainer/OSGiDeployer.java | 4 ++-- .../glassfish/extras/osgicontainer/OSGiSniffer.java | 6 +++--- 9 files changed, 29 insertions(+), 27 deletions(-) diff --git a/appserver/osgi-platforms/felix-webconsole-extension/src/main/java/org/glassfish/osgi/felixwebconsoleextension/GlassFishBrandingPlugin.java b/appserver/osgi-platforms/felix-webconsole-extension/src/main/java/org/glassfish/osgi/felixwebconsoleextension/GlassFishBrandingPlugin.java index 85c93508d48..1b2815f06ad 100644 --- a/appserver/osgi-platforms/felix-webconsole-extension/src/main/java/org/glassfish/osgi/felixwebconsoleextension/GlassFishBrandingPlugin.java +++ b/appserver/osgi-platforms/felix-webconsole-extension/src/main/java/org/glassfish/osgi/felixwebconsoleextension/GlassFishBrandingPlugin.java @@ -17,15 +17,15 @@ package org.glassfish.osgi.felixwebconsoleextension; -import org.apache.felix.webconsole.BrandingPlugin; -import org.apache.felix.webconsole.DefaultBrandingPlugin; - import java.io.IOException; import java.io.InputStream; import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.felix.webconsole.BrandingPlugin; +import org.apache.felix.webconsole.DefaultBrandingPlugin; + /** * This is a customization of {@link BrandingPlugin} for GlassFish. * diff --git a/appserver/osgi-platforms/felix-webconsole-extension/src/main/java/org/glassfish/osgi/felixwebconsoleextension/GlassFishSecurityProvider.java b/appserver/osgi-platforms/felix-webconsole-extension/src/main/java/org/glassfish/osgi/felixwebconsoleextension/GlassFishSecurityProvider.java index 0ad58346e07..268609f8ef7 100644 --- a/appserver/osgi-platforms/felix-webconsole-extension/src/main/java/org/glassfish/osgi/felixwebconsoleextension/GlassFishSecurityProvider.java +++ b/appserver/osgi-platforms/felix-webconsole-extension/src/main/java/org/glassfish/osgi/felixwebconsoleextension/GlassFishSecurityProvider.java @@ -16,6 +16,10 @@ package org.glassfish.osgi.felixwebconsoleextension; +import java.security.AccessController; +import java.security.PrivilegedActionException; +import java.security.PrivilegedExceptionAction; + import javax.security.auth.Subject; import javax.security.auth.login.LoginException; @@ -25,10 +29,6 @@ import org.glassfish.security.services.api.authentication.AuthenticationService; import org.osgi.framework.BundleContext; -import java.security.AccessController; -import java.security.PrivilegedActionException; -import java.security.PrivilegedExceptionAction; - /** * * @author tangyong@cn.fujitsu.com diff --git a/appserver/osgi-platforms/glassfish-osgi-console-plugin/src/main/java/org/glassfish/osgi/admingui/OSGIConsoleHandlers.java b/appserver/osgi-platforms/glassfish-osgi-console-plugin/src/main/java/org/glassfish/osgi/admingui/OSGIConsoleHandlers.java index 2821e3abc44..a9e738613bc 100644 --- a/appserver/osgi-platforms/glassfish-osgi-console-plugin/src/main/java/org/glassfish/osgi/admingui/OSGIConsoleHandlers.java +++ b/appserver/osgi-platforms/glassfish-osgi-console-plugin/src/main/java/org/glassfish/osgi/admingui/OSGIConsoleHandlers.java @@ -21,12 +21,13 @@ import com.sun.enterprise.config.serverbeans.Node; import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.config.serverbeans.SystemProperty; -import org.glassfish.internal.api.Globals; import com.sun.jsftemplating.annotation.Handler; import com.sun.jsftemplating.annotation.HandlerInput; import com.sun.jsftemplating.annotation.HandlerOutput; import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; +import org.glassfish.internal.api.Globals; + /** * handler to get instance's host and port information which is used to * form the http url for osgi-console. diff --git a/appserver/osgi-platforms/glassfish-osgi-console-plugin/src/main/java/org/glassfish/osgi/admingui/OSGIConsoleProvider.java b/appserver/osgi-platforms/glassfish-osgi-console-plugin/src/main/java/org/glassfish/osgi/admingui/OSGIConsoleProvider.java index 9c701ba0b42..a750e3ef6aa 100644 --- a/appserver/osgi-platforms/glassfish-osgi-console-plugin/src/main/java/org/glassfish/osgi/admingui/OSGIConsoleProvider.java +++ b/appserver/osgi-platforms/glassfish-osgi-console-plugin/src/main/java/org/glassfish/osgi/admingui/OSGIConsoleProvider.java @@ -16,9 +16,10 @@ package org.glassfish.osgi.admingui; +import java.net.URL; + import org.glassfish.api.admingui.ConsoleProvider; import org.jvnet.hk2.annotations.Service; -import java.net.URL; /** * @author Mohit diff --git a/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiArchiveDetector.java b/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiArchiveDetector.java index 7c3b698ba94..642961d224c 100644 --- a/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiArchiveDetector.java +++ b/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiArchiveDetector.java @@ -16,18 +16,18 @@ package org.glassfish.extras.osgicontainer; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + +import java.io.IOException; +import java.util.logging.Logger; + import org.glassfish.api.deployment.archive.ArchiveDetector; import org.glassfish.api.deployment.archive.ArchiveHandler; import org.glassfish.api.deployment.archive.ArchiveType; import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.hk2.api.ServiceLocator; - import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Singleton; - -import jakarta.inject.Inject; -import java.io.IOException; -import java.util.logging.Logger; /** * Detects OSGi type archives. diff --git a/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiContainer.java b/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiContainer.java index 245ceb1b3b8..a5da56ef589 100644 --- a/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiContainer.java +++ b/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiContainer.java @@ -16,12 +16,12 @@ package org.glassfish.extras.osgicontainer; +import jakarta.inject.Singleton; + import org.glassfish.api.container.Container; import org.glassfish.api.deployment.Deployer; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Singleton; - /** * OSGi container, will just be used to manage OSGi bundles through deployment * backend diff --git a/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiDeployedBundle.java b/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiDeployedBundle.java index da06d582cbd..4377d0123f5 100644 --- a/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiDeployedBundle.java +++ b/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiDeployedBundle.java @@ -16,17 +16,17 @@ package org.glassfish.extras.osgicontainer; +import java.io.IOException; +import java.net.URL; +import java.util.Enumeration; +import java.util.NoSuchElementException; + import org.glassfish.api.deployment.ApplicationContainer; import org.glassfish.api.deployment.ApplicationContext; import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; import org.osgi.framework.Constants; -import java.io.IOException; -import java.net.URL; -import java.util.Enumeration; -import java.util.NoSuchElementException; - public class OSGiDeployedBundle implements ApplicationContainer { private Bundle bundle; diff --git a/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiDeployer.java b/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiDeployer.java index 3ce3322de33..a9c8b9b22c8 100644 --- a/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiDeployer.java +++ b/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiDeployer.java @@ -16,6 +16,8 @@ package org.glassfish.extras.osgicontainer; +import java.io.File; + import org.glassfish.api.deployment.Deployer; import org.glassfish.api.deployment.DeploymentContext; import org.glassfish.api.deployment.MetaData; @@ -27,8 +29,6 @@ import org.osgi.framework.BundleReference; import org.osgi.service.packageadmin.PackageAdmin; -import java.io.File; - /** * OSGi deployer, takes care of loading and cleaning modules from the OSGi runtime. * diff --git a/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiSniffer.java b/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiSniffer.java index 4694262a7bb..4a529c4cc1e 100644 --- a/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiSniffer.java +++ b/nucleus/osgi-platforms/osgi-container/src/main/java/org/glassfish/extras/osgicontainer/OSGiSniffer.java @@ -16,14 +16,14 @@ package org.glassfish.extras.osgicontainer; +import jakarta.inject.Inject; + import org.glassfish.api.deployment.DeploymentContext; -import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.api.deployment.archive.ArchiveType; +import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.internal.deployment.GenericSniffer; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; - /** * Sniffer for OSGi bundles * From 4cb928f7c9dd8cdac40fc865d7dbbedd1398594b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 11:13:38 +0200 Subject: [PATCH 37/40] Imports: ha, shoal modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../store/adapter/cache/ReplicationStoreProxy2.java | 4 ++-- .../store/adapter/cache/ShoalBackingStoreProxy.java | 4 ++-- .../java/org/shoal/ha/store/GlassFishKeyMapper.java | 5 ++--- .../ha/store/ReplicatedBackingStoreFactory.java | 13 +++++++++---- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/appserver/ha/ha-shoal-cache-bootstrap/src/main/java/org/glassfish/ha/store/adapter/cache/ReplicationStoreProxy2.java b/appserver/ha/ha-shoal-cache-bootstrap/src/main/java/org/glassfish/ha/store/adapter/cache/ReplicationStoreProxy2.java index bdd12d84277..5e668b0b106 100644 --- a/appserver/ha/ha-shoal-cache-bootstrap/src/main/java/org/glassfish/ha/store/adapter/cache/ReplicationStoreProxy2.java +++ b/appserver/ha/ha-shoal-cache-bootstrap/src/main/java/org/glassfish/ha/store/adapter/cache/ReplicationStoreProxy2.java @@ -16,10 +16,10 @@ package org.glassfish.ha.store.adapter.cache; -import java.io.Serializable; - import jakarta.inject.Inject; +import java.io.Serializable; + import org.glassfish.api.StartupRunLevel; import org.glassfish.api.event.Events; import org.glassfish.ha.store.api.BackingStore; diff --git a/appserver/ha/ha-shoal-cache-bootstrap/src/main/java/org/glassfish/ha/store/adapter/cache/ShoalBackingStoreProxy.java b/appserver/ha/ha-shoal-cache-bootstrap/src/main/java/org/glassfish/ha/store/adapter/cache/ShoalBackingStoreProxy.java index 1db4ff01ac2..14af1f58237 100644 --- a/appserver/ha/ha-shoal-cache-bootstrap/src/main/java/org/glassfish/ha/store/adapter/cache/ShoalBackingStoreProxy.java +++ b/appserver/ha/ha-shoal-cache-bootstrap/src/main/java/org/glassfish/ha/store/adapter/cache/ShoalBackingStoreProxy.java @@ -17,12 +17,12 @@ package org.glassfish.ha.store.adapter.cache; +import jakarta.inject.Inject; + import java.io.Serializable; import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.inject.Inject; - import org.glassfish.api.StartupRunLevel; import org.glassfish.api.event.EventListener; import org.glassfish.api.event.EventTypes; diff --git a/appserver/ha/ha-shoal-store/src/main/java/org/shoal/ha/store/GlassFishKeyMapper.java b/appserver/ha/ha-shoal-store/src/main/java/org/shoal/ha/store/GlassFishKeyMapper.java index 3282e2ee94a..ad47b55a18c 100644 --- a/appserver/ha/ha-shoal-store/src/main/java/org/shoal/ha/store/GlassFishKeyMapper.java +++ b/appserver/ha/ha-shoal-store/src/main/java/org/shoal/ha/store/GlassFishKeyMapper.java @@ -16,11 +16,10 @@ package org.shoal.ha.store; -import org.glassfish.ha.common.HACookieManager; -import org.shoal.ha.mapper.DefaultKeyMapper; - import org.glassfish.ha.common.GlassFishHAReplicaPredictor; import org.glassfish.ha.common.HACookieInfo; +import org.glassfish.ha.common.HACookieManager; +import org.shoal.ha.mapper.DefaultKeyMapper; /** * @author Mahesh Kannan diff --git a/appserver/ha/ha-shoal-store/src/main/java/org/shoal/ha/store/ReplicatedBackingStoreFactory.java b/appserver/ha/ha-shoal-store/src/main/java/org/shoal/ha/store/ReplicatedBackingStoreFactory.java index 514577a4f49..7ae9a2e4d86 100644 --- a/appserver/ha/ha-shoal-store/src/main/java/org/shoal/ha/store/ReplicatedBackingStoreFactory.java +++ b/appserver/ha/ha-shoal-store/src/main/java/org/shoal/ha/store/ReplicatedBackingStoreFactory.java @@ -17,15 +17,20 @@ package org.shoal.ha.store; -import org.glassfish.ha.store.api.*; +import java.io.Serializable; +import java.util.Properties; + +import org.glassfish.ha.store.api.BackingStore; +import org.glassfish.ha.store.api.BackingStoreConfiguration; +import org.glassfish.ha.store.api.BackingStoreException; +import org.glassfish.ha.store.api.BackingStoreFactory; +import org.glassfish.ha.store.api.BackingStoreTransaction; +import org.glassfish.ha.store.api.Storeable; import org.jvnet.hk2.annotations.Service; import org.shoal.adapter.store.ReplicatedBackingStore; import org.shoal.adapter.store.StoreableReplicatedBackingStore; import org.shoal.ha.mapper.KeyMapper; -import java.io.Serializable; -import java.util.Properties; - /** * @author Mahesh Kannan */ From 8d621f2c3628c40a577fb3362bb9cd7d32fb1b41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 11:14:59 +0200 Subject: [PATCH 38/40] Imports: diagnostics module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../diagnostics/context/ContextManager.java | 7 +++---- .../diagnostics/context/impl/ContextImpl.java | 14 ++++++++------ .../context/impl/ContextManagerImpl.java | 19 +++++++++++-------- .../impl/ContextImplIntegrationTest.java | 4 ++-- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/nucleus/diagnostics/context/src/main/java/org/glassfish/diagnostics/context/ContextManager.java b/nucleus/diagnostics/context/src/main/java/org/glassfish/diagnostics/context/ContextManager.java index a97c3992848..6b75039a493 100644 --- a/nucleus/diagnostics/context/src/main/java/org/glassfish/diagnostics/context/ContextManager.java +++ b/nucleus/diagnostics/context/src/main/java/org/glassfish/diagnostics/context/ContextManager.java @@ -16,12 +16,11 @@ package org.glassfish.diagnostics.context; -import org.glassfish.logging.annotation.LogMessagesResourceBundle; -import org.jvnet.hk2.annotations.Contract; +import java.util.logging.Logger; +import org.glassfish.logging.annotation.LogMessagesResourceBundle; import org.glassfish.logging.annotation.LoggerInfo; - -import java.util.logging.Logger; +import org.jvnet.hk2.annotations.Contract; /** * The ContextManager provides access to diagnostics Contexts. diff --git a/nucleus/diagnostics/context/src/main/java/org/glassfish/diagnostics/context/impl/ContextImpl.java b/nucleus/diagnostics/context/src/main/java/org/glassfish/diagnostics/context/impl/ContextImpl.java index 2aec0bb12bc..e21254dcf41 100644 --- a/nucleus/diagnostics/context/src/main/java/org/glassfish/diagnostics/context/impl/ContextImpl.java +++ b/nucleus/diagnostics/context/src/main/java/org/glassfish/diagnostics/context/impl/ContextImpl.java @@ -16,14 +16,16 @@ package org.glassfish.diagnostics.context.impl; -import org.glassfish.contextpropagation.*; -import org.glassfish.diagnostics.context.Context; -import org.glassfish.diagnostics.context.ContextManager; - import java.util.EnumSet; - -import java.util.logging.Logger; import java.util.logging.Level; +import java.util.logging.Logger; + +import org.glassfish.contextpropagation.Location; +import org.glassfish.contextpropagation.PropagationMode; +import org.glassfish.contextpropagation.View; +import org.glassfish.contextpropagation.ViewCapable; +import org.glassfish.diagnostics.context.Context; +import org.glassfish.diagnostics.context.ContextManager; /** diff --git a/nucleus/diagnostics/context/src/main/java/org/glassfish/diagnostics/context/impl/ContextManagerImpl.java b/nucleus/diagnostics/context/src/main/java/org/glassfish/diagnostics/context/impl/ContextManagerImpl.java index db08528f0ed..26b1030ced1 100644 --- a/nucleus/diagnostics/context/src/main/java/org/glassfish/diagnostics/context/impl/ContextManagerImpl.java +++ b/nucleus/diagnostics/context/src/main/java/org/glassfish/diagnostics/context/impl/ContextManagerImpl.java @@ -16,21 +16,24 @@ package org.glassfish.diagnostics.context.impl; -import org.glassfish.contextpropagation.*; -import org.glassfish.diagnostics.context.Context; +import java.util.EnumSet; +import java.util.HashSet; +import java.util.Set; +import java.util.logging.Level; +import org.glassfish.contextpropagation.ContextMap; +import org.glassfish.contextpropagation.ContextViewFactory; +import org.glassfish.contextpropagation.InsufficientCredentialException; +import org.glassfish.contextpropagation.Location; +import org.glassfish.contextpropagation.PropagationMode; +import org.glassfish.contextpropagation.View; import org.glassfish.contextpropagation.spi.ContextMapHelper; +import org.glassfish.diagnostics.context.Context; import org.glassfish.diagnostics.context.ContextManager; import org.glassfish.hk2.api.Rank; import org.glassfish.logging.annotation.LogMessageInfo; import org.jvnet.hk2.annotations.Service; -import java.util.EnumSet; -import java.util.HashSet; -import java.util.Set; - -import java.util.logging.Level; - /** * Default implementation of ContextManager. diff --git a/nucleus/diagnostics/context/src/test/java/org/glassfish/diagnostics/context/impl/ContextImplIntegrationTest.java b/nucleus/diagnostics/context/src/test/java/org/glassfish/diagnostics/context/impl/ContextImplIntegrationTest.java index 77dbd596c77..b154313466e 100644 --- a/nucleus/diagnostics/context/src/test/java/org/glassfish/diagnostics/context/impl/ContextImplIntegrationTest.java +++ b/nucleus/diagnostics/context/src/test/java/org/glassfish/diagnostics/context/impl/ContextImplIntegrationTest.java @@ -16,13 +16,13 @@ package org.glassfish.diagnostics.context.impl; +import jakarta.inject.Inject; + import org.glassfish.diagnostics.context.ContextManager; import org.glassfish.tests.utils.junit.HK2JUnit5Extension; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import jakarta.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertNotNull; @ExtendWith(HK2JUnit5Extension.class) From 10f0fa889993246cc8439a2877aaece6465fa1e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 11:15:15 +0200 Subject: [PATCH 39/40] Imports: remaining fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../security/SecurityIIOPInterceptorFactory.java | 2 +- .../extras/commandlogger/AdminCommandLogger.java | 11 ++++++----- .../enterprise/security/audit/BaseAuditManager.java | 12 ++++++------ 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/SecurityIIOPInterceptorFactory.java b/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/SecurityIIOPInterceptorFactory.java index 28b7531d2c8..409e916e69b 100644 --- a/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/SecurityIIOPInterceptorFactory.java +++ b/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/SecurityIIOPInterceptorFactory.java @@ -33,8 +33,8 @@ import org.omg.PortableInterceptor.ClientRequestInterceptor; import org.omg.PortableInterceptor.IORInterceptor; import org.omg.PortableInterceptor.ORBInitInfo; -import org.omg.PortableInterceptor.ServerRequestInterceptor; import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName; +import org.omg.PortableInterceptor.ServerRequestInterceptor; import static com.sun.logging.LogDomains.SECURITY_LOGGER; diff --git a/nucleus/extras/command-logger/src/main/java/org/glassfish/extras/commandlogger/AdminCommandLogger.java b/nucleus/extras/command-logger/src/main/java/org/glassfish/extras/commandlogger/AdminCommandLogger.java index 5e2ca20b100..5ecfe4b126b 100644 --- a/nucleus/extras/command-logger/src/main/java/org/glassfish/extras/commandlogger/AdminCommandLogger.java +++ b/nucleus/extras/command-logger/src/main/java/org/glassfish/extras/commandlogger/AdminCommandLogger.java @@ -15,13 +15,10 @@ */ package org.glassfish.extras.commandlogger; -import static java.lang.System.Logger.Level.INFO; -import static java.lang.System.Logger.Level.WARNING; -import static java.util.stream.Collectors.joining; - import java.util.Arrays; import java.util.List; import java.util.stream.Stream; + import org.glassfish.api.StartupRunLevel; import org.glassfish.api.admin.ParameterMap; import org.glassfish.config.support.TranslatedConfigView; @@ -32,6 +29,10 @@ import org.glassfish.security.common.UserPrincipal; import org.jvnet.hk2.annotations.Service; +import static java.lang.System.Logger.Level.INFO; +import static java.lang.System.Logger.Level.WARNING; +import static java.util.stream.Collectors.joining; + /** * * @author Ondro Mihalyi @@ -74,7 +75,7 @@ private String constructCommandLine(String commandName, ParameterMap parameters) .collect(joining(" ")); } - public static enum LogMode { + public enum LogMode { ALL_COMMANDS, INTERNAL_COMMANDS, WRITE_COMMANDS, READ_WRITE_COMMANDS, NO_COMMAND; public static final LogMode DEFAULT = LogMode.NO_COMMAND; diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/audit/BaseAuditManager.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/audit/BaseAuditManager.java index 2ac788b233e..f575cbafcee 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/audit/BaseAuditManager.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/audit/BaseAuditManager.java @@ -70,7 +70,7 @@ public class BaseAuditManager implements AuditManager // access to the specified audit modules which the subclass audit manager // deals with. protected List typedModules = Collections.synchronizedList(new ArrayList()); - private Class typedModuleClass = null; // typically set by postConstruct of a subclass invoking setTypeClass + private final Class typedModuleClass = null; // typically set by postConstruct of a subclass invoking setTypeClass private static final Logger _logger = SecurityLoggerInfo.getLogger(); @@ -80,8 +80,8 @@ public class BaseAuditManager implements AuditManager // just a copy of names of the audit classes - helpful for log messages // since we will not have a lot of audit classes, keeping a duplicate copy // seems reasonable. - private Map moduleToNameMap = new HashMap(); - private Map nameToModuleMap = new HashMap(); + private final Map moduleToNameMap = new HashMap<>(); + private final Map nameToModuleMap = new HashMap<>(); // make this accessible to the containers so that the cost of non-audit case, // is just a comparision. protected boolean auditOn = false; @@ -182,14 +182,14 @@ private boolean isAuditModuleOfParameterizedType(final BaseAuditModule am) { } private List copyAndAdd(final List orig, final U am) { - final List list = new ArrayList(); + final List list = new ArrayList<>(); Collections.copy(orig, list); list.add(am); return list; } private List copyAndRemove(final List orig, final U am) { - final List list = new ArrayList(); + final List list = new ArrayList<>(); Collections.copy(orig, list); list.remove(am); return list; @@ -315,7 +315,7 @@ protected String moduleName(final BaseAuditModule am) { } protected List instances(final Class c) { - final List result = new ArrayList(); + final List result = new ArrayList<>(); for (BaseAuditModule am : instances) { if (c.isAssignableFrom(c)) { result.add((T) am); From 27bf35bb2e3c1a9392156d419cdd3734723055f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 11 Aug 2024 11:49:01 +0200 Subject: [PATCH 40/40] Imports - more tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - note: where Eclipse could not resolve imports, the result is just partional Signed-off-by: David Matějček --- .../progress/ProgressPayloadCommand.java | 1 + .../basic/lifecycle/LifeCycleTest.java | 6 +-- .../cdi_basic/BasicCDITestServlet.java | 1 + .../embedded/cdi_basic/BasicCDIUnitTest.java | 18 ++++----- .../cdi_ejb_jpa/BasicCDITestServlet.java | 3 +- .../tests/embedded/cdi_ejb_jpa/Person.java | 3 +- .../cdi_ejb_jpa/BasicCDIUnitTest.java | 18 ++++----- .../tests/embedded/ejb/basic/TimerEjb.java | 3 +- .../embedded/ejb/basic/test/EmbeddedTest.java | 9 +++-- .../tests/embedded/ejb/test/EmbeddedTest.java | 16 ++++---- .../embedded/ejb/remoteejb/TimerEjb.java | 3 +- .../embedded/ejb/remoteejb/test/EJBTest.java | 9 +++-- .../cdi_ejb_jpa/BasicCDITestServlet.java | 1 + .../tests/embedded/cdi_ejb_jpa/Person.java | 3 +- .../cdi_ejb_jpa/BasicCDIUnitTest.java | 22 +++++------ .../src/main/java/test/ServletTest.java | 12 ++++-- .../tests/applicationDispatcher/WebTest.java | 7 ++-- .../src/main/java/test/ServletTest.java | 4 +- .../glassfish/tests/dirListing/WebTest.java | 8 ++-- .../src/main/java/test/FilterTest.java | 8 +++- .../src/main/java/test/ServletTest.java | 12 ++++-- .../tests/filterURIMapping/WebTest.java | 8 ++-- .../org/glassfish/tests/index/WebTest.java | 9 +++-- .../src/main/java/test/ServletTest.java | 11 ++++-- .../tests/jmxUndeployEvent/WebTest.java | 8 ++-- .../embedded/jsptest/JspTestServlet.java | 1 + .../tests/embedded/jsptest/JspTest.java | 17 ++++---- .../embedded/localejbs/TesterServlet.java | 3 +- .../tests/embedded/localejbs/TimerEjb.java | 7 +++- .../tests/embedded/localejbs/EjbTest.java | 4 +- .../embedded/localejbs/LocalEjbTest.java | 3 +- .../embedded/jsptest/JspTestServlet.java | 1 + .../tests/embedded/jsptest/JspTest.java | 17 ++++---- .../src/main/java/test/ServletTest.java | 12 ++++-- .../glassfish/tests/queryString/WebTest.java | 6 +-- .../java/test/SecureWebAppTestServlet.java | 1 + .../securewebapp/SecureWebAppTest.java | 17 ++++---- .../src/main/java/test/ServletTest.java | 13 +++++-- .../tests/sessionDestroyed/WebTest.java | 8 ++-- .../src/main/java/test/FilterTest.java | 8 +++- .../src/main/java/test/ServletTest.java | 1 + .../src/main/java/test/ServletTest2.java | 14 +++++-- .../src/main/java/test/ServletTest3.java | 1 + .../tests/standalonewar/WebTest.java | 8 ++-- .../ScatteredArchiveTestRA.java | 4 +- .../ScatteredArchiveTestServlet.java | 1 + .../ScatteredArchiveTest.java | 39 ++++++++++--------- .../ContextInitializedTestServlet.java | 1 + .../DispatcherListener.java | 4 +- appserver/tests/embedded/web/web-api/pom.xml | 15 ++++++- .../tests/webapi/CustomClassLoader.java | 7 +++- .../org/glassfish/tests/webapi/HelloWeb.java | 9 +++-- .../glassfish/tests/webapi/TestServlet.java | 5 ++- .../embedded/web/EmbeddedAddContextTest.java | 13 +++++-- .../web/EmbeddedAddHttpsListenerTest.java | 27 ++++++++----- .../web/EmbeddedAddListenerDefaultVSTest.java | 16 +++++--- ...dedAddServletAndFilterByClassNameTest.java | 22 +++++++---- ...mbeddedAddServletAndFilterByClassTest.java | 28 +++++++------ .../web/EmbeddedAddServletDefaultVSTest.java | 16 +++++--- .../embedded/web/EmbeddedAddServletTest.java | 19 ++++++--- .../web/EmbeddedAddWebListenerTest.java | 17 +++++--- .../embedded/web/EmbeddedClassLoaderTest.java | 20 ++++++---- .../web/EmbeddedCreateContextTest.java | 11 ++++-- .../EmbeddedCreateServletAndFilterTest.java | 22 +++++++---- .../web/EmbeddedCreateVirtualServerTest.java | 17 +++++--- .../embedded/web/EmbeddedGetContextsTest.java | 16 ++++++-- .../tests/embedded/web/EmbeddedJSPTest.java | 7 +++- .../embedded/web/EmbeddedRedeployTest.java | 13 +++++-- .../web/EmbeddedRemoveContextTest.java | 13 +++++-- .../embedded/web/EmbeddedRestartTest.java | 9 ++++- .../web/EmbeddedSetConfigurationTest.java | 12 ++++-- .../web/EmbeddedSetDefaultWebXmlTest.java | 12 ++++-- .../embedded/web/EmbeddedSetDocRootTest.java | 14 +++++-- .../embedded/web/EmbeddedSetSecurityTest.java | 18 +++++++-- .../EmbeddedVirtualServerHostNameTest.java | 14 +++++-- .../web/EmbeddedWebAPIDefaultStartTest.java | 18 ++++++--- .../embedded/web/EmbeddedWebAPITest.java | 17 +++++--- .../tests/embedded/web/EmbeddedWebTest.java | 17 +++++--- .../tests/embedded/web/MyServlet.java | 11 ++++-- .../web/MyServletContextListener.java | 5 +-- .../tests/embedded/web/NewFilter.java | 10 ++++- .../tests/embedded/web/NewFilterServlet.java | 10 +++-- .../tests/embedded/web/NewServlet.java | 10 +++-- .../web/NewServletRequestListener.java | 4 +- .../tests/embedded/web/WebHello.java | 9 +++-- .../tck/glassfish/GlassFishBeansImpl.java | 1 + ...assFishDeploymentExceptionTransformer.java | 6 +-- .../java/com/sun/ts/lib/harness/EETest.java | 5 +-- .../com/sun/ts/lib/harness/ServiceEETest.java | 9 ++--- .../common/vehicle/EmptyVehicleRunner.java | 5 +-- .../tests/common/vehicle/VehicleRunnable.java | 2 - .../vehicle/ejbembed/EJBEmbedRunner.java | 15 ++++--- .../vehicle/ejbembed/InjectionResolver.java | 14 +++---- .../vehicle/ejbliteshare/EJBLiteClientIF.java | 4 +- .../EJBLiteSecuredWebVehicleRunner.java | 11 +++--- .../ejbliteshare/EJBLiteWebVehicleRunner.java | 13 +++---- .../ts/tests/ejb30/common/helper/Helper.java | 4 +- .../ejb30/common/lite/EJBLiteClientBase.java | 16 ++++---- .../lite/basic/common/BasicBeanHelper.java | 12 +++--- .../lite/basic/common/GlobalJNDITest.java | 4 +- .../basic/singleton/HttpServletDelegate.java | 6 +-- .../com/sun/ts/run/EmbeddedRunnerITest.java | 1 - .../com/sun/ts/run/StandaloneRunnerITest.java | 13 +++---- .../config/tck/ConfigArquillianExtension.java | 4 +- .../tck/client/BeansXmlTransformer.java | 10 ++--- .../ConfigDeploymentExceptionTransformer.java | 1 + .../tests/tck/ant/xml/JUnitResultsParser.java | 1 + .../tests/tck/rest/cdi/RestCdiIT.java | 16 ++++---- 108 files changed, 665 insertions(+), 405 deletions(-) diff --git a/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressPayloadCommand.java b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressPayloadCommand.java index 782f7c428a0..403d3485383 100644 --- a/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressPayloadCommand.java +++ b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressPayloadCommand.java @@ -18,6 +18,7 @@ package com.sun.enterprise.tests.progress; import com.sun.enterprise.util.StringUtils; + import java.io.File; import java.io.IOException; import java.net.URI; diff --git a/appserver/tests/embedded/basic/lifecycle/src/test/java/org/glassfish/tests/embedded/basic/lifecycle/LifeCycleTest.java b/appserver/tests/embedded/basic/lifecycle/src/test/java/org/glassfish/tests/embedded/basic/lifecycle/LifeCycleTest.java index b769674254b..c463d258a7e 100644 --- a/appserver/tests/embedded/basic/lifecycle/src/test/java/org/glassfish/tests/embedded/basic/lifecycle/LifeCycleTest.java +++ b/appserver/tests/embedded/basic/lifecycle/src/test/java/org/glassfish/tests/embedded/basic/lifecycle/LifeCycleTest.java @@ -17,15 +17,15 @@ package org.glassfish.tests.embedded.basic.lifecycle; +import java.io.File; +import java.util.logging.Logger; + import org.glassfish.embeddable.GlassFish; import org.glassfish.embeddable.GlassFishException; import org.glassfish.embeddable.GlassFishProperties; import org.glassfish.embeddable.GlassFishRuntime; import org.junit.jupiter.api.Test; -import java.io.File; -import java.util.logging.Logger; - /** * @author bhavanishankar@dev.java.net */ diff --git a/appserver/tests/embedded/cdi_basic/src/main/java/org/glassfish/tests/embedded/cdi_basic/BasicCDITestServlet.java b/appserver/tests/embedded/cdi_basic/src/main/java/org/glassfish/tests/embedded/cdi_basic/BasicCDITestServlet.java index dfb4a02a55f..735b7d24da7 100644 --- a/appserver/tests/embedded/cdi_basic/src/main/java/org/glassfish/tests/embedded/cdi_basic/BasicCDITestServlet.java +++ b/appserver/tests/embedded/cdi_basic/src/main/java/org/glassfish/tests/embedded/cdi_basic/BasicCDITestServlet.java @@ -23,6 +23,7 @@ import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.io.PrintWriter; diff --git a/appserver/tests/embedded/cdi_basic/src/test/java/org/glassfish/tests/embedded/cdi_basic/BasicCDIUnitTest.java b/appserver/tests/embedded/cdi_basic/src/test/java/org/glassfish/tests/embedded/cdi_basic/BasicCDIUnitTest.java index 444bbb2f33d..16b5bd25751 100644 --- a/appserver/tests/embedded/cdi_basic/src/test/java/org/glassfish/tests/embedded/cdi_basic/BasicCDIUnitTest.java +++ b/appserver/tests/embedded/cdi_basic/src/test/java/org/glassfish/tests/embedded/cdi_basic/BasicCDIUnitTest.java @@ -17,15 +17,6 @@ package org.glassfish.tests.embedded.cdi_basic; -import org.glassfish.embeddable.Deployer; -import org.glassfish.embeddable.GlassFish; -import org.glassfish.embeddable.GlassFishProperties; -import org.glassfish.embeddable.GlassFishRuntime; -import org.glassfish.embeddable.archive.ScatteredArchive; -import org.glassfish.embeddable.web.HttpListener; -import org.glassfish.embeddable.web.WebContainer; -import org.junit.jupiter.api.Test; - import java.io.BufferedReader; import java.io.File; import java.io.IOException; @@ -37,7 +28,16 @@ import java.util.Enumeration; import java.util.jar.JarEntry; import java.util.jar.JarFile; + +import org.glassfish.embeddable.Deployer; +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishProperties; +import org.glassfish.embeddable.GlassFishRuntime; +import org.glassfish.embeddable.archive.ScatteredArchive; +import org.glassfish.embeddable.web.HttpListener; +import org.glassfish.embeddable.web.WebContainer; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author bhavanishankar@dev.java.net diff --git a/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/BasicCDITestServlet.java b/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/BasicCDITestServlet.java index 725ac709422..4a952643f79 100644 --- a/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/BasicCDITestServlet.java +++ b/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/BasicCDITestServlet.java @@ -16,14 +16,15 @@ package org.glassfish.tests.embedded.cdi_ejb_jpa; +import jakarta.annotation.sql.DataSourceDefinition; import jakarta.servlet.ServletException; import jakarta.servlet.annotation.WebServlet; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.io.PrintWriter; -import jakarta.annotation.sql.DataSourceDefinition; @WebServlet(name = "BasicCDITestServlet", urlPatterns = "/BasicCDITestServlet") diff --git a/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/Person.java b/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/Person.java index 49cf0e05bbd..c50f1821a05 100644 --- a/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/Person.java +++ b/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/Person.java @@ -16,13 +16,14 @@ package org.glassfish.tests.embedded.cdi_ejb_jpa; -import java.io.Serializable; import jakarta.persistence.Basic; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import java.io.Serializable; + @Entity public class Person implements Serializable { private static final long serialVersionUID = 1L; diff --git a/appserver/tests/embedded/cdi_ejb_jpa/src/test/java/org/glassfish/tests/embedded/cdi_ejb_jpa/BasicCDIUnitTest.java b/appserver/tests/embedded/cdi_ejb_jpa/src/test/java/org/glassfish/tests/embedded/cdi_ejb_jpa/BasicCDIUnitTest.java index f6587ba0219..b153f3cf830 100644 --- a/appserver/tests/embedded/cdi_ejb_jpa/src/test/java/org/glassfish/tests/embedded/cdi_ejb_jpa/BasicCDIUnitTest.java +++ b/appserver/tests/embedded/cdi_ejb_jpa/src/test/java/org/glassfish/tests/embedded/cdi_ejb_jpa/BasicCDIUnitTest.java @@ -17,15 +17,6 @@ package org.glassfish.tests.embedded.cdi_ejb_jpa; -import org.glassfish.embeddable.Deployer; -import org.glassfish.embeddable.GlassFish; -import org.glassfish.embeddable.GlassFishProperties; -import org.glassfish.embeddable.GlassFishRuntime; -import org.glassfish.embeddable.archive.ScatteredArchive; -import org.glassfish.embeddable.web.HttpListener; -import org.glassfish.embeddable.web.WebContainer; -import org.junit.jupiter.api.Test; - import java.io.BufferedReader; import java.io.File; import java.io.IOException; @@ -37,7 +28,16 @@ import java.util.Enumeration; import java.util.jar.JarEntry; import java.util.jar.JarFile; + +import org.glassfish.embeddable.Deployer; +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishProperties; +import org.glassfish.embeddable.GlassFishRuntime; +import org.glassfish.embeddable.archive.ScatteredArchive; +import org.glassfish.embeddable.web.HttpListener; +import org.glassfish.embeddable.web.WebContainer; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author bhavanishankar@dev.java.net diff --git a/appserver/tests/embedded/ejb/basic/src/main/java/org/glassfish/tests/embedded/ejb/basic/TimerEjb.java b/appserver/tests/embedded/ejb/basic/src/main/java/org/glassfish/tests/embedded/ejb/basic/TimerEjb.java index 08ccf0b8652..8ac30e772fd 100644 --- a/appserver/tests/embedded/ejb/basic/src/main/java/org/glassfish/tests/embedded/ejb/basic/TimerEjb.java +++ b/appserver/tests/embedded/ejb/basic/src/main/java/org/glassfish/tests/embedded/ejb/basic/TimerEjb.java @@ -16,11 +16,12 @@ package org.glassfish.tests.embedded.ejb.basic; +import jakarta.ejb.Schedule; import jakarta.ejb.Stateless; import jakarta.ejb.Timeout; import jakarta.ejb.Timer; import jakarta.ejb.TimerService; -import jakarta.ejb.Schedule; + import javax.naming.InitialContext; @Stateless diff --git a/appserver/tests/embedded/ejb/basic/src/test/java/org/glassfish/tests/embedded/ejb/basic/test/EmbeddedTest.java b/appserver/tests/embedded/ejb/basic/src/test/java/org/glassfish/tests/embedded/ejb/basic/test/EmbeddedTest.java index b8fc5ed2991..4b81cde6c72 100644 --- a/appserver/tests/embedded/ejb/basic/src/test/java/org/glassfish/tests/embedded/ejb/basic/test/EmbeddedTest.java +++ b/appserver/tests/embedded/ejb/basic/src/test/java/org/glassfish/tests/embedded/ejb/basic/test/EmbeddedTest.java @@ -17,6 +17,11 @@ package org.glassfish.tests.embedded.ejb.basic.test; +import java.io.File; +import java.net.URI; + +import javax.naming.InitialContext; + import org.glassfish.embeddable.Deployer; import org.glassfish.embeddable.GlassFish; import org.glassfish.embeddable.GlassFishRuntime; @@ -25,10 +30,6 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import javax.naming.InitialContext; -import java.io.File; -import java.net.URI; - /** * this test will use the ejb API testing. * diff --git a/appserver/tests/embedded/ejb/ejb-api/src/test/java/org/glassfish/tests/embedded/ejb/test/EmbeddedTest.java b/appserver/tests/embedded/ejb/ejb-api/src/test/java/org/glassfish/tests/embedded/ejb/test/EmbeddedTest.java index e738d0fbfdf..c5c27d7d244 100644 --- a/appserver/tests/embedded/ejb/ejb-api/src/test/java/org/glassfish/tests/embedded/ejb/test/EmbeddedTest.java +++ b/appserver/tests/embedded/ejb/ejb-api/src/test/java/org/glassfish/tests/embedded/ejb/test/EmbeddedTest.java @@ -17,15 +17,17 @@ package org.glassfish.tests.embedded.ejb.test; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.Assertions; -import org.glassfish.tests.embedded.ejb.SampleEjb; - import jakarta.ejb.embeddable.EJBContainer; -import javax.naming.Context; -import java.util.Map; + +import java.io.File; import java.util.HashMap; -import java.io.*; +import java.util.Map; + +import javax.naming.Context; + +import org.glassfish.tests.embedded.ejb.SampleEjb; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * this test will use the ejb API testing. diff --git a/appserver/tests/embedded/ejb/remoteejb/src/main/java/org/glassfish/tests/embedded/ejb/remoteejb/TimerEjb.java b/appserver/tests/embedded/ejb/remoteejb/src/main/java/org/glassfish/tests/embedded/ejb/remoteejb/TimerEjb.java index 3496376b2c6..7911612a129 100644 --- a/appserver/tests/embedded/ejb/remoteejb/src/main/java/org/glassfish/tests/embedded/ejb/remoteejb/TimerEjb.java +++ b/appserver/tests/embedded/ejb/remoteejb/src/main/java/org/glassfish/tests/embedded/ejb/remoteejb/TimerEjb.java @@ -16,11 +16,12 @@ package org.glassfish.tests.embedded.ejb.remoteejb; +import jakarta.ejb.Schedule; import jakarta.ejb.Stateless; import jakarta.ejb.Timeout; import jakarta.ejb.Timer; import jakarta.ejb.TimerService; -import jakarta.ejb.Schedule; + import javax.naming.InitialContext; @Stateless diff --git a/appserver/tests/embedded/ejb/remoteejb/src/test/java/org/glassfish/tests/embedded/ejb/remoteejb/test/EJBTest.java b/appserver/tests/embedded/ejb/remoteejb/src/test/java/org/glassfish/tests/embedded/ejb/remoteejb/test/EJBTest.java index 1cb8e4603ca..938201bd3c4 100644 --- a/appserver/tests/embedded/ejb/remoteejb/src/test/java/org/glassfish/tests/embedded/ejb/remoteejb/test/EJBTest.java +++ b/appserver/tests/embedded/ejb/remoteejb/src/test/java/org/glassfish/tests/embedded/ejb/remoteejb/test/EJBTest.java @@ -17,6 +17,11 @@ package org.glassfish.tests.embedded.ejb.remoteejb.test; +import java.io.File; +import java.net.URI; + +import javax.naming.InitialContext; + import org.glassfish.embeddable.Deployer; import org.glassfish.embeddable.GlassFish; import org.glassfish.embeddable.GlassFishRuntime; @@ -26,10 +31,6 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import javax.naming.InitialContext; -import java.io.File; -import java.net.URI; - /** * @author bhavanishankar@java.net */ diff --git a/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/BasicCDITestServlet.java b/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/BasicCDITestServlet.java index 1a8c752d33f..a6abd06eb07 100644 --- a/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/BasicCDITestServlet.java +++ b/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/BasicCDITestServlet.java @@ -21,6 +21,7 @@ import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.io.PrintWriter; diff --git a/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/Person.java b/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/Person.java index 49cf0e05bbd..c50f1821a05 100644 --- a/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/Person.java +++ b/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/Person.java @@ -16,13 +16,14 @@ package org.glassfish.tests.embedded.cdi_ejb_jpa; -import java.io.Serializable; import jakarta.persistence.Basic; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import java.io.Serializable; + @Entity public class Person implements Serializable { private static final long serialVersionUID = 1L; diff --git a/appserver/tests/embedded/glassfish_resources_xml/src/test/java/org/glassfish/tests/embedded/cdi_ejb_jpa/BasicCDIUnitTest.java b/appserver/tests/embedded/glassfish_resources_xml/src/test/java/org/glassfish/tests/embedded/cdi_ejb_jpa/BasicCDIUnitTest.java index 934ac7a6bb9..b8e4e296f59 100644 --- a/appserver/tests/embedded/glassfish_resources_xml/src/test/java/org/glassfish/tests/embedded/cdi_ejb_jpa/BasicCDIUnitTest.java +++ b/appserver/tests/embedded/glassfish_resources_xml/src/test/java/org/glassfish/tests/embedded/cdi_ejb_jpa/BasicCDIUnitTest.java @@ -16,17 +16,6 @@ package org.glassfish.tests.embedded.cdi_ejb_jpa; -import org.junit.jupiter.api.Assertions; -import org.glassfish.embeddable.Deployer; -import org.glassfish.embeddable.GlassFish; -import org.glassfish.embeddable.GlassFishProperties; -import org.glassfish.embeddable.BootstrapProperties; -import org.glassfish.embeddable.GlassFishRuntime; -import org.glassfish.embeddable.archive.ScatteredArchive; -import org.glassfish.embeddable.web.HttpListener; -import org.glassfish.embeddable.web.WebContainer; -import org.junit.jupiter.api.Test; - import java.io.BufferedReader; import java.io.File; import java.io.IOException; @@ -39,6 +28,17 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; +import org.glassfish.embeddable.BootstrapProperties; +import org.glassfish.embeddable.Deployer; +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishProperties; +import org.glassfish.embeddable.GlassFishRuntime; +import org.glassfish.embeddable.archive.ScatteredArchive; +import org.glassfish.embeddable.web.HttpListener; +import org.glassfish.embeddable.web.WebContainer; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + /** * @author bhavanishankar@dev.java.net */ diff --git a/appserver/tests/embedded/maven-plugin/applicationDispatcher/src/main/java/test/ServletTest.java b/appserver/tests/embedded/maven-plugin/applicationDispatcher/src/main/java/test/ServletTest.java index 9c8a74435a7..8163cff0614 100644 --- a/appserver/tests/embedded/maven-plugin/applicationDispatcher/src/main/java/test/ServletTest.java +++ b/appserver/tests/embedded/maven-plugin/applicationDispatcher/src/main/java/test/ServletTest.java @@ -16,9 +16,15 @@ package test; -import java.io.*; -import jakarta.servlet.*; -import jakarta.servlet.http.*; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +import java.io.IOException; +import java.io.PrintWriter; public class ServletTest extends HttpServlet{ diff --git a/appserver/tests/embedded/maven-plugin/applicationDispatcher/src/test/java/org/glassfish/tests/applicationDispatcher/WebTest.java b/appserver/tests/embedded/maven-plugin/applicationDispatcher/src/test/java/org/glassfish/tests/applicationDispatcher/WebTest.java index cee4707742a..763754193da 100644 --- a/appserver/tests/embedded/maven-plugin/applicationDispatcher/src/test/java/org/glassfish/tests/applicationDispatcher/WebTest.java +++ b/appserver/tests/embedded/maven-plugin/applicationDispatcher/src/test/java/org/glassfish/tests/applicationDispatcher/WebTest.java @@ -17,15 +17,16 @@ package org.glassfish.tests.applicationDispatcher; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + public class WebTest { private static int count = 0; diff --git a/appserver/tests/embedded/maven-plugin/dirListing/src/main/java/test/ServletTest.java b/appserver/tests/embedded/maven-plugin/dirListing/src/main/java/test/ServletTest.java index 13dccfbcc5c..a201cee055f 100644 --- a/appserver/tests/embedded/maven-plugin/dirListing/src/main/java/test/ServletTest.java +++ b/appserver/tests/embedded/maven-plugin/dirListing/src/main/java/test/ServletTest.java @@ -16,8 +16,6 @@ package test; -import java.io.IOException; - import jakarta.servlet.ServletConfig; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServlet; @@ -25,6 +23,8 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSessionListener; +import java.io.IOException; + public class ServletTest extends HttpServlet implements HttpSessionListener { public void init(ServletConfig config) throws ServletException { diff --git a/appserver/tests/embedded/maven-plugin/dirListing/src/test/java/org/glassfish/tests/dirListing/WebTest.java b/appserver/tests/embedded/maven-plugin/dirListing/src/test/java/org/glassfish/tests/dirListing/WebTest.java index c239d0f6c4c..ee2d3bc4e3f 100644 --- a/appserver/tests/embedded/maven-plugin/dirListing/src/test/java/org/glassfish/tests/dirListing/WebTest.java +++ b/appserver/tests/embedded/maven-plugin/dirListing/src/test/java/org/glassfish/tests/dirListing/WebTest.java @@ -17,16 +17,16 @@ package org.glassfish.tests.dirListing; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + public class WebTest { private static int count = 0; diff --git a/appserver/tests/embedded/maven-plugin/filterURIMapping/src/main/java/test/FilterTest.java b/appserver/tests/embedded/maven-plugin/filterURIMapping/src/main/java/test/FilterTest.java index eec957ed9a7..baa8586059f 100644 --- a/appserver/tests/embedded/maven-plugin/filterURIMapping/src/main/java/test/FilterTest.java +++ b/appserver/tests/embedded/maven-plugin/filterURIMapping/src/main/java/test/FilterTest.java @@ -16,8 +16,12 @@ package test; -import jakarta.servlet.*; -import jakarta.servlet.http.*; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; public class FilterTest implements Filter{ private ServletContext context; diff --git a/appserver/tests/embedded/maven-plugin/filterURIMapping/src/main/java/test/ServletTest.java b/appserver/tests/embedded/maven-plugin/filterURIMapping/src/main/java/test/ServletTest.java index 07859cc811b..ead8a9c0ca5 100644 --- a/appserver/tests/embedded/maven-plugin/filterURIMapping/src/main/java/test/ServletTest.java +++ b/appserver/tests/embedded/maven-plugin/filterURIMapping/src/main/java/test/ServletTest.java @@ -16,9 +16,15 @@ package test; -import java.io.*; -import jakarta.servlet.*; -import jakarta.servlet.http.*; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +import java.io.IOException; +import java.io.PrintWriter; public class ServletTest extends HttpServlet { diff --git a/appserver/tests/embedded/maven-plugin/filterURIMapping/src/test/java/org/glassfish/tests/filterURIMapping/WebTest.java b/appserver/tests/embedded/maven-plugin/filterURIMapping/src/test/java/org/glassfish/tests/filterURIMapping/WebTest.java index d1d565cd96b..04a8bfc801e 100644 --- a/appserver/tests/embedded/maven-plugin/filterURIMapping/src/test/java/org/glassfish/tests/filterURIMapping/WebTest.java +++ b/appserver/tests/embedded/maven-plugin/filterURIMapping/src/test/java/org/glassfish/tests/filterURIMapping/WebTest.java @@ -17,16 +17,16 @@ package org.glassfish.tests.filterURIMapping; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + public class WebTest { private static int count = 0; diff --git a/appserver/tests/embedded/maven-plugin/index/src/test/java/org/glassfish/tests/index/WebTest.java b/appserver/tests/embedded/maven-plugin/index/src/test/java/org/glassfish/tests/index/WebTest.java index 1fb8e5001ea..50a2fa482c1 100644 --- a/appserver/tests/embedded/maven-plugin/index/src/test/java/org/glassfish/tests/index/WebTest.java +++ b/appserver/tests/embedded/maven-plugin/index/src/test/java/org/glassfish/tests/index/WebTest.java @@ -17,16 +17,17 @@ package org.glassfish.tests.index; -import static org.hamcrest.CoreMatchers.is; - import java.io.IOException; import java.net.URL; import java.net.http.HttpClient; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; import java.net.http.HttpRequest; import java.net.http.HttpResponse; + import org.hamcrest.MatcherAssert; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.CoreMatchers.is; public class WebTest { diff --git a/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/src/main/java/test/ServletTest.java b/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/src/main/java/test/ServletTest.java index e21d30934bb..1c2886763dd 100644 --- a/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/src/main/java/test/ServletTest.java +++ b/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/src/main/java/test/ServletTest.java @@ -16,9 +16,14 @@ package test; -import java.io.*; -import jakarta.servlet.*; -import jakarta.servlet.http.*; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +import java.io.IOException; +import java.io.PrintWriter; public class ServletTest extends HttpServlet{ diff --git a/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/src/test/java/org/glassfish/tests/jmxUndeployEvent/WebTest.java b/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/src/test/java/org/glassfish/tests/jmxUndeployEvent/WebTest.java index 7c795d67150..00f92b8f94d 100644 --- a/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/src/test/java/org/glassfish/tests/jmxUndeployEvent/WebTest.java +++ b/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/src/test/java/org/glassfish/tests/jmxUndeployEvent/WebTest.java @@ -17,16 +17,16 @@ package org.glassfish.tests.jmxUndeployEvent; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; - import java.io.DataOutputStream; import java.io.IOException; +import java.net.HttpURLConnection; import java.net.URL; import java.net.URLConnection; -import java.net.HttpURLConnection; + import org.hamcrest.CoreMatchers; import org.hamcrest.MatcherAssert; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; public class WebTest { diff --git a/appserver/tests/embedded/maven-plugin/jsptest/src/main/java/org/glassfish/tests/embedded/jsptest/JspTestServlet.java b/appserver/tests/embedded/maven-plugin/jsptest/src/main/java/org/glassfish/tests/embedded/jsptest/JspTestServlet.java index 5642b2f132f..175522790c6 100644 --- a/appserver/tests/embedded/maven-plugin/jsptest/src/main/java/org/glassfish/tests/embedded/jsptest/JspTestServlet.java +++ b/appserver/tests/embedded/maven-plugin/jsptest/src/main/java/org/glassfish/tests/embedded/jsptest/JspTestServlet.java @@ -21,6 +21,7 @@ import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.io.PrintWriter; diff --git a/appserver/tests/embedded/maven-plugin/jsptest/src/test/java/org/glassfish/tests/embedded/jsptest/JspTest.java b/appserver/tests/embedded/maven-plugin/jsptest/src/test/java/org/glassfish/tests/embedded/jsptest/JspTest.java index 1a00bf10d8a..780fad95bf9 100644 --- a/appserver/tests/embedded/maven-plugin/jsptest/src/test/java/org/glassfish/tests/embedded/jsptest/JspTest.java +++ b/appserver/tests/embedded/maven-plugin/jsptest/src/test/java/org/glassfish/tests/embedded/jsptest/JspTest.java @@ -17,14 +17,6 @@ package org.glassfish.tests.embedded.jsptest; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; - -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -33,6 +25,15 @@ import java.security.SecureRandom; import java.security.cert.X509Certificate; +import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + public class JspTest { // private static int count = 0; diff --git a/appserver/tests/embedded/maven-plugin/localejbs/src/main/java/org/glassfish/tests/embedded/localejbs/TesterServlet.java b/appserver/tests/embedded/maven-plugin/localejbs/src/main/java/org/glassfish/tests/embedded/localejbs/TesterServlet.java index 8c530798691..fed33f9cb79 100644 --- a/appserver/tests/embedded/maven-plugin/localejbs/src/main/java/org/glassfish/tests/embedded/localejbs/TesterServlet.java +++ b/appserver/tests/embedded/maven-plugin/localejbs/src/main/java/org/glassfish/tests/embedded/localejbs/TesterServlet.java @@ -18,10 +18,11 @@ package org.glassfish.tests.embedded.localejbs; import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import jakarta.servlet.annotation.WebServlet; + import java.io.IOException; /** diff --git a/appserver/tests/embedded/maven-plugin/localejbs/src/main/java/org/glassfish/tests/embedded/localejbs/TimerEjb.java b/appserver/tests/embedded/maven-plugin/localejbs/src/main/java/org/glassfish/tests/embedded/localejbs/TimerEjb.java index 503647cd793..775cd4a5f0f 100644 --- a/appserver/tests/embedded/maven-plugin/localejbs/src/main/java/org/glassfish/tests/embedded/localejbs/TimerEjb.java +++ b/appserver/tests/embedded/maven-plugin/localejbs/src/main/java/org/glassfish/tests/embedded/localejbs/TimerEjb.java @@ -16,7 +16,12 @@ package org.glassfish.tests.embedded.localejbs; -import jakarta.ejb.*; +import jakarta.ejb.Schedule; +import jakarta.ejb.Stateless; +import jakarta.ejb.Timeout; +import jakarta.ejb.Timer; +import jakarta.ejb.TimerService; + import javax.naming.InitialContext; @Stateless diff --git a/appserver/tests/embedded/maven-plugin/localejbs/src/test/java/org/glassfish/tests/embedded/localejbs/EjbTest.java b/appserver/tests/embedded/maven-plugin/localejbs/src/test/java/org/glassfish/tests/embedded/localejbs/EjbTest.java index 81b738e7529..2c99ec1b642 100644 --- a/appserver/tests/embedded/maven-plugin/localejbs/src/test/java/org/glassfish/tests/embedded/localejbs/EjbTest.java +++ b/appserver/tests/embedded/maven-plugin/localejbs/src/test/java/org/glassfish/tests/embedded/localejbs/EjbTest.java @@ -17,11 +17,11 @@ package org.glassfish.tests.embedded.localejbs; -import org.junit.jupiter.api.Test; - import java.net.HttpURLConnection; import java.net.URL; +import org.junit.jupiter.api.Test; + /** * @author bhavanishankar@dev.java.net */ diff --git a/appserver/tests/embedded/maven-plugin/localejbs/src/test/java/org/glassfish/tests/embedded/localejbs/LocalEjbTest.java b/appserver/tests/embedded/maven-plugin/localejbs/src/test/java/org/glassfish/tests/embedded/localejbs/LocalEjbTest.java index f8957806caf..bcbe4fa1a5d 100644 --- a/appserver/tests/embedded/maven-plugin/localejbs/src/test/java/org/glassfish/tests/embedded/localejbs/LocalEjbTest.java +++ b/appserver/tests/embedded/maven-plugin/localejbs/src/test/java/org/glassfish/tests/embedded/localejbs/LocalEjbTest.java @@ -17,9 +17,10 @@ package org.glassfish.tests.embedded.localejbs; +import javax.naming.InitialContext; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import javax.naming.InitialContext; /** * @author bhavanishankar@dev.java.net diff --git a/appserver/tests/embedded/maven-plugin/multipleApps/src/main/java/org/glassfish/tests/embedded/jsptest/JspTestServlet.java b/appserver/tests/embedded/maven-plugin/multipleApps/src/main/java/org/glassfish/tests/embedded/jsptest/JspTestServlet.java index 5642b2f132f..175522790c6 100644 --- a/appserver/tests/embedded/maven-plugin/multipleApps/src/main/java/org/glassfish/tests/embedded/jsptest/JspTestServlet.java +++ b/appserver/tests/embedded/maven-plugin/multipleApps/src/main/java/org/glassfish/tests/embedded/jsptest/JspTestServlet.java @@ -21,6 +21,7 @@ import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.io.PrintWriter; diff --git a/appserver/tests/embedded/maven-plugin/multipleApps/src/test/java/org/glassfish/tests/embedded/jsptest/JspTest.java b/appserver/tests/embedded/maven-plugin/multipleApps/src/test/java/org/glassfish/tests/embedded/jsptest/JspTest.java index 0c0fa513e1c..a53c886d6a9 100644 --- a/appserver/tests/embedded/maven-plugin/multipleApps/src/test/java/org/glassfish/tests/embedded/jsptest/JspTest.java +++ b/appserver/tests/embedded/maven-plugin/multipleApps/src/test/java/org/glassfish/tests/embedded/jsptest/JspTest.java @@ -17,14 +17,6 @@ package org.glassfish.tests.embedded.jsptest; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; - -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -33,6 +25,15 @@ import java.security.SecureRandom; import java.security.cert.X509Certificate; +import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + public class JspTest { // private static int count = 0; diff --git a/appserver/tests/embedded/maven-plugin/queryString/src/main/java/test/ServletTest.java b/appserver/tests/embedded/maven-plugin/queryString/src/main/java/test/ServletTest.java index 3857c3920a2..480f2c3dbc5 100644 --- a/appserver/tests/embedded/maven-plugin/queryString/src/main/java/test/ServletTest.java +++ b/appserver/tests/embedded/maven-plugin/queryString/src/main/java/test/ServletTest.java @@ -16,9 +16,15 @@ package test; -import java.io.*; -import jakarta.servlet.*; -import jakarta.servlet.http.*; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +import java.io.IOException; +import java.io.PrintWriter; public class ServletTest extends HttpServlet { private static boolean isRedirected = false; diff --git a/appserver/tests/embedded/maven-plugin/queryString/src/test/java/org/glassfish/tests/queryString/WebTest.java b/appserver/tests/embedded/maven-plugin/queryString/src/test/java/org/glassfish/tests/queryString/WebTest.java index 2932aeb7b5d..11382e2b599 100644 --- a/appserver/tests/embedded/maven-plugin/queryString/src/test/java/org/glassfish/tests/queryString/WebTest.java +++ b/appserver/tests/embedded/maven-plugin/queryString/src/test/java/org/glassfish/tests/queryString/WebTest.java @@ -17,15 +17,15 @@ package org.glassfish.tests.queryString; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + public class WebTest { private static int count = 0; diff --git a/appserver/tests/embedded/maven-plugin/secureWebApp/src/main/java/test/SecureWebAppTestServlet.java b/appserver/tests/embedded/maven-plugin/secureWebApp/src/main/java/test/SecureWebAppTestServlet.java index fbb7927e8c4..a25fb2ac982 100644 --- a/appserver/tests/embedded/maven-plugin/secureWebApp/src/main/java/test/SecureWebAppTestServlet.java +++ b/appserver/tests/embedded/maven-plugin/secureWebApp/src/main/java/test/SecureWebAppTestServlet.java @@ -21,6 +21,7 @@ import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.io.PrintWriter; diff --git a/appserver/tests/embedded/maven-plugin/secureWebApp/src/test/java/org/glassfish/tests/embedded/securewebapp/SecureWebAppTest.java b/appserver/tests/embedded/maven-plugin/secureWebApp/src/test/java/org/glassfish/tests/embedded/securewebapp/SecureWebAppTest.java index 4412c118c64..7dfb41aff5c 100644 --- a/appserver/tests/embedded/maven-plugin/secureWebApp/src/test/java/org/glassfish/tests/embedded/securewebapp/SecureWebAppTest.java +++ b/appserver/tests/embedded/maven-plugin/secureWebApp/src/test/java/org/glassfish/tests/embedded/securewebapp/SecureWebAppTest.java @@ -17,14 +17,6 @@ package org.glassfish.tests.embedded.securewebapp; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; - -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -32,6 +24,15 @@ import java.security.SecureRandom; import java.security.cert.X509Certificate; +import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + public class SecureWebAppTest { private static int count = 0; diff --git a/appserver/tests/embedded/maven-plugin/sessionDestroyed/src/main/java/test/ServletTest.java b/appserver/tests/embedded/maven-plugin/sessionDestroyed/src/main/java/test/ServletTest.java index b57859a9a17..017981d79db 100644 --- a/appserver/tests/embedded/maven-plugin/sessionDestroyed/src/main/java/test/ServletTest.java +++ b/appserver/tests/embedded/maven-plugin/sessionDestroyed/src/main/java/test/ServletTest.java @@ -16,9 +16,16 @@ package test; -import java.io.*; -import jakarta.servlet.*; -import jakarta.servlet.http.*; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSessionListener; + +import java.io.IOException; +import java.io.PrintWriter; public class ServletTest extends HttpServlet implements HttpSessionListener { diff --git a/appserver/tests/embedded/maven-plugin/sessionDestroyed/src/test/java/org/glassfish/tests/sessionDestroyed/WebTest.java b/appserver/tests/embedded/maven-plugin/sessionDestroyed/src/test/java/org/glassfish/tests/sessionDestroyed/WebTest.java index 66a02f1ad99..6a6a0ee8a30 100644 --- a/appserver/tests/embedded/maven-plugin/sessionDestroyed/src/test/java/org/glassfish/tests/sessionDestroyed/WebTest.java +++ b/appserver/tests/embedded/maven-plugin/sessionDestroyed/src/test/java/org/glassfish/tests/sessionDestroyed/WebTest.java @@ -17,16 +17,16 @@ package org.glassfish.tests.sessionDestroyed; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + public class WebTest { private static int count = 0; diff --git a/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/FilterTest.java b/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/FilterTest.java index eec957ed9a7..baa8586059f 100755 --- a/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/FilterTest.java +++ b/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/FilterTest.java @@ -16,8 +16,12 @@ package test; -import jakarta.servlet.*; -import jakarta.servlet.http.*; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; public class FilterTest implements Filter{ private ServletContext context; diff --git a/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest.java b/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest.java index f58118597a0..6499d210e46 100644 --- a/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest.java +++ b/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest.java @@ -24,6 +24,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSessionListener; + import java.io.IOException; import java.io.PrintWriter; diff --git a/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest2.java b/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest2.java index 38a376bccfd..6fb11a56638 100755 --- a/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest2.java +++ b/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest2.java @@ -16,9 +16,17 @@ package test; -import java.io.*; -import jakarta.servlet.*; -import jakarta.servlet.http.*; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSessionListener; + +import java.io.IOException; +import java.io.PrintWriter; public class ServletTest2 extends HttpServlet implements HttpSessionListener { diff --git a/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest3.java b/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest3.java index 69ab97b0904..19c97a0c23b 100644 --- a/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest3.java +++ b/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest3.java @@ -22,6 +22,7 @@ import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.io.PrintWriter; diff --git a/appserver/tests/embedded/maven-plugin/standalonewar/src/test/java/org/glassfish/tests/standalonewar/WebTest.java b/appserver/tests/embedded/maven-plugin/standalonewar/src/test/java/org/glassfish/tests/standalonewar/WebTest.java index b360c057bbf..b8305dc63c9 100644 --- a/appserver/tests/embedded/maven-plugin/standalonewar/src/test/java/org/glassfish/tests/standalonewar/WebTest.java +++ b/appserver/tests/embedded/maven-plugin/standalonewar/src/test/java/org/glassfish/tests/standalonewar/WebTest.java @@ -17,16 +17,16 @@ package org.glassfish.tests.standalonewar; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + public class WebTest { private static int count = 0; diff --git a/appserver/tests/embedded/scatteredarchive/src/main/java/org/glassfish/tests/embedded/scatteredarchive/ScatteredArchiveTestRA.java b/appserver/tests/embedded/scatteredarchive/src/main/java/org/glassfish/tests/embedded/scatteredarchive/ScatteredArchiveTestRA.java index 630e170ca16..ac29211ed34 100644 --- a/appserver/tests/embedded/scatteredarchive/src/main/java/org/glassfish/tests/embedded/scatteredarchive/ScatteredArchiveTestRA.java +++ b/appserver/tests/embedded/scatteredarchive/src/main/java/org/glassfish/tests/embedded/scatteredarchive/ScatteredArchiveTestRA.java @@ -22,9 +22,11 @@ import jakarta.resource.spi.ResourceAdapter; import jakarta.resource.spi.ResourceAdapterInternalException; import jakarta.resource.spi.endpoint.MessageEndpointFactory; -import javax.transaction.xa.XAResource; + import java.util.logging.Logger; +import javax.transaction.xa.XAResource; + /** * @author bhavanishankar@java.net */ diff --git a/appserver/tests/embedded/scatteredarchive/src/main/java/org/glassfish/tests/embedded/scatteredarchive/ScatteredArchiveTestServlet.java b/appserver/tests/embedded/scatteredarchive/src/main/java/org/glassfish/tests/embedded/scatteredarchive/ScatteredArchiveTestServlet.java index 2f2e86e605d..b3d4c91a8bb 100644 --- a/appserver/tests/embedded/scatteredarchive/src/main/java/org/glassfish/tests/embedded/scatteredarchive/ScatteredArchiveTestServlet.java +++ b/appserver/tests/embedded/scatteredarchive/src/main/java/org/glassfish/tests/embedded/scatteredarchive/ScatteredArchiveTestServlet.java @@ -21,6 +21,7 @@ import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.io.PrintWriter; diff --git a/appserver/tests/embedded/scatteredarchive/src/test/java/org/glassfish/tests/embedded/scatteredarchive/ScatteredArchiveTest.java b/appserver/tests/embedded/scatteredarchive/src/test/java/org/glassfish/tests/embedded/scatteredarchive/ScatteredArchiveTest.java index 05e85854365..deff01eee5f 100644 --- a/appserver/tests/embedded/scatteredarchive/src/test/java/org/glassfish/tests/embedded/scatteredarchive/ScatteredArchiveTest.java +++ b/appserver/tests/embedded/scatteredarchive/src/test/java/org/glassfish/tests/embedded/scatteredarchive/ScatteredArchiveTest.java @@ -16,26 +16,7 @@ */ package org.glassfish.tests.embedded.scatteredarchive; -import static java.lang.System.Logger.Level.DEBUG; -import static java.lang.System.Logger.Level.INFO; -import static java.util.stream.Collectors.toList; -import static org.glassfish.tests.embedded.scatteredarchive.contextInitialized.ContextInitializedTestServlet.LABEL_CONTEXT_INITIALIZED_COUNTER; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.hasItem; -import static org.hamcrest.CoreMatchers.is; - import com.sun.enterprise.util.io.FileUtils; -import org.junit.jupiter.api.Assertions; -import org.glassfish.embeddable.Deployer; -import org.glassfish.embeddable.GlassFish; -import org.glassfish.embeddable.GlassFishProperties; -import org.glassfish.embeddable.GlassFishRuntime; -import org.glassfish.embeddable.archive.ScatteredArchive; -import org.glassfish.embeddable.archive.ScatteredEnterpriseArchive; -import org.glassfish.embeddable.web.HttpListener; -import org.glassfish.embeddable.web.WebContainer; -import org.glassfish.embeddable.GlassFishException; -import org.junit.jupiter.api.Test; import java.io.BufferedReader; import java.io.File; @@ -49,10 +30,30 @@ import java.util.List; import java.util.jar.JarEntry; import java.util.jar.JarFile; + +import org.glassfish.embeddable.Deployer; +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.GlassFishProperties; +import org.glassfish.embeddable.GlassFishRuntime; +import org.glassfish.embeddable.archive.ScatteredArchive; +import org.glassfish.embeddable.archive.ScatteredEnterpriseArchive; +import org.glassfish.embeddable.web.HttpListener; +import org.glassfish.embeddable.web.WebContainer; import org.glassfish.tests.embedded.scatteredarchive.contextInitialized.ContextInitializedTestServlet; import org.hamcrest.MatcherAssert; import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static java.lang.System.Logger.Level.DEBUG; +import static java.lang.System.Logger.Level.INFO; +import static java.util.stream.Collectors.toList; +import static org.glassfish.tests.embedded.scatteredarchive.contextInitialized.ContextInitializedTestServlet.LABEL_CONTEXT_INITIALIZED_COUNTER; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.CoreMatchers.is; /** * @author bhavanishankar@dev.java.net diff --git a/appserver/tests/embedded/scatteredarchive/src/test/java/org/glassfish/tests/embedded/scatteredarchive/contextInitialized/ContextInitializedTestServlet.java b/appserver/tests/embedded/scatteredarchive/src/test/java/org/glassfish/tests/embedded/scatteredarchive/contextInitialized/ContextInitializedTestServlet.java index be7d6455d88..d65313f996a 100644 --- a/appserver/tests/embedded/scatteredarchive/src/test/java/org/glassfish/tests/embedded/scatteredarchive/contextInitialized/ContextInitializedTestServlet.java +++ b/appserver/tests/embedded/scatteredarchive/src/test/java/org/glassfish/tests/embedded/scatteredarchive/contextInitialized/ContextInitializedTestServlet.java @@ -21,6 +21,7 @@ import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.io.PrintWriter; diff --git a/appserver/tests/embedded/scatteredarchive/src/test/java/org/glassfish/tests/embedded/scatteredarchive/contextInitialized/DispatcherListener.java b/appserver/tests/embedded/scatteredarchive/src/test/java/org/glassfish/tests/embedded/scatteredarchive/contextInitialized/DispatcherListener.java index 02df0a137c7..bb236c32d5d 100644 --- a/appserver/tests/embedded/scatteredarchive/src/test/java/org/glassfish/tests/embedded/scatteredarchive/contextInitialized/DispatcherListener.java +++ b/appserver/tests/embedded/scatteredarchive/src/test/java/org/glassfish/tests/embedded/scatteredarchive/contextInitialized/DispatcherListener.java @@ -15,12 +15,12 @@ */ package org.glassfish.tests.embedded.scatteredarchive.contextInitialized; -import static java.lang.System.Logger.Level.INFO; - import jakarta.servlet.ServletContextEvent; import jakarta.servlet.ServletContextListener; import jakarta.servlet.annotation.WebListener; +import static java.lang.System.Logger.Level.INFO; + @WebListener public class DispatcherListener implements ServletContextListener { diff --git a/appserver/tests/embedded/web/web-api/pom.xml b/appserver/tests/embedded/web/web-api/pom.xml index 3c20a9dc5aa..91061c23ff5 100755 --- a/appserver/tests/embedded/web/web-api/pom.xml +++ b/appserver/tests/embedded/web/web-api/pom.xml @@ -85,8 +85,19 @@ junit-jupiter-engine - org.hamcrest - hamcrest + org.hamcrest + hamcrest + + + org.glassfish.main.web + web-embed-api + ${project.version} + test + + + jakarta.servlet + jakarta.servlet-api + provided diff --git a/appserver/tests/embedded/web/web-api/src/main/java/org/glassfish/tests/webapi/CustomClassLoader.java b/appserver/tests/embedded/web/web-api/src/main/java/org/glassfish/tests/webapi/CustomClassLoader.java index fd5c7a61bdb..adb346a0e11 100644 --- a/appserver/tests/embedded/web/web-api/src/main/java/org/glassfish/tests/webapi/CustomClassLoader.java +++ b/appserver/tests/embedded/web/web-api/src/main/java/org/glassfish/tests/webapi/CustomClassLoader.java @@ -16,8 +16,11 @@ package org.glassfish.tests.webapi; -import java.io.*; -import java.util.*; +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.Hashtable; public class CustomClassLoader extends ClassLoader { diff --git a/appserver/tests/embedded/web/web-api/src/main/java/org/glassfish/tests/webapi/HelloWeb.java b/appserver/tests/embedded/web/web-api/src/main/java/org/glassfish/tests/webapi/HelloWeb.java index 8ec36d65b11..a106fe6e8a2 100644 --- a/appserver/tests/embedded/web/web-api/src/main/java/org/glassfish/tests/webapi/HelloWeb.java +++ b/appserver/tests/embedded/web/web-api/src/main/java/org/glassfish/tests/webapi/HelloWeb.java @@ -16,11 +16,14 @@ package org.glassfish.tests.webapi; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.io.PrintWriter; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.*; -import jakarta.servlet.http.*; @WebServlet(urlPatterns={"/hello"}) public class HelloWeb extends HttpServlet { diff --git a/appserver/tests/embedded/web/web-api/src/main/java/org/glassfish/tests/webapi/TestServlet.java b/appserver/tests/embedded/web/web-api/src/main/java/org/glassfish/tests/webapi/TestServlet.java index 5c590f6cecd..db592f74ecc 100644 --- a/appserver/tests/embedded/web/web-api/src/main/java/org/glassfish/tests/webapi/TestServlet.java +++ b/appserver/tests/embedded/web/web-api/src/main/java/org/glassfish/tests/webapi/TestServlet.java @@ -17,14 +17,15 @@ package org.glassfish.tests.webapi; -import java.io.IOException; -import java.io.PrintWriter; import jakarta.servlet.ServletConfig; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.PrintWriter; + public class TestServlet extends HttpServlet { diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddContextTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddContextTest.java index 48ee6636fb5..e2fef4a34e6 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddContextTest.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddContextTest.java @@ -18,14 +18,19 @@ package org.glassfish.tests.embedded.web; import java.io.BufferedReader; -import java.io.InputStreamReader; import java.io.File; +import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; import java.util.logging.Level; -import org.glassfish.embeddable.*; -import org.glassfish.embeddable.web.*; -import org.glassfish.embeddable.web.config.*; + +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.GlassFishRuntime; +import org.glassfish.embeddable.web.Context; +import org.glassfish.embeddable.web.VirtualServer; +import org.glassfish.embeddable.web.WebContainer; +import org.glassfish.embeddable.web.config.WebContainerConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddHttpsListenerTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddHttpsListenerTest.java index ed0947efdd0..4fa4fa37682 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddHttpsListenerTest.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddHttpsListenerTest.java @@ -17,18 +17,27 @@ package org.glassfish.tests.embedded.web; -import java.io.*; -import java.net.*; -import java.security.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.InputStreamReader; +import java.net.URL; +import java.security.SecureRandom; import java.security.cert.X509Certificate; -import javax.net.ssl.*; - import java.util.logging.Level; -import org.glassfish.embeddable.*; -import org.glassfish.embeddable.web.*; -import org.glassfish.embeddable.web.config.*; - +import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; + +import org.glassfish.embeddable.Deployer; +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.GlassFishRuntime; +import org.glassfish.embeddable.web.HttpsListener; +import org.glassfish.embeddable.web.WebContainer; +import org.glassfish.embeddable.web.config.SslConfig; +import org.glassfish.embeddable.web.config.WebContainerConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddListenerDefaultVSTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddListenerDefaultVSTest.java index d8e1d642773..d131633e5d6 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddListenerDefaultVSTest.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddListenerDefaultVSTest.java @@ -17,16 +17,22 @@ package org.glassfish.tests.embedded.web; +import jakarta.servlet.ServletRegistration; + import java.io.BufferedReader; -import java.io.InputStreamReader; import java.io.File; +import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; import java.util.logging.Level; -import jakarta.servlet.ServletRegistration; -import org.glassfish.embeddable.*; -import org.glassfish.embeddable.web.*; -import org.glassfish.embeddable.web.config.*; + +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.GlassFishRuntime; +import org.glassfish.embeddable.web.Context; +import org.glassfish.embeddable.web.VirtualServer; +import org.glassfish.embeddable.web.WebContainer; +import org.glassfish.embeddable.web.config.WebContainerConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletAndFilterByClassNameTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletAndFilterByClassNameTest.java index 27a5215106f..b6b72d5d365 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletAndFilterByClassNameTest.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletAndFilterByClassNameTest.java @@ -17,19 +17,25 @@ package org.glassfish.tests.embedded.web; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.FilterRegistration; +import jakarta.servlet.ServletRegistration; + import java.io.BufferedReader; -import java.io.InputStreamReader; import java.io.File; +import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; -import java.util.logging.Level; import java.util.EnumSet; -import jakarta.servlet.FilterRegistration; -import jakarta.servlet.DispatcherType; -import jakarta.servlet.ServletRegistration; -import org.glassfish.embeddable.*; -import org.glassfish.embeddable.web.*; -import org.glassfish.embeddable.web.config.*; +import java.util.logging.Level; + +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.GlassFishRuntime; +import org.glassfish.embeddable.web.Context; +import org.glassfish.embeddable.web.VirtualServer; +import org.glassfish.embeddable.web.WebContainer; +import org.glassfish.embeddable.web.config.WebContainerConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletAndFilterByClassTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletAndFilterByClassTest.java index 2f90768009a..a51c1d9907c 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletAndFilterByClassTest.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletAndFilterByClassTest.java @@ -17,21 +17,27 @@ package org.glassfish.tests.embedded.web; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterRegistration; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletRegistration; + import java.io.BufferedReader; -import java.io.InputStreamReader; import java.io.File; +import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; -import java.util.logging.Level; import java.util.EnumSet; -import jakarta.servlet.Filter; -import jakarta.servlet.FilterRegistration; -import jakarta.servlet.DispatcherType; -import jakarta.servlet.Servlet; -import jakarta.servlet.ServletRegistration; -import org.glassfish.embeddable.*; -import org.glassfish.embeddable.web.*; -import org.glassfish.embeddable.web.config.*; +import java.util.logging.Level; + +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.GlassFishRuntime; +import org.glassfish.embeddable.web.Context; +import org.glassfish.embeddable.web.VirtualServer; +import org.glassfish.embeddable.web.WebContainer; +import org.glassfish.embeddable.web.config.WebContainerConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -71,7 +77,7 @@ public void testEmbeddedAddServletDefaultVS() throws Exception { VirtualServer vs = embedded.getVirtualServer("server"); System.out.println("Default virtual server "+vs); - Context context = (Context) embedded.createContext(root); + Context context = embedded.createContext(root); ServletRegistration sr = context.addServlet("NewFilterServlet", (Class ) getClass().getClassLoader().loadClass( diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletDefaultVSTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletDefaultVSTest.java index 6165eb87352..58085d7f250 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletDefaultVSTest.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletDefaultVSTest.java @@ -17,16 +17,22 @@ package org.glassfish.tests.embedded.web; +import jakarta.servlet.ServletRegistration; + import java.io.BufferedReader; -import java.io.InputStreamReader; import java.io.File; +import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; import java.util.logging.Level; -import jakarta.servlet.ServletRegistration; -import org.glassfish.embeddable.*; -import org.glassfish.embeddable.web.*; -import org.glassfish.embeddable.web.config.*; + +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.GlassFishRuntime; +import org.glassfish.embeddable.web.Context; +import org.glassfish.embeddable.web.VirtualServer; +import org.glassfish.embeddable.web.WebContainer; +import org.glassfish.embeddable.web.config.WebContainerConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletTest.java index 4ba13964fb3..4aaba9b558b 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletTest.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddServletTest.java @@ -17,16 +17,25 @@ package org.glassfish.tests.embedded.web; +import jakarta.servlet.ServletRegistration; + import java.io.BufferedReader; -import java.io.InputStreamReader; import java.io.File; +import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; import java.util.logging.Level; -import jakarta.servlet.ServletRegistration; -import org.glassfish.embeddable.*; -import org.glassfish.embeddable.web.*; -import org.glassfish.embeddable.web.config.*; + +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.GlassFishRuntime; +import org.glassfish.embeddable.web.Context; +import org.glassfish.embeddable.web.HttpListener; +import org.glassfish.embeddable.web.VirtualServer; +import org.glassfish.embeddable.web.WebContainer; +import org.glassfish.embeddable.web.WebListener; +import org.glassfish.embeddable.web.config.VirtualServerConfig; +import org.glassfish.embeddable.web.config.WebContainerConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddWebListenerTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddWebListenerTest.java index c2e19e1c5af..b2be163cb0c 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddWebListenerTest.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedAddWebListenerTest.java @@ -20,15 +20,20 @@ import java.io.BufferedReader; import java.io.File; import java.io.InputStreamReader; -import java.net.URLConnection; import java.net.URL; - -import java.util.logging.Level; +import java.net.URLConnection; import java.util.ArrayList; import java.util.List; -import org.glassfish.embeddable.*; -import org.glassfish.embeddable.web.*; -import org.glassfish.embeddable.web.config.*; +import java.util.logging.Level; + +import org.glassfish.embeddable.Deployer; +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.GlassFishRuntime; +import org.glassfish.embeddable.web.HttpListener; +import org.glassfish.embeddable.web.WebContainer; +import org.glassfish.embeddable.web.WebListener; +import org.glassfish.embeddable.web.config.WebListenerConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedClassLoaderTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedClassLoaderTest.java index 1737b05e703..d6e49f9a5dc 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedClassLoaderTest.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedClassLoaderTest.java @@ -17,24 +17,28 @@ package org.glassfish.tests.embedded.web; -import static org.hamcrest.CoreMatchers.both; -import static org.hamcrest.CoreMatchers.containsString; - -import java.io.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.InputStreamReader; import java.net.URL; import java.net.URLClassLoader; import java.net.URLConnection; import java.util.logging.Level; -import org.glassfish.embeddable.*; -import org.glassfish.embeddable.web.*; -import org.glassfish.embeddable.web.config.*; +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.GlassFishRuntime; +import org.glassfish.embeddable.web.Context; +import org.glassfish.embeddable.web.WebContainer; +import org.glassfish.embeddable.web.config.WebContainerConfig; import org.hamcrest.MatcherAssert; - import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import static org.hamcrest.CoreMatchers.both; +import static org.hamcrest.CoreMatchers.containsString; + public class EmbeddedClassLoaderTest { static GlassFish glassfish; diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedCreateContextTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedCreateContextTest.java index b775b58d69b..4acd5cb7a6d 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedCreateContextTest.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedCreateContextTest.java @@ -18,13 +18,18 @@ package org.glassfish.tests.embedded.web; import java.io.BufferedReader; -import java.io.InputStreamReader; import java.io.File; +import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; import java.util.logging.Level; -import org.glassfish.embeddable.*; -import org.glassfish.embeddable.web.*; + +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.GlassFishRuntime; +import org.glassfish.embeddable.web.Context; +import org.glassfish.embeddable.web.HttpListener; +import org.glassfish.embeddable.web.WebContainer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedCreateServletAndFilterTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedCreateServletAndFilterTest.java index c893bfcbe08..f7c5bd67cd3 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedCreateServletAndFilterTest.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedCreateServletAndFilterTest.java @@ -17,19 +17,25 @@ package org.glassfish.tests.embedded.web; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.FilterRegistration; +import jakarta.servlet.ServletRegistration; + import java.io.BufferedReader; -import java.io.InputStreamReader; import java.io.File; +import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; -import java.util.logging.Level; import java.util.EnumSet; -import jakarta.servlet.FilterRegistration; -import jakarta.servlet.DispatcherType; -import jakarta.servlet.ServletRegistration; -import org.glassfish.embeddable.*; -import org.glassfish.embeddable.web.*; -import org.glassfish.embeddable.web.config.*; +import java.util.logging.Level; + +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.GlassFishRuntime; +import org.glassfish.embeddable.web.Context; +import org.glassfish.embeddable.web.VirtualServer; +import org.glassfish.embeddable.web.WebContainer; +import org.glassfish.embeddable.web.config.WebContainerConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedCreateVirtualServerTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedCreateVirtualServerTest.java index 700487ee560..855c9a440c2 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedCreateVirtualServerTest.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedCreateVirtualServerTest.java @@ -18,16 +18,23 @@ package org.glassfish.tests.embedded.web; import java.io.BufferedReader; -import java.io.InputStreamReader; import java.io.File; +import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; -import java.util.logging.Level; import java.util.ArrayList; import java.util.List; -import org.glassfish.embeddable.*; -import org.glassfish.embeddable.web.*; -import org.glassfish.embeddable.web.config.*; +import java.util.logging.Level; + +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.GlassFishRuntime; +import org.glassfish.embeddable.web.Context; +import org.glassfish.embeddable.web.HttpListener; +import org.glassfish.embeddable.web.VirtualServer; +import org.glassfish.embeddable.web.WebContainer; +import org.glassfish.embeddable.web.WebListener; +import org.glassfish.embeddable.web.config.VirtualServerConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedGetContextsTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedGetContextsTest.java index 269e0685406..350e699472f 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedGetContextsTest.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedGetContextsTest.java @@ -18,15 +18,23 @@ package org.glassfish.tests.embedded.web; import java.io.BufferedReader; -import java.io.InputStreamReader; import java.io.File; +import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; -import java.util.logging.Level; import java.util.ArrayList; import java.util.List; -import org.glassfish.embeddable.*; -import org.glassfish.embeddable.web.*; +import java.util.logging.Level; + +import org.glassfish.embeddable.Deployer; +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.GlassFishRuntime; +import org.glassfish.embeddable.web.Context; +import org.glassfish.embeddable.web.HttpListener; +import org.glassfish.embeddable.web.VirtualServer; +import org.glassfish.embeddable.web.WebContainer; +import org.glassfish.embeddable.web.WebListener; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedJSPTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedJSPTest.java index 839d7cc73e7..13702eff916 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedJSPTest.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedJSPTest.java @@ -18,7 +18,12 @@ package org.glassfish.tests.embedded.web; import java.io.File; -import org.glassfish.embeddable.*; + +import org.glassfish.embeddable.Deployer; +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.GlassFishProperties; +import org.glassfish.embeddable.GlassFishRuntime; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedRedeployTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedRedeployTest.java index addcf453c8a..7e44d6af233 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedRedeployTest.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedRedeployTest.java @@ -18,14 +18,19 @@ package org.glassfish.tests.embedded.web; import java.io.BufferedReader; -import java.io.InputStreamReader; import java.io.File; +import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; import java.util.logging.Level; -import org.glassfish.embeddable.*; -import org.glassfish.embeddable.web.*; -import org.glassfish.embeddable.web.config.*; + +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.GlassFishRuntime; +import org.glassfish.embeddable.web.Context; +import org.glassfish.embeddable.web.VirtualServer; +import org.glassfish.embeddable.web.WebContainer; +import org.glassfish.embeddable.web.config.WebContainerConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedRemoveContextTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedRemoveContextTest.java index 1b059a9c9a9..25766b3e296 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedRemoveContextTest.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedRemoveContextTest.java @@ -18,14 +18,19 @@ package org.glassfish.tests.embedded.web; import java.io.BufferedReader; -import java.io.InputStreamReader; import java.io.File; +import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; import java.util.logging.Level; -import org.glassfish.embeddable.*; -import org.glassfish.embeddable.web.*; -import org.glassfish.embeddable.web.config.*; + +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.GlassFishRuntime; +import org.glassfish.embeddable.web.Context; +import org.glassfish.embeddable.web.VirtualServer; +import org.glassfish.embeddable.web.WebContainer; +import org.glassfish.embeddable.web.config.WebContainerConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedRestartTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedRestartTest.java index edd2f2fd1f6..474cb9ddefc 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedRestartTest.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedRestartTest.java @@ -18,11 +18,16 @@ package org.glassfish.tests.embedded.web; import java.io.BufferedReader; -import java.io.InputStreamReader; import java.io.File; +import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; -import org.glassfish.embeddable.*; + +import org.glassfish.embeddable.Deployer; +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.GlassFishProperties; +import org.glassfish.embeddable.GlassFishRuntime; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetConfigurationTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetConfigurationTest.java index 7fcf7f815a1..177748d0282 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetConfigurationTest.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetConfigurationTest.java @@ -18,14 +18,18 @@ package org.glassfish.tests.embedded.web; import java.io.BufferedReader; -import java.io.InputStreamReader; import java.io.File; +import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; import java.util.logging.Level; -import org.glassfish.embeddable.*; -import org.glassfish.embeddable.web.*; -import org.glassfish.embeddable.web.config.*; + +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.GlassFishRuntime; +import org.glassfish.embeddable.web.Context; +import org.glassfish.embeddable.web.WebContainer; +import org.glassfish.embeddable.web.config.WebContainerConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetDefaultWebXmlTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetDefaultWebXmlTest.java index 13f068c520f..f3d82faccea 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetDefaultWebXmlTest.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetDefaultWebXmlTest.java @@ -18,14 +18,18 @@ package org.glassfish.tests.embedded.web; import java.io.BufferedReader; -import java.io.InputStreamReader; import java.io.File; +import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; import java.util.logging.Level; -import org.glassfish.embeddable.*; -import org.glassfish.embeddable.web.*; -import org.glassfish.embeddable.web.config.*; + +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.GlassFishRuntime; +import org.glassfish.embeddable.web.Context; +import org.glassfish.embeddable.web.WebContainer; +import org.glassfish.embeddable.web.config.WebContainerConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetDocRootTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetDocRootTest.java index 0a1f5249671..d31968033a9 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetDocRootTest.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetDocRootTest.java @@ -18,14 +18,20 @@ package org.glassfish.tests.embedded.web; import java.io.BufferedReader; -import java.io.InputStreamReader; import java.io.File; +import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; import java.util.logging.Level; -import org.glassfish.embeddable.*; -import org.glassfish.embeddable.web.*; -import org.glassfish.embeddable.web.config.*; + +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.GlassFishRuntime; +import org.glassfish.embeddable.web.Context; +import org.glassfish.embeddable.web.VirtualServer; +import org.glassfish.embeddable.web.WebContainer; +import org.glassfish.embeddable.web.config.VirtualServerConfig; +import org.glassfish.embeddable.web.config.WebContainerConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetSecurityTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetSecurityTest.java index 0896614d2d0..d368b9f3d50 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetSecurityTest.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedSetSecurityTest.java @@ -18,12 +18,22 @@ package org.glassfish.tests.embedded.web; import java.io.File; -import java.util.logging.Level; import java.util.HashSet; import java.util.Set; -import org.glassfish.embeddable.*; -import org.glassfish.embeddable.web.*; -import org.glassfish.embeddable.web.config.*; +import java.util.logging.Level; + +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.GlassFishRuntime; +import org.glassfish.embeddable.web.Context; +import org.glassfish.embeddable.web.WebContainer; +import org.glassfish.embeddable.web.config.AuthMethod; +import org.glassfish.embeddable.web.config.FormLoginConfig; +import org.glassfish.embeddable.web.config.LoginConfig; +import org.glassfish.embeddable.web.config.SecurityConfig; +import org.glassfish.embeddable.web.config.SecurityConstraint; +import org.glassfish.embeddable.web.config.WebContainerConfig; +import org.glassfish.embeddable.web.config.WebResourceCollection; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedVirtualServerHostNameTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedVirtualServerHostNameTest.java index fff5384e3aa..0d1f2d982b3 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedVirtualServerHostNameTest.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedVirtualServerHostNameTest.java @@ -18,13 +18,19 @@ package org.glassfish.tests.embedded.web; import java.io.BufferedReader; -import java.io.InputStreamReader; import java.io.File; +import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; -import org.glassfish.embeddable.*; -import org.glassfish.embeddable.web.*; -import org.glassfish.embeddable.web.config.*; + +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.GlassFishProperties; +import org.glassfish.embeddable.GlassFishRuntime; +import org.glassfish.embeddable.web.Context; +import org.glassfish.embeddable.web.VirtualServer; +import org.glassfish.embeddable.web.WebContainer; +import org.glassfish.embeddable.web.config.VirtualServerConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedWebAPIDefaultStartTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedWebAPIDefaultStartTest.java index b6b3a962f0f..553881d8cda 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedWebAPIDefaultStartTest.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedWebAPIDefaultStartTest.java @@ -18,15 +18,21 @@ package org.glassfish.tests.embedded.web; import java.io.BufferedReader; -import java.io.InputStreamReader; import java.io.File; -import java.util.logging.Level; -import java.util.ArrayList; -import java.util.List; +import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; -import org.glassfish.embeddable.*; -import org.glassfish.embeddable.web.*; +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; + +import org.glassfish.embeddable.Deployer; +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.GlassFishRuntime; +import org.glassfish.embeddable.web.HttpListener; +import org.glassfish.embeddable.web.WebContainer; +import org.glassfish.embeddable.web.WebListener; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedWebAPITest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedWebAPITest.java index 195b91c59c4..3d953bdc958 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedWebAPITest.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedWebAPITest.java @@ -18,16 +18,23 @@ package org.glassfish.tests.embedded.web; import java.io.BufferedReader; -import java.io.InputStreamReader; import java.io.File; +import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; -import java.util.logging.Level; import java.util.ArrayList; import java.util.List; -import org.glassfish.embeddable.*; -import org.glassfish.embeddable.web.*; -import org.glassfish.embeddable.web.config.*; +import java.util.logging.Level; + +import org.glassfish.embeddable.Deployer; +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.GlassFishRuntime; +import org.glassfish.embeddable.web.HttpListener; +import org.glassfish.embeddable.web.VirtualServer; +import org.glassfish.embeddable.web.WebContainer; +import org.glassfish.embeddable.web.WebListener; +import org.glassfish.embeddable.web.config.VirtualServerConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedWebTest.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedWebTest.java index 25420086ff4..18666e77e5c 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedWebTest.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/EmbeddedWebTest.java @@ -18,15 +18,22 @@ package org.glassfish.tests.embedded.web; import java.io.BufferedReader; -import java.io.InputStreamReader; import java.io.File; +import java.io.InputStreamReader; import java.net.URL; import java.net.URLConnection; -import java.util.logging.Level; import java.util.ArrayList; -import org.glassfish.embeddable.*; -import org.glassfish.embeddable.web.*; -import org.glassfish.embeddable.web.config.*; +import java.util.logging.Level; + +import org.glassfish.embeddable.GlassFish; +import org.glassfish.embeddable.GlassFishException; +import org.glassfish.embeddable.GlassFishRuntime; +import org.glassfish.embeddable.web.Context; +import org.glassfish.embeddable.web.HttpListener; +import org.glassfish.embeddable.web.VirtualServer; +import org.glassfish.embeddable.web.WebContainer; +import org.glassfish.embeddable.web.WebListener; +import org.glassfish.embeddable.web.config.WebContainerConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/MyServlet.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/MyServlet.java index d6819ef6fee..9f1a87342f7 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/MyServlet.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/MyServlet.java @@ -16,10 +16,13 @@ package org.glassfish.tests.embedded.web; -import java.io.*; -import java.util.*; -import jakarta.servlet.*; -import jakarta.servlet.http.*; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServlet; + +import java.io.IOException; +import java.io.PrintWriter; public class MyServlet extends HttpServlet { diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/MyServletContextListener.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/MyServletContextListener.java index 9da78b7964e..6ead67ad629 100755 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/MyServletContextListener.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/MyServletContextListener.java @@ -16,9 +16,8 @@ package org.glassfish.tests.embedded.web; -import java.io.*; -import java.util.*; -import jakarta.servlet.*; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; public class MyServletContextListener implements ServletContextListener { diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/NewFilter.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/NewFilter.java index 23df3fd65ba..5c7f74550d7 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/NewFilter.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/NewFilter.java @@ -16,8 +16,14 @@ package org.glassfish.tests.embedded.web; -import java.io.*; -import jakarta.servlet.*; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; + +import java.io.IOException; public class NewFilter implements Filter { diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/NewFilterServlet.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/NewFilterServlet.java index ec1ecd375fd..499205f49d7 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/NewFilterServlet.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/NewFilterServlet.java @@ -16,10 +16,12 @@ package org.glassfish.tests.embedded.web; -import java.io.*; -import java.util.*; -import jakarta.servlet.*; -import jakarta.servlet.http.*; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServlet; + +import java.io.IOException; public class NewFilterServlet extends HttpServlet { diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/NewServlet.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/NewServlet.java index a9d372ccff3..dd0735817e0 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/NewServlet.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/NewServlet.java @@ -16,9 +16,13 @@ package org.glassfish.tests.embedded.web; -import java.io.*; -import jakarta.servlet.*; -import jakarta.servlet.http.*; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +import java.io.IOException; +import java.io.PrintWriter; //@WebServlet(urlPatterns={"/new"}) public class NewServlet extends HttpServlet { diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/NewServletRequestListener.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/NewServletRequestListener.java index 1fdd3dcf702..c5304cf4298 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/NewServletRequestListener.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/NewServletRequestListener.java @@ -16,8 +16,8 @@ package org.glassfish.tests.embedded.web; -import java.io.*; -import jakarta.servlet.*; +import jakarta.servlet.ServletRequestEvent; +import jakarta.servlet.ServletRequestListener; public class NewServletRequestListener implements ServletRequestListener { diff --git a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/WebHello.java b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/WebHello.java index ac61e8f0186..fec7ad04bf5 100644 --- a/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/WebHello.java +++ b/appserver/tests/embedded/web/web-api/src/test/java/org/glassfish/tests/embedded/web/WebHello.java @@ -16,11 +16,14 @@ package org.glassfish.tests.embedded.web; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; import java.io.PrintWriter; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.*; -import jakarta.servlet.http.*; @WebServlet(urlPatterns={"/hello"}) public class WebHello extends HttpServlet { diff --git a/appserver/tests/tck/cdi/cdi-full/src/test/java/org/jboss/weld/tck/glassfish/GlassFishBeansImpl.java b/appserver/tests/tck/cdi/cdi-full/src/test/java/org/jboss/weld/tck/glassfish/GlassFishBeansImpl.java index bf419df51f4..93e858059d0 100644 --- a/appserver/tests/tck/cdi/cdi-full/src/test/java/org/jboss/weld/tck/glassfish/GlassFishBeansImpl.java +++ b/appserver/tests/tck/cdi/cdi-full/src/test/java/org/jboss/weld/tck/glassfish/GlassFishBeansImpl.java @@ -18,6 +18,7 @@ import java.io.IOException; import java.util.Arrays; + import org.jboss.cdi.tck.spi.Beans; /** diff --git a/appserver/tests/tck/cdi/cdi-full/src/test/java/org/jboss/weld/tck/glassfish/GlassFishDeploymentExceptionTransformer.java b/appserver/tests/tck/cdi/cdi-full/src/test/java/org/jboss/weld/tck/glassfish/GlassFishDeploymentExceptionTransformer.java index d0982342390..12b7b1150cf 100644 --- a/appserver/tests/tck/cdi/cdi-full/src/test/java/org/jboss/weld/tck/glassfish/GlassFishDeploymentExceptionTransformer.java +++ b/appserver/tests/tck/cdi/cdi-full/src/test/java/org/jboss/weld/tck/glassfish/GlassFishDeploymentExceptionTransformer.java @@ -17,14 +17,14 @@ package org.jboss.weld.tck.glassfish; +import jakarta.enterprise.inject.spi.DefinitionException; +import jakarta.enterprise.inject.spi.DeploymentException; + import java.util.List; import org.apache.commons.lang.exception.ExceptionUtils; import org.jboss.arquillian.container.spi.client.container.DeploymentExceptionTransformer; -import jakarta.enterprise.inject.spi.DefinitionException; -import jakarta.enterprise.inject.spi.DeploymentException; - /** * * See AS7-1197 for more details. diff --git a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/lib/harness/EETest.java b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/lib/harness/EETest.java index 4f5b6b2b38a..eedcc311d3e 100644 --- a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/lib/harness/EETest.java +++ b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/lib/harness/EETest.java @@ -16,6 +16,8 @@ package com.sun.ts.lib.harness; +import com.sun.ts.lib.util.TestUtil; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -32,9 +34,6 @@ import java.util.Properties; import java.util.Vector; -import com.sun.javatest.Status; -import com.sun.ts.lib.util.TestUtil; - /** * This abstract class must be extended by all clients of all J2EE-TS tests. All implementations of this class must define a * setup, cleanup, and runtest(method names of runtest methods must match the 'testname' tag. EETest uses reflection to invoke diff --git a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/lib/harness/ServiceEETest.java b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/lib/harness/ServiceEETest.java index d9a33118be4..f6ce3e4d6d1 100644 --- a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/lib/harness/ServiceEETest.java +++ b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/lib/harness/ServiceEETest.java @@ -17,6 +17,10 @@ package com.sun.ts.lib.harness; +import com.sun.ts.lib.util.TestUtil; +import com.sun.ts.tests.common.vehicle.VehicleRunnable; +import com.sun.ts.tests.common.vehicle.VehicleRunnerFactory; + import java.io.PrintStream; import java.io.PrintWriter; import java.util.Arrays; @@ -25,11 +29,6 @@ import java.util.StringTokenizer; import java.util.Vector; -import com.sun.javatest.Status; -import com.sun.ts.lib.util.TestUtil; -import com.sun.ts.tests.common.vehicle.VehicleRunnable; -import com.sun.ts.tests.common.vehicle.VehicleRunnerFactory; - /** * This abstract class must be extended by all clients of tests of J2EE service apis; for example, * JDBC, RMI-IIOP, JavaMail, JMS, etc. When a service test is encountered by the JavaTest Client, diff --git a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/EmptyVehicleRunner.java b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/EmptyVehicleRunner.java index 7403a78993e..e0501d97363 100644 --- a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/EmptyVehicleRunner.java +++ b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/EmptyVehicleRunner.java @@ -20,12 +20,11 @@ package com.sun.ts.tests.common.vehicle; -import java.util.Properties; - -import com.sun.javatest.Status; import com.sun.ts.lib.harness.ServiceEETest; import com.sun.ts.lib.util.TestUtil; +import java.util.Properties; + public class EmptyVehicleRunner implements VehicleRunnable { @Override diff --git a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/VehicleRunnable.java b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/VehicleRunnable.java index a22a39b2963..ac5b18e98ee 100644 --- a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/VehicleRunnable.java +++ b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/VehicleRunnable.java @@ -22,8 +22,6 @@ import java.util.Properties; -import com.sun.javatest.Status; - public interface VehicleRunnable { Status run(String[] argv, Properties properties); } diff --git a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/ejbembed/EJBEmbedRunner.java b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/ejbembed/EJBEmbedRunner.java index 3d78ad52c30..3106523d110 100644 --- a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/ejbembed/EJBEmbedRunner.java +++ b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/ejbembed/EJBEmbedRunner.java @@ -20,7 +20,12 @@ package com.sun.ts.tests.common.vehicle.ejbembed; -import static com.sun.ts.tests.common.vehicle.ejbliteshare.EJBLiteClientIF.TEST_PASSED; +import com.sun.ts.lib.util.TestUtil; +import com.sun.ts.tests.common.vehicle.VehicleRunnable; +import com.sun.ts.tests.common.vehicle.ejbliteshare.EJBLiteClientIF; +import com.sun.ts.tests.common.vehicle.ejbliteshare.ReasonableStatus; + +import jakarta.ejb.embeddable.EJBContainer; import java.io.File; import java.util.ArrayList; @@ -29,13 +34,7 @@ import java.util.Properties; import java.util.logging.Logger; -import com.sun.javatest.Status; -import com.sun.ts.lib.util.TestUtil; -import com.sun.ts.tests.common.vehicle.VehicleRunnable; -import com.sun.ts.tests.common.vehicle.ejbliteshare.EJBLiteClientIF; -import com.sun.ts.tests.common.vehicle.ejbliteshare.ReasonableStatus; - -import jakarta.ejb.embeddable.EJBContainer; +import static com.sun.ts.tests.common.vehicle.ejbliteshare.EJBLiteClientIF.TEST_PASSED; public class EJBEmbedRunner implements VehicleRunnable { diff --git a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/ejbembed/InjectionResolver.java b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/ejbembed/InjectionResolver.java index aee5cc67b77..f1773b17b87 100644 --- a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/ejbembed/InjectionResolver.java +++ b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/ejbembed/InjectionResolver.java @@ -19,13 +19,6 @@ */ package com.sun.ts.tests.common.vehicle.ejbembed; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Logger; - import com.sun.ts.tests.common.vehicle.ejbliteshare.EJBLiteClientIF; import jakarta.annotation.PostConstruct; @@ -33,6 +26,13 @@ import jakarta.ejb.EJBs; import jakarta.ejb.embeddable.EJBContainer; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Logger; + /** * Since JavaEE annotations are not required in ejb embeddable usage, this class * helps resolving @EJB and @PostConstruct in client classes when tests are diff --git a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/ejbliteshare/EJBLiteClientIF.java b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/ejbliteshare/EJBLiteClientIF.java index 3fcf2c3040d..8402aa302ad 100644 --- a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/ejbliteshare/EJBLiteClientIF.java +++ b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/ejbliteshare/EJBLiteClientIF.java @@ -20,11 +20,11 @@ package com.sun.ts.tests.common.vehicle.ejbliteshare; +import jakarta.ejb.embeddable.EJBContainer; + import java.io.File; import java.util.Map; -import jakarta.ejb.embeddable.EJBContainer; - public interface EJBLiteClientIF { public static final String TEST_PASSED = "[TEST PASSED] "; diff --git a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/ejbliteshare/EJBLiteSecuredWebVehicleRunner.java b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/ejbliteshare/EJBLiteSecuredWebVehicleRunner.java index 0f6602b5f3a..84f6d74cce3 100644 --- a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/ejbliteshare/EJBLiteSecuredWebVehicleRunner.java +++ b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/ejbliteshare/EJBLiteSecuredWebVehicleRunner.java @@ -16,7 +16,10 @@ package com.sun.ts.tests.common.vehicle.ejbliteshare; -import static com.sun.ts.tests.common.vehicle.ejbliteshare.EJBLiteClientIF.TEST_PASSED; +import com.sun.ts.lib.porting.TSURL; +import com.sun.ts.lib.util.BASE64Encoder; +import com.sun.ts.lib.util.TestUtil; +import com.sun.ts.tests.common.vehicle.VehicleRunnable; import java.io.IOException; import java.net.HttpURLConnection; @@ -24,11 +27,7 @@ import java.util.Properties; import java.util.logging.Logger; -import com.sun.javatest.Status; -import com.sun.ts.lib.porting.TSURL; -import com.sun.ts.lib.util.BASE64Encoder; -import com.sun.ts.lib.util.TestUtil; -import com.sun.ts.tests.common.vehicle.VehicleRunnable; +import static com.sun.ts.tests.common.vehicle.ejbliteshare.EJBLiteClientIF.TEST_PASSED; public class EJBLiteSecuredWebVehicleRunner implements VehicleRunnable { private final static Logger logger = Logger.getLogger(EJBLiteSecuredWebVehicleRunner.class.getName()); diff --git a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/ejbliteshare/EJBLiteWebVehicleRunner.java b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/ejbliteshare/EJBLiteWebVehicleRunner.java index 094b9582e92..e298fb24600 100644 --- a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/ejbliteshare/EJBLiteWebVehicleRunner.java +++ b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/common/vehicle/ejbliteshare/EJBLiteWebVehicleRunner.java @@ -19,9 +19,9 @@ */ package com.sun.ts.tests.common.vehicle.ejbliteshare; -import static com.sun.javatest.Status.FAILED; -import static com.sun.javatest.Status.PASSED; -import static com.sun.ts.tests.common.vehicle.ejbliteshare.EJBLiteClientIF.TEST_PASSED; +import com.sun.ts.lib.porting.TSURL; +import com.sun.ts.lib.util.TestUtil; +import com.sun.ts.tests.common.vehicle.VehicleRunnable; import java.io.IOException; import java.net.HttpURLConnection; @@ -29,10 +29,9 @@ import java.util.Properties; import java.util.logging.Logger; -import com.sun.javatest.Status; -import com.sun.ts.lib.porting.TSURL; -import com.sun.ts.lib.util.TestUtil; -import com.sun.ts.tests.common.vehicle.VehicleRunnable; +import static com.sun.javatest.Status.FAILED; +import static com.sun.javatest.Status.PASSED; +import static com.sun.ts.tests.common.vehicle.ejbliteshare.EJBLiteClientIF.TEST_PASSED; public class EJBLiteWebVehicleRunner implements VehicleRunnable { diff --git a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/ejb30/common/helper/Helper.java b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/ejb30/common/helper/Helper.java index ccc3dd637ab..f821444553d 100644 --- a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/ejb30/common/helper/Helper.java +++ b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/ejb30/common/helper/Helper.java @@ -19,13 +19,13 @@ */ package com.sun.ts.tests.ejb30.common.helper; -import static com.sun.ts.lib.util.TestUtil.NEW_LINE; - import java.util.Arrays; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; +import static com.sun.ts.lib.util.TestUtil.NEW_LINE; + public final class Helper { private static Logger logger = Logger.getLogger("com.sun.ts.tests.ejb30"); diff --git a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/ejb30/common/lite/EJBLiteClientBase.java b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/ejb30/common/lite/EJBLiteClientBase.java index e5fe53069f0..3558d3781e1 100644 --- a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/ejb30/common/lite/EJBLiteClientBase.java +++ b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/ejb30/common/lite/EJBLiteClientBase.java @@ -19,6 +19,14 @@ */ package com.sun.ts.tests.ejb30.common.lite; +import com.sun.ts.lib.harness.ServiceEETest; +import com.sun.ts.lib.util.TestUtil; +import com.sun.ts.tests.common.vehicle.ejbliteshare.EJBLiteClientIF; +import com.sun.ts.tests.ejb30.common.helper.Helper; + +import jakarta.ejb.EJBException; +import jakarta.ejb.embeddable.EJBContainer; + import java.io.File; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -28,14 +36,6 @@ import javax.naming.NamingException; -import com.sun.ts.lib.harness.ServiceEETest; -import com.sun.ts.lib.util.TestUtil; -import com.sun.ts.tests.common.vehicle.ejbliteshare.EJBLiteClientIF; -import com.sun.ts.tests.ejb30.common.helper.Helper; - -import jakarta.ejb.EJBException; -import jakarta.ejb.embeddable.EJBContainer; - public class EJBLiteClientBase extends ServiceEETest implements EJBLiteClientIF { diff --git a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/ejb30/lite/basic/common/BasicBeanHelper.java b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/ejb30/lite/basic/common/BasicBeanHelper.java index f21fce1a622..97da0851395 100644 --- a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/ejb30/lite/basic/common/BasicBeanHelper.java +++ b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/ejb30/lite/basic/common/BasicBeanHelper.java @@ -19,17 +19,17 @@ */ package com.sun.ts.tests.ejb30.lite.basic.common; -import static com.sun.ts.tests.ejb30.lite.basic.common.GlobalJNDITest.getAppJNDIName; -import static com.sun.ts.tests.ejb30.lite.basic.common.GlobalJNDITest.getGlobalJNDIName; -import static com.sun.ts.tests.ejb30.lite.basic.common.GlobalJNDITest.getModuleJNDIName; - -import javax.naming.Context; - import com.sun.ts.tests.ejb30.common.helper.Helper; import com.sun.ts.tests.ejb30.common.helper.ServiceLocator; import jakarta.ejb.EJBContext; +import javax.naming.Context; + +import static com.sun.ts.tests.ejb30.lite.basic.common.GlobalJNDITest.getAppJNDIName; +import static com.sun.ts.tests.ejb30.lite.basic.common.GlobalJNDITest.getGlobalJNDIName; +import static com.sun.ts.tests.ejb30.lite.basic.common.GlobalJNDITest.getModuleJNDIName; + public class BasicBeanHelper { private static int x = -2; diff --git a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/ejb30/lite/basic/common/GlobalJNDITest.java b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/ejb30/lite/basic/common/GlobalJNDITest.java index 0be12e64306..f695c8e6014 100644 --- a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/ejb30/lite/basic/common/GlobalJNDITest.java +++ b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/ejb30/lite/basic/common/GlobalJNDITest.java @@ -20,10 +20,10 @@ package com.sun.ts.tests.ejb30.lite.basic.common; -import java.util.logging.Level; - import com.sun.ts.tests.ejb30.common.helper.Helper; +import java.util.logging.Level; + public class GlobalJNDITest { private GlobalJNDITest() { diff --git a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/ejb30/lite/basic/singleton/HttpServletDelegate.java b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/ejb30/lite/basic/singleton/HttpServletDelegate.java index fd3f4037c5a..9fcb95b7ae9 100644 --- a/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/ejb30/lite/basic/singleton/HttpServletDelegate.java +++ b/appserver/tests/tck/embedded_ejb_smoke/ejb_lite_basic/src/main/java/com/sun/ts/tests/ejb30/lite/basic/singleton/HttpServletDelegate.java @@ -16,14 +16,14 @@ package com.sun.ts.tests.ejb30.lite.basic.singleton; -import java.io.IOException; -import java.util.logging.Logger; - import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.logging.Logger; + public class HttpServletDelegate extends HttpServlet { private static Logger logger = Logger.getLogger(HttpServletDelegate.class.getName()); diff --git a/appserver/tests/tck/embedded_ejb_smoke/runner/src/test/java/com/sun/ts/run/EmbeddedRunnerITest.java b/appserver/tests/tck/embedded_ejb_smoke/runner/src/test/java/com/sun/ts/run/EmbeddedRunnerITest.java index b79b16ac05a..9904650d8da 100644 --- a/appserver/tests/tck/embedded_ejb_smoke/runner/src/test/java/com/sun/ts/run/EmbeddedRunnerITest.java +++ b/appserver/tests/tck/embedded_ejb_smoke/runner/src/test/java/com/sun/ts/run/EmbeddedRunnerITest.java @@ -15,7 +15,6 @@ */ package com.sun.ts.run; -import com.sun.javatest.Status; import com.sun.ts.lib.harness.ExecTSTestCmd; import java.io.IOException; diff --git a/appserver/tests/tck/expression_language/src/test/java/com/sun/ts/run/StandaloneRunnerITest.java b/appserver/tests/tck/expression_language/src/test/java/com/sun/ts/run/StandaloneRunnerITest.java index 80e6c2f68ce..f308aea1ab5 100644 --- a/appserver/tests/tck/expression_language/src/test/java/com/sun/ts/run/StandaloneRunnerITest.java +++ b/appserver/tests/tck/expression_language/src/test/java/com/sun/ts/run/StandaloneRunnerITest.java @@ -15,11 +15,7 @@ */ package com.sun.ts.run; -import static java.lang.String.join; -import static java.lang.System.getProperty; -import static java.nio.file.Files.writeString; -import static java.nio.file.Paths.get; -import static org.junit.jupiter.api.Assertions.fail; +import com.sun.ts.lib.harness.ExecTSTestCmd; import java.io.IOException; import java.io.OutputStreamWriter; @@ -29,8 +25,11 @@ import org.junit.jupiter.api.Test; -import com.sun.javatest.Status; -import com.sun.ts.lib.harness.ExecTSTestCmd; +import static java.lang.String.join; +import static java.lang.System.getProperty; +import static java.nio.file.Files.writeString; +import static java.nio.file.Paths.get; +import static org.junit.jupiter.api.Assertions.fail; public class StandaloneRunnerITest { diff --git a/appserver/tests/tck/microprofile/config/src/main/java/org/glassfish/microprofile/config/tck/ConfigArquillianExtension.java b/appserver/tests/tck/microprofile/config/src/main/java/org/glassfish/microprofile/config/tck/ConfigArquillianExtension.java index 9d0745927b8..6fb6187760c 100644 --- a/appserver/tests/tck/microprofile/config/src/main/java/org/glassfish/microprofile/config/tck/ConfigArquillianExtension.java +++ b/appserver/tests/tck/microprofile/config/src/main/java/org/glassfish/microprofile/config/tck/ConfigArquillianExtension.java @@ -15,6 +15,8 @@ */ package org.glassfish.microprofile.config.tck; +import java.util.logging.Logger; + import org.glassfish.microprofile.config.tck.client.BeansXmlTransformer; import org.glassfish.microprofile.config.tck.client.ConfigDeploymentExceptionTransformer; import org.glassfish.microprofile.config.tck.client.LibraryIncluder; @@ -22,8 +24,6 @@ import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor; import org.jboss.arquillian.core.spi.LoadableExtension; -import java.util.logging.Logger; - public class ConfigArquillianExtension implements LoadableExtension { private static final Logger LOGGER = Logger.getLogger(ConfigArquillianExtension.class.getName()); diff --git a/appserver/tests/tck/microprofile/config/src/main/java/org/glassfish/microprofile/config/tck/client/BeansXmlTransformer.java b/appserver/tests/tck/microprofile/config/src/main/java/org/glassfish/microprofile/config/tck/client/BeansXmlTransformer.java index 936659cd86f..fe6662f402a 100644 --- a/appserver/tests/tck/microprofile/config/src/main/java/org/glassfish/microprofile/config/tck/client/BeansXmlTransformer.java +++ b/appserver/tests/tck/microprofile/config/src/main/java/org/glassfish/microprofile/config/tck/client/BeansXmlTransformer.java @@ -15,6 +15,11 @@ */ package org.glassfish.microprofile.config.tck.client; +import java.net.URL; +import java.util.Optional; +import java.util.function.Consumer; +import java.util.logging.Logger; + import org.jboss.arquillian.container.spi.event.container.BeforeDeploy; import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor; import org.jboss.arquillian.core.api.annotation.Observes; @@ -25,11 +30,6 @@ import org.jboss.shrinkwrap.api.asset.ArchiveAsset; import org.jboss.shrinkwrap.api.asset.UrlAsset; -import java.net.URL; -import java.util.Optional; -import java.util.function.Consumer; -import java.util.logging.Logger; - import static java.lang.String.format; /** diff --git a/appserver/tests/tck/microprofile/config/src/main/java/org/glassfish/microprofile/config/tck/client/ConfigDeploymentExceptionTransformer.java b/appserver/tests/tck/microprofile/config/src/main/java/org/glassfish/microprofile/config/tck/client/ConfigDeploymentExceptionTransformer.java index a374d88d153..852af88ee04 100644 --- a/appserver/tests/tck/microprofile/config/src/main/java/org/glassfish/microprofile/config/tck/client/ConfigDeploymentExceptionTransformer.java +++ b/appserver/tests/tck/microprofile/config/src/main/java/org/glassfish/microprofile/config/tck/client/ConfigDeploymentExceptionTransformer.java @@ -16,6 +16,7 @@ package org.glassfish.microprofile.config.tck.client; import jakarta.enterprise.inject.spi.DeploymentException; + import org.jboss.arquillian.container.spi.client.container.DeploymentExceptionTransformer; /** diff --git a/appserver/tests/tck/platform-tck-runner/src/main/java/org/glassfish/main/tests/tck/ant/xml/JUnitResultsParser.java b/appserver/tests/tck/platform-tck-runner/src/main/java/org/glassfish/main/tests/tck/ant/xml/JUnitResultsParser.java index 59049f16ca9..36ab9ca01e4 100644 --- a/appserver/tests/tck/platform-tck-runner/src/main/java/org/glassfish/main/tests/tck/ant/xml/JUnitResultsParser.java +++ b/appserver/tests/tck/platform-tck-runner/src/main/java/org/glassfish/main/tests/tck/ant/xml/JUnitResultsParser.java @@ -21,6 +21,7 @@ import java.io.File; import java.io.FileInputStream; + import javax.xml.XMLConstants; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; diff --git a/appserver/tests/tck/rest_cdi/src/test/java/org/glassfish/tests/tck/rest/cdi/RestCdiIT.java b/appserver/tests/tck/rest_cdi/src/test/java/org/glassfish/tests/tck/rest/cdi/RestCdiIT.java index 73eca2e2ea3..0128125a40f 100644 --- a/appserver/tests/tck/rest_cdi/src/test/java/org/glassfish/tests/tck/rest/cdi/RestCdiIT.java +++ b/appserver/tests/tck/rest_cdi/src/test/java/org/glassfish/tests/tck/rest/cdi/RestCdiIT.java @@ -15,12 +15,8 @@ */ package org.glassfish.tests.tck.rest.cdi; -import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; -import static java.lang.System.getProperty; -import static java.util.logging.Level.INFO; -import static org.jboss.shrinkwrap.api.ShrinkWrap.create; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.Response; import java.io.File; import java.net.URI; @@ -36,8 +32,12 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import jakarta.ws.rs.client.ClientBuilder; -import jakarta.ws.rs.core.Response; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; +import static java.lang.System.getProperty; +import static java.util.logging.Level.INFO; +import static org.jboss.shrinkwrap.api.ShrinkWrap.create; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; @ExtendWith(ArquillianExtension.class) @RunAsClient public class RestCdiIT {