Skip to content

Commit e448ac8

Browse files
ThihupThihup
committed
Merge branch 'master' of https://github.com/eclipse-ee4j/glassfish into microprofile-health
2 parents 08b8c52 + 9d16cba commit e448ac8

File tree

11 files changed

+512
-260
lines changed

11 files changed

+512
-260
lines changed

‎Jenkinsfile‎

Lines changed: 193 additions & 169 deletions
Large diffs are not rendered by default.

‎appserver/tests/appserv-tests/devtests/jdbc/build.xml‎

Lines changed: 137 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@
3838
-->
3939
&reporting;
4040

41+
<target name="all">
42+
<antcall target="jdbc-all"/>
43+
</target>
44+
4145
<target name="jdbc-all">
4246
<delete>
4347
<fileset dir="${env.APS_HOME}" includes="test_results*"/>
@@ -49,12 +53,113 @@
4953
<fileset dir="." includes="*.output"/>
5054
</delete>
5155
<record name="jdbc.output" action="start"/>
56+
5257
<antcall target="run-tests"/>
58+
5359
<antcall target="report">
5460
<param name="htmlfile" value="${env.APS_HOME}/test_results.html"/>
5561
</antcall>
5662
<record name="jdbc.output" action="stop"/>
63+
</target>
5764

65+
<target name="jdbc-group1">
66+
<delete>
67+
<fileset dir="${env.APS_HOME}" includes="test_results*"/>
68+
</delete>
69+
<delete>
70+
<fileset dir="${env.APS_HOME}" includes="JDBCtest_results.html"/>
71+
</delete>
72+
<delete>
73+
<fileset dir="." includes="*.output"/>
74+
</delete>
75+
<record name="jdbc.output" action="start"/>
76+
77+
<antcall target="run-tests1"/>
78+
79+
<antcall target="report">
80+
<param name="htmlfile" value="${env.APS_HOME}/test_results.html"/>
81+
</antcall>
82+
<record name="jdbc.output" action="stop"/>
83+
</target>
84+
85+
<target name="jdbc-group2">
86+
<delete>
87+
<fileset dir="${env.APS_HOME}" includes="test_results*"/>
88+
</delete>
89+
<delete>
90+
<fileset dir="${env.APS_HOME}" includes="JDBCtest_results.html"/>
91+
</delete>
92+
<delete>
93+
<fileset dir="." includes="*.output"/>
94+
</delete>
95+
<record name="jdbc.output" action="start"/>
96+
97+
<antcall target="run-tests2"/>
98+
99+
<antcall target="report">
100+
<param name="htmlfile" value="${env.APS_HOME}/test_results.html"/>
101+
</antcall>
102+
<record name="jdbc.output" action="stop"/>
103+
</target>
104+
105+
<target name="jdbc-group3">
106+
<delete>
107+
<fileset dir="${env.APS_HOME}" includes="test_results*"/>
108+
</delete>
109+
<delete>
110+
<fileset dir="${env.APS_HOME}" includes="JDBCtest_results.html"/>
111+
</delete>
112+
<delete>
113+
<fileset dir="." includes="*.output"/>
114+
</delete>
115+
<record name="jdbc.output" action="start"/>
116+
117+
<antcall target="run-tests3"/>
118+
119+
<antcall target="report">
120+
<param name="htmlfile" value="${env.APS_HOME}/test_results.html"/>
121+
</antcall>
122+
<record name="jdbc.output" action="stop"/>
123+
</target>
124+
125+
<target name="jdbc-group4">
126+
<delete>
127+
<fileset dir="${env.APS_HOME}" includes="test_results*"/>
128+
</delete>
129+
<delete>
130+
<fileset dir="${env.APS_HOME}" includes="JDBCtest_results.html"/>
131+
</delete>
132+
<delete>
133+
<fileset dir="." includes="*.output"/>
134+
</delete>
135+
<record name="jdbc.output" action="start"/>
136+
137+
<antcall target="run-tests4"/>
138+
139+
<antcall target="report">
140+
<param name="htmlfile" value="${env.APS_HOME}/test_results.html"/>
141+
</antcall>
142+
<record name="jdbc.output" action="stop"/>
143+
</target>
144+
145+
<target name="jdbc-group5">
146+
<delete>
147+
<fileset dir="${env.APS_HOME}" includes="test_results*"/>
148+
</delete>
149+
<delete>
150+
<fileset dir="${env.APS_HOME}" includes="JDBCtest_results.html"/>
151+
</delete>
152+
<delete>
153+
<fileset dir="." includes="*.output"/>
154+
</delete>
155+
<record name="jdbc.output" action="start"/>
156+
157+
<antcall target="run-tests5"/>
158+
159+
<antcall target="report">
160+
<param name="htmlfile" value="${env.APS_HOME}/test_results.html"/>
161+
</antcall>
162+
<record name="jdbc.output" action="stop"/>
58163
</target>
59164

60165
<target name="jdbc-all-security">
@@ -68,30 +173,46 @@
68173
<fileset dir="." includes="*.output"/>
69174
</delete>
70175
<record name="jdbc.secman.output" action="start"/>
176+
71177
<antcall target="run-tests"/>
178+
72179
<antcall target="report">
73180
<param name="htmlfile" value="${env.APS_HOME}/JDBCSecuritytest_results.html"/>
74181
</antcall>
75182
<record name="jdbc.secman.output" action="stop"/>
76183
</target>
77184

78185
<target name="run-tests">
186+
<antcall target="run-tests1" />
187+
<antcall target="run-tests2" />
188+
<antcall target="run-tests3" />
189+
<antcall target="run-tests4" />
190+
<antcall target="run-tests5" />
191+
</target>
192+
193+
<target name="run-tests1">
79194
<ant dir="appauth" target="all"/>
80195
<ant dir="appauthtx" target="all"/>
81196
<ant dir="contauth" target="all"/>
82197
<ant dir="contauthtx" target="all"/>
83198
<ant dir="contauth1" target="all"/>
84199
<ant dir="contauth1tx" target="all"/>
85200
<ant dir="reconfig" target="all"/>
86-
<ant dir="autocommit" target="all"/>
87-
<ant dir="jdbcjmsauth" target="all"/>
88-
<ant dir="nopasswdfordb" target="all"/>
89-
<ant dir="txpassthrough" target="all"/>
90-
<ant dir="txafternontx" target="all"/>
91-
<ant dir="txafternontxjndi" target="all"/>
92-
<ant dir="notxops" target="all"/>
93-
<ant dir="nonacc" target="all"/>
94-
<ant dir="lazyassoc" target="all"/>
201+
</target>
202+
203+
<target name="run-tests2">
204+
<ant dir="autocommit" target="all"/>
205+
<ant dir="jdbcjmsauth" target="all"/>
206+
<ant dir="nopasswdfordb" target="all"/>
207+
<ant dir="txpassthrough" target="all"/>
208+
<ant dir="txafternontx" target="all"/>
209+
<ant dir="txafternontxjndi" target="all"/>
210+
<ant dir="notxops" target="all"/>
211+
<ant dir="nonacc" target="all"/>
212+
<ant dir="lazyassoc" target="all"/>
213+
</target>
214+
215+
<target name="run-tests3">
95216
<ant dir="markconnectionasbad.local" target="all"/>
96217
<ant dir="markconnectionasbad.xa" target="all"/>
97218
<ant dir="statementwrapper" target="all"/>
@@ -104,6 +225,9 @@
104225
<ant dir="conval" target="all-assoc-with-thread"/>
105226
<ant dir="connleaktracing" target="all"/>
106227
<ant dir="conncreationretry" target="all"/>
228+
</target>
229+
230+
<target name="run-tests4">
107231
<ant dir="validateatmostonceperiod" target="all"/>
108232
<ant dir="connsharing" target="nonxa"/>
109233
<ant dir="connsharing/nonxa" target="all-assoc-with-thread"/>
@@ -114,23 +238,19 @@
114238
<ant dir="dmmcf" target="all"/>
115239
<ant dir="dmmcf.markconnectionasbad.xa" target="all"/>
116240
<ant dir="dmmcf.appclient" target="all"/>
241+
</target>
242+
243+
<target name="run-tests5">
117244
<ant dir="tracingsql" target="all"/>
118245
<ant dir="datasource40" target="all"/>
119246
<ant dir="custom-validation" target="all"/>
120247
<ant dir="custom-validation-1" target="all"/>
121248
<ant dir="flushconnectionpool" target="all"/>
122249
<ant dir="connleakreclaimnotify" target="all"/>
123250
<ant dir="stmtCaching_hit_miss.monitoring" target="all"/>
124-
<!--ant dir="transparent-pool-reconfig" target="all"/-->
125-
<!--ant dir="transparent-pool-reconfig-resources-xml" target="all"/-->
126-
<!--ant dir="sqltracemonitoring" target="all"/-->
127-
<!--ant dir="statementleakdetection" target="all"/-->
128-
<!--ant dir="appbasedMonitoring" target="all"/-->
129251
<ant dir="jpa-dsd" target="all" />
130252
<ant dir="jpa-dsd" target="all-appclient-exposed-dsd"/>
131253
<ant dir="stmtCaching_hit_miss.fixed" target="all"/>
132-
133-
<!--<antcall target="all-oracle"/>-->
134254
</target>
135255

136256
<target name="ee-all">
@@ -180,10 +300,6 @@
180300
<record name="jdbc.output" action="stop"/>
181301
</target>
182302

183-
<target name="all">
184-
<antcall target="jdbc-all"/>
185-
</target>
186-
187303
<target name="all-oracle">
188304
<record name="jdbc-oracle.output" action="start"/>
189305
<ant dir="connsharing" target="xa"/>
@@ -249,6 +365,7 @@
249365
<ant dir="simple" target="all"/>
250366
<record name="simple.output" action="stop"/>
251367
</target>
368+
252369
<target name="reconfig-test">
253370
<record name="reconfig.output" action="start"/>
254371
<ant dir="reconfig" target="all"/>

‎appserver/tests/appserv-tests/devtests/jdbc/run_test.sh‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,16 @@
1616
#
1717

1818
list_test_ids(){
19-
echo jdbc_all
19+
echo jdbc_all jdbc_group1 jdbc_group2 jdbc_group3 jdbc_group4 jdbc_group5
2020
}
2121

2222
test_run(){
2323
${S1AS_HOME}/bin/asadmin start-domain domain1
2424
${S1AS_HOME}/bin/asadmin start-database
2525
cd ${APS_HOME}/devtests/jdbc
26+
2627
ant ${TARGET} | tee ${TEST_RUN_LOG}
28+
2729
${S1AS_HOME}/bin/asadmin stop-domain domain1
2830
${S1AS_HOME}/bin/asadmin stop-database
2931
}
@@ -33,18 +35,35 @@ run_test_id(){
3335
cd `dirname ${0}`
3436
test_init
3537
get_test_target ${1}
38+
3639
test_run
40+
3741
check_successful_run
3842
generate_junit_report ${1}
3943
change_junit_report_class_names
4044
}
4145

4246
get_test_target(){
43-
case ${1} in
44-
jdbc_all )
45-
TARGET=all
46-
export TARGET;;
47-
esac
47+
case ${1} in
48+
jdbc_all )
49+
TARGET=all
50+
export TARGET;;
51+
jdbc_group1 )
52+
TARGET=jdbc-group1
53+
export TARGET;;
54+
jdbc_group2 )
55+
TARGET=jdbc-group2
56+
export TARGET;;
57+
jdbc_group3 )
58+
TARGET=jdbc-group3
59+
export TARGET;;
60+
jdbc_group4 )
61+
TARGET=jdbc-group4
62+
export TARGET;;
63+
jdbc_group5 )
64+
TARGET=jdbc-group5
65+
export TARGET;;
66+
esac
4867
}
4968

5069
OPT=${1}

‎docs/administration-guide/src/main/asciidoc/jvm.adoc‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,6 @@ xref:reference-manual.adoc#create-jvm-options[`create-jvm-options`] subcommand.
5555
To create more than one JVM option, use a colon (:) to separate the
5656
options. If the JVM option itself contains a colon (:), use the
5757
backslash (\) to offset the colon delimiter.
58-
+
59-
Information about properties for the subcommand is included in this help
60-
page.
6158
3. To apply your changes, restart {productName}. See
6259
xref:domains.adoc#to-restart-a-domain[To Restart a Domain].
6360

@@ -78,7 +75,7 @@ Command create-jvm-options executed successfully.
7875

7976
See Also
8077

81-
You can also view the full syntax and options of the subcommand by
78+
You can also view the full syntax and options of the subcommand in the xref:reference-manual.adoc#create-jvm-options[`create-jvm-options`] reference manual, or by
8279
typing `asadmin help create-jvm-options` at the command line.
8380

8481
[[to-list-jvm-options]]

‎docs/reference-manual/src/main/asciidoc/create-jvm-options.adoc‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,18 @@ are preceded by the dash character (`-`). For example:
6161
If the subcommand specifies an option that already exists, the command
6262
does not re-create the option.
6363

64+
Variable references, e.g. `${variable}`, can be used anywhere in JVM options. In that case, they are resolved as follows:
6465

65-
[NOTE]
66+
1. Profiler properties in Java Config
67+
2. System properties in JVM options in Java Config
68+
3. System properties in instance, cluster, or config that match the instance being started
69+
4. System properties in the JVM of the server launcher (note that they may be different from properties in the JVM of the server if it starts with a different JVM)
70+
5. `asenv` properties
71+
6. Environment variables
72+
73+
If a property `org.glassfish.envPreferredToProperties` is defined as `true` (in any source except environment variables), then environment variables take precedence over other sources, instead of being the last resolved source. It's also possible to override options and system properties defined in JVM options with an environment variable that either has the same name, or same name if case is ignored and non-alphanumeric characters are replaced with the `_` character. For example, a property `-Dmy.name` can be defined by redefined by environment variables `my.name`, `my_name`, or `MY_NAME`.
74+
75+
[CAUTION]
6676
====
6777
Ensure that any option that you create is valid. The subcommand might
6878
allow you to create an invalid option, but such an invalid option can

‎docs/release-notes/src/main/asciidoc/release-notes.adoc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,7 @@ The following topics are addressed here:
121121

122122
==== Required JDK Versions
123123

124-
{productName} Release 7 requires Oracle JDK 8
125-
Update 144 or later.
124+
{productName} Release 7 requires Java 11 minimum and runs on JDK 11 to JDK 23.
126125

127126
Also be sure to see xref:#paths-and-environment-settings-for-the-jdk-software[Paths and Environment Settings for the
128127
JDK Software] for important JDK configuration instructions.

0 commit comments

Comments
 (0)