Skip to content

Merge from master to 8.0 + fixed nucleus/parent/pom.xml - #25060

Merged
dmatej merged 33 commits into
eclipse-ee4j:8.0from
dmatej:gf8
Jul 25, 2024
Merged

Merge from master to 8.0 + fixed nucleus/parent/pom.xml#25060
dmatej merged 33 commits into
eclipse-ee4j:8.0from
dmatej:gf8

Conversation

@dmatej

@dmatej dmatej commented Jul 24, 2024

Copy link
Copy Markdown
Contributor

The nucleus/parent/pom.xml merge was not committed in #25057

dmatej added 30 commits July 20, 2024 23:05
- It was referred just from two other constants which had to have the
  dependency on deployment-common
- JWS will be removed soon OR replaced by the Open Web Start

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- the sleep can be interrupted
- reproduced randomly on local machine
- shortened sleep time to 100 ms

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- Added missing logs (when some class was not available, it did not even log it)
- Removed e.printstacktrace when we already have logging or throw
- Added missing exception cause

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- When I broke some classes critical for startup, this was throwing NPE too

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- import order, wildchar imports removed
- final fields
- redundant modifiers, fixed order
- improved braces
- improved generics
- habitat renamed to locator
- using foreach were possible
- throwing exceptions with causes

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- Now it is injectable
- Simplified initialization of related classes

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- SSLImplementation is an interface and HK2 Contract, GlassfishSSLImpl
  implements it
- SecurityRoleMapperFactoryGen moved to core-ee where is the only usage of it
- SSLConfigurator - lookup removed; in all cases I have seen now works the
    locator variant, but I left the class loader variant here for now.
- JSSEImplementation was used just in tests
    -> moved there as JSSEImplementation4Tests
- SecureAdminConfigUpgrade - the comment was not true any more
- GlassfishServerSocketFactory now always uses locator

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- Changes based on directly used packages in the module
- I will do that with maven plugin later again.

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- we don't use JSSESupport instances and we don't support Java 1.2 for years.

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- Shortened the inheritance to GlassfishServerSocketFactory


Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- We don't have any other implementation

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- Deleted also javadoc bloc probably copy pasted from some obsoleted JDK

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- Also done small improvements in the code ie the attributes map had always
  just string values.
- The DefaultServerSocketFactory is a part of JDK, we don't use it.


Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
â€Ķ create()

- Now it makes sense, the original impl moved to the SSLConfigurator mostly,
  and from some point GF required to create just the SSLContext

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- Redundant piece in the hierarchy of calls

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
dmatej added 3 commits July 23, 2024 11:39
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Refactoring in grizzly-config: removed dead code
# Conflicts:
#	appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/web/integration/WebSecurityManager.java
#	nucleus/common/common-util/src/main/java/org/glassfish/security/common/MasterPassword.java
#	nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/SSLUtils.java
#	nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/security/ssl/impl/SecuritySupportImpl.java
#	nucleus/security/ssl-impl/src/main/java/com/sun/enterprise/server/pluggable/SecuritySupport.java

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
@dmatej
dmatej merged commit 2857408 into eclipse-ee4j:8.0 Jul 25, 2024
@dmatej dmatej added this to the 8.0.0 milestone Jul 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants