Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merge of master branch to branch 8.0 #24979

Merged
merged 85 commits into from
Jun 6, 2024

Conversation

dmatej
Copy link
Contributor

@dmatej dmatej commented Jun 5, 2024

No description provided.

samsonsouley and others added 30 commits April 3, 2024 03:43
Create a new module for the hello project with jakarta following the same structure of the old hello project
Add the module to the project
Change hello.war file download source
Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>

# Conflicts:
#	appserver/common/glassfish-naming/src/main/java/com/sun/enterprise/naming/impl/GlassfishNamingManagerImpl.java
…alid

- caused IllegalArgumentException in Application.toString
- toString must not throw exceptions, it is unusable for logging otherwise

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- It was not thrown, invocation.getComponentId() is just a getter
- NamingException doesn't need to be wrapped by another.

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Fixed IllegalArgumentException + refactoring
- server.log buffer increased to 1 milion records - with very detailed logging
  and many requests I noticed a deadlock when the server.log file was rolling
  because of its size.

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
…ld-sample-module

Hello.war app for the Quick start guide
Signed-off-by:Ondro Mihalyi <mihalyi@omnifish.ee>
In case it remained running from a previously killed test
Signed-off-by:Ondro Mihalyi <mihalyi@omnifish.ee>
Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>
Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>
Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>
…ver-on-failed-start-in-tests

Stop server on failed start in tests
Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>
dmatej and others added 23 commits June 2, 2024 12:03
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>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- The invocation info might be required for weld extensions like Concurro which
  uses it in GF8.

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- In recent merge I moved wrong curly brace when resolving conflicts

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- Tested on GF8 where it is required for use of classifiers in Concurrency TCK

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- Split processing events - long method with parts with clear borders.
- Logging enabling/disabling CDI
- ModuleInfo.toString usable in logs

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
- Because event() reacts on three kinds of events it appeared three times

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>
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
Backport of improvements in deployment from GF8 concurrency branch
…_200605

# Conflicts:
#	appserver/itest-tools/src/main/java/org/glassfish/main/itest/tools/GlassFishTestEnvironment.java
#	appserver/pom.xml
#	appserver/tests/appserv-tests/lib/pom.xml
#	nucleus/parent/pom.xml
# Conflicts:
#	appserver/web/weld-integration/src/main/java/org/glassfish/weld/ACLSingletonProvider.java
#	nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/CompositeUtil.java
@dmatej dmatej added this to the 8.0.0 milestone Jun 5, 2024
@dmatej dmatej requested a review from arjantijms June 5, 2024 13:13
@dmatej dmatej self-assigned this Jun 5, 2024
@dmatej dmatej marked this pull request as ready for review June 5, 2024 15:02
@arjantijms arjantijms merged commit 530261d into eclipse-ee4j:8.0 Jun 6, 2024
2 checks passed
@dmatej dmatej deleted the mergeto8_200605 branch June 6, 2024 10:24
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants