Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ STR_7022_SERVER_NAME=GlassFish Server 7.0.22
STR_7023_SERVER_NAME=GlassFish Server 7.0.23
STR_7024_SERVER_NAME=GlassFish Server 7.0.24
STR_7025_SERVER_NAME=GlassFish Server 7.0.25
STR_710_SERVER_NAME=GlassFish Server 7.1.0
STR_800_SERVER_NAME=GlassFish Server 8.0.0

# CommonServerSupport.java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ public enum ServerDetails {
),

/**
* details for an instance of GlassFish Server 7.0.24
* details for an instance of GlassFish Server 7.0.25
*/
GLASSFISH_SERVER_7_0_25(NbBundle.getMessage(ServerDetails.class, "STR_7025_SERVER_NAME", new Object[]{}), // NOI18N
GlassfishInstanceProvider.JAKARTAEE10_DEPLOYER_FRAGMENT,
Expand All @@ -566,15 +566,26 @@ public enum ServerDetails {
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.25/glassfish-7.0.25.zip", // NOI18N
"http://www.eclipse.org/legal/epl-2.0" //NOI18N
),

/**
* details for an instance of GlassFish Server 7.1.0
*/
GLASSFISH_SERVER_7_1_0(NbBundle.getMessage(ServerDetails.class, "STR_710_SERVER_NAME", new Object[]{}), // NOI18N
GlassfishInstanceProvider.JAKARTAEE10_DEPLOYER_FRAGMENT,
GlassFishVersion.GF_7_1_0,
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.1.0/glassfish-7.1.0.zip", // NOI18N
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.1.0/glassfish-7.1.0.zip", // NOI18N
"http://www.eclipse.org/legal/epl-2.0" //NOI18N
),

/**
* details for an instance of GlassFish Server 8.0.0
*/
GLASSFISH_SERVER_8_0_0(NbBundle.getMessage(ServerDetails.class, "STR_800_SERVER_NAME", new Object[]{}), // NOI18N
GlassfishInstanceProvider.JAKARTAEE11_DEPLOYER_FRAGMENT,
GlassFishVersion.GF_8_0_0,
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0-M12/glassfish-8.0.0-M12.zip", // NOI18N
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0-M12/glassfish-8.0.0-M12.zip", // NOI18N
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0-M12/glassfish-8.0.0-M14.zip", // NOI18N
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing M12 to M14 change

"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0-M12/glassfish-8.0.0-M14.zip", // NOI18N
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing M12 to M14 change

"http://www.eclipse.org/legal/epl-2.0" //NOI18N
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ STR_7022_SERVER_NAME=GlassFish Server 7.0.22
STR_7023_SERVER_NAME=GlassFish Server 7.0.23
STR_7024_SERVER_NAME=GlassFish Server 7.0.24
STR_7025_SERVER_NAME=GlassFish Server 7.0.25
STR_710_SERVER_NAME=GlassFish Server 7.1.0

STR_V8_FAMILY_NAME=GlassFish Server
STR_800_SERVER_NAME=GlassFish Server 8.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,8 @@ public enum GlassFishVersion {
GF_7_0_24 ((short) 7, (short) 0, (short) 24, (short) 0, GlassFishVersion.GF_7_0_24_STR),
/** GlassFish 7.0.25 */
GF_7_0_25 ((short) 7, (short) 0, (short) 25, (short) 0, GlassFishVersion.GF_7_0_25_STR),
/** GlassFish 7.1.0 */
GF_7_1_0 ((short) 7, (short) 1, (short) 0, (short) 0, GlassFishVersion.GF_7_1_0_STR),
/** GlassFish 8.0.0 */
GF_8_0_0 ((short) 8, (short) 0, (short) 0, (short) 0, GlassFishVersion.GF_8_0_0_STR);
// Class attributes //
Expand Down Expand Up @@ -424,6 +426,11 @@ public enum GlassFishVersion {
static final String GF_7_0_25_STR = "7.0.25";
/** Additional {@code String} representations of GF_7_0_25 value. */
static final String GF_7_0_25_STR_NEXT[] = {"7.0.25", "7.0.25.0"};

/** A {@code String} representation of GF_7_1_0 value. */
static final String GF_7_1_0_STR = "7.1.0";
/** Additional {@code String} representations of GF_7_1_0 value. */
static final String GF_7_1_0_STR_NEXT[] = {"7.1.0", "7.1.0.0"};

/** A {@code String} representation of GF_8_0_0 value. */
static final String GF_8_0_0_STR = "8.0.0";
Expand Down Expand Up @@ -492,6 +499,7 @@ public enum GlassFishVersion {
initStringValuesMapFromArray(GF_7_0_23, GF_7_0_23_STR_NEXT);
initStringValuesMapFromArray(GF_7_0_24, GF_7_0_24_STR_NEXT);
initStringValuesMapFromArray(GF_7_0_25, GF_7_0_25_STR_NEXT);
initStringValuesMapFromArray(GF_7_1_0, GF_7_1_0_STR_NEXT);
initStringValuesMapFromArray(GF_8_0_0, GF_8_0_0_STR_NEXT);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,11 @@ public class ConfigBuilderProvider {
private static final Config.Next CONFIG_V7_0_25
= new Config.Next(GlassFishVersion.GF_7_0_25,
ConfigBuilderProvider.class.getResource("GlassFishV7_0_24.xml"));

/** Library builder configuration since GlassFish 7.1.0. */
private static final Config.Next CONFIG_V7_1_0
= new Config.Next(GlassFishVersion.GF_7_1_0,
ConfigBuilderProvider.class.getResource("GlassFishV7_1_0.xml"));

/** Library builder configuration since GlassFish 8.0.0. */
private static final Config.Next CONFIG_V8_0_0
Expand All @@ -260,7 +265,8 @@ public class ConfigBuilderProvider {
CONFIG_V7_0_15, CONFIG_V7_0_16, CONFIG_V7_0_17,
CONFIG_V7_0_18, CONFIG_V7_0_19, CONFIG_V7_0_20,
CONFIG_V7_0_21, CONFIG_V7_0_22, CONFIG_V7_0_23,
CONFIG_V7_0_24, CONFIG_V7_0_24, CONFIG_V8_0_0);
CONFIG_V7_0_24, CONFIG_V7_0_25, CONFIG_V7_1_0,
CONFIG_V8_0_0);

/** Builders array for each server instance. */
private static final ConcurrentMap<GlassFishServer, ConfigBuilder> builders
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<server>
<tools lib="lib">
<asadmin jar="client/appserver-cli.jar"/>
</tools>
<java version="21">
<platform version="17"/>
<platform version="18"/>
<platform version="19"/>
<platform version="20"/>
<platform version="21"/>
<platform version="22"/>
<platform version="23"/>
<platform version="24"/>
<platform version="25"/>
</java>
<javaee version="10.0.0">
<profile version="10.0.0" type="web"/>
<profile version="10.0.0" type="full" check="full"/>
<module type="war"/>
<module type="car" check="full"/>
<module type="ear" check="full"/>
<module type="ejb" check="full"/>
<module type="rar" check="full"/>
<check name="full">
<file path="appclient-server-core.jar"/>
</check>
</javaee>
<library id="Java EE">
<classpath>
<fileset dir="modules">
<include name="jakarta\..+\.jar"/>
<include name="jakarta.enterprise.cdi-api.jar"/>
<include name="jakarta.validation-api.jar"/>
<include name="jaxb-osgi.jar"/>
<include name="webservices-osgi.jar"/>
<include name="weld-osgi-bundle.jar"/>
</fileset>
<fileset dir="modules/endorsed">
<include name=".+\.jar"/>
</fileset>
</classpath>
<javadocs>
<lookup path="docs/jakartaee10-doc-api.jar"/>
</javadocs>
<sources>
</sources>
</library>
<library id="Jersey 3">
<classpath>
<fileset dir="modules">
<include name="jackson.+\.jar"/>
<include name="jersey.+\.jar"/>
<include name="jettison.*\.jar"/>
</fileset>
</classpath>
<javadocs>
<link url="https://repo.maven.apache.org/maven2/org/glassfish/jersey/jersey-documentation/3.1.10/jersey-documentation-3.1.10-docbook.zip"/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be version 3.1.11

</javadocs>
<sources>
</sources>
</library>
<library id="JAX-RS">
<classpath>
<fileset dir="modules">
<include name="jakarta.ws.rs-api.jar"/>
</fileset>
</classpath>
<javadocs>
</javadocs>
<sources>
</sources>
</library>
</server>
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<platform version="22"/>
<platform version="23"/>
<platform version="24"/>
<platform version="25"/>
</java>
<javaee version="11.0.0">
<profile version="11.0.0" type="web"/>
Expand Down Expand Up @@ -70,7 +71,7 @@
</fileset>
</classpath>
<javadocs>
<link url="https://repo.maven.apache.org/maven2/org/glassfish/jersey/jersey-documentation/4.0.0-M3/jersey-documentation-4.0.0-M3-docbook.zip"/>
<link url="https://repo.maven.apache.org/maven2/org/glassfish/jersey/jersey-documentation/4.0.0-M4/jersey-documentation-4.0.0-M4-docbook.zip"/>
</javadocs>
<sources>
</sources>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,15 +165,15 @@ public void testGetInstanceforVersionGF6() {
}

/**
* Test factory functionality for GlassFish v. 7.0.25
* Test factory functionality for GlassFish v. 7.1.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better reverse this to GlassFish version 7.0.25 and create a new test testGetInstanceforVersionGF71(), as this is a medium update going from 7.0.X to 7.Y.X.

* <p/>
* Factory should initialize REST {@code Runner} and point it to
* provided {@code Command} instance.
*/
@Test
public void testGetInstanceforVersionGF7() {
GlassFishServerEntity srv = new GlassFishServerEntity();
srv.setVersion(GlassFishVersion.GF_7_0_25);
srv.setVersion(GlassFishVersion.GF_7_1_0);
AdminFactory af = AdminFactory.getInstance(srv.getVersion());
assertTrue(af instanceof AdminFactoryRest);
Command cmd = new CommandVersion();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ public void testToValue() {
GlassFishVersion.GF_7_0_24_STR_NEXT);
verifyToValueFromAdditionalArray(GlassFishVersion.GF_7_0_25,
GlassFishVersion.GF_7_0_25_STR_NEXT);
verifyToValueFromAdditionalArray(GlassFishVersion.GF_7_1_0,
GlassFishVersion.GF_7_1_0_STR_NEXT);
verifyToValueFromAdditionalArray(GlassFishVersion.GF_8_0_0,
GlassFishVersion.GF_8_0_0_STR_NEXT);
}
Expand Down Expand Up @@ -179,7 +181,7 @@ public void testToValueIncomplete() {
GlassFishVersion.GF_7_0_20, GlassFishVersion.GF_7_0_21,
GlassFishVersion.GF_7_0_22, GlassFishVersion.GF_7_0_23,
GlassFishVersion.GF_7_0_24, GlassFishVersion.GF_7_0_25,
GlassFishVersion.GF_8_0_0
GlassFishVersion.GF_7_1_0, GlassFishVersion.GF_8_0_0
};
String strings[] = {
"1.0.1.4", "2.0.1.5", "2.1.0.3", "2.1.1.7",
Expand All @@ -195,7 +197,7 @@ public void testToValueIncomplete() {
"7.0.14.0", "7.0.15.0", "7.0.16.0", "7.0.17.0",
"7.0.18.0", "7.0.19.0", "7.0.20.0", "7.0.21.0",
"7.0.22.0", "7.0.23.0", "7.0.24.0", "7.0.25.0",
"8.0.0.0"
"7.1.0.0", "8.0.0.0"
};
for (int i = 0; i < versions.length; i++) {
GlassFishVersion version = GlassFishVersion.toValue(strings[i]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_3;
import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_4;
import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_6_2_5;
import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_7_0_25;
import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_7_1_0;
import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_8_0_0;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
Expand All @@ -48,10 +48,10 @@ public class EnumUtilsTest {
*/
@Test
public void testEq() {
assertFalse(EnumUtils.eq(GF_8_0_0, GF_7_0_25), "Equals for a > b shall be false.");
assertFalse(EnumUtils.eq(GF_8_0_0, GF_7_1_0), "Equals for a > b shall be false.");
assertTrue(EnumUtils.eq(GF_8_0_0, GF_8_0_0), "Equals for a == b shall be true.");
assertFalse(EnumUtils.eq(GF_7_0_25, GF_6_2_5), "Equals for a > b shall be false.");
assertTrue(EnumUtils.eq(GF_7_0_25, GF_7_0_25), "Equals for a == b shall be true.");
assertFalse(EnumUtils.eq(GF_7_1_0, GF_6_2_5), "Equals for a > b shall be false.");
assertTrue(EnumUtils.eq(GF_7_1_0, GF_7_1_0), "Equals for a == b shall be true.");
assertFalse(EnumUtils.eq(GF_4, GF_3), "Equals for a > b shall be false.");
assertTrue(EnumUtils.eq(GF_4, GF_4), "Equals for a == b shall be true.");
assertFalse(EnumUtils.eq(GF_3, GF_4), "Equals for a < b shall be false.");
Expand All @@ -72,10 +72,10 @@ public void testEq() {
*/
@Test
public void testNe() {
assertTrue(EnumUtils.ne(GF_8_0_0, GF_7_0_25), "Not equals for a > b shall be true.");
assertTrue(EnumUtils.ne(GF_8_0_0, GF_7_1_0), "Not equals for a > b shall be true.");
assertFalse(EnumUtils.ne(GF_8_0_0, GF_8_0_0), "Not equals for a == b shall be false.");
assertTrue(EnumUtils.ne(GF_7_0_25, GF_6_2_5), "Not equals for a > b shall be true.");
assertFalse(EnumUtils.ne(GF_7_0_25, GF_7_0_25), "Not equals for a == b shall be false.");
assertTrue(EnumUtils.ne(GF_7_1_0, GF_6_2_5), "Not equals for a > b shall be true.");
assertFalse(EnumUtils.ne(GF_7_1_0, GF_7_1_0), "Not equals for a == b shall be false.");
assertTrue(EnumUtils.ne(GF_4, GF_3), "Not equals for a > b shall be true.");
assertFalse(EnumUtils.ne(GF_4, GF_4), "Not equals for a == b shall be false.");
assertTrue(EnumUtils.ne(GF_3, GF_4), "Not equals for a < b shall be true.");
Expand All @@ -96,10 +96,10 @@ public void testNe() {
*/
@Test
public void testLt() {
assertFalse(EnumUtils.lt(GF_8_0_0, GF_7_0_25), "Less than for a > b shall be false.");
assertFalse(EnumUtils.lt(GF_8_0_0, GF_7_1_0), "Less than for a > b shall be false.");
assertFalse(EnumUtils.lt(GF_8_0_0, GF_8_0_0), "Less than for a == b shall be false.");
assertFalse(EnumUtils.lt(GF_7_0_25, GF_6_2_5), "Less than for a > b shall be false.");
assertFalse(EnumUtils.lt(GF_7_0_25, GF_7_0_25), "Less than for a == b shall be false.");
assertFalse(EnumUtils.lt(GF_7_1_0, GF_6_2_5), "Less than for a > b shall be false.");
assertFalse(EnumUtils.lt(GF_7_1_0, GF_7_1_0), "Less than for a == b shall be false.");
assertFalse(EnumUtils.lt(GF_4, GF_3), "Less than for a > b shall be false.");
assertFalse(EnumUtils.lt(GF_4, GF_4), "Less than for a == b shall be false.");
assertTrue(EnumUtils.lt(GF_3, GF_4), "Less than for a < b shall be true.");
Expand All @@ -120,10 +120,10 @@ public void testLt() {
*/
@Test
public void testLe() {
assertFalse(EnumUtils.le(GF_8_0_0, GF_7_0_25), "Less than or equal for a > b shall be false.");
assertFalse(EnumUtils.le(GF_8_0_0, GF_7_1_0), "Less than or equal for a > b shall be false.");
assertTrue(EnumUtils.le(GF_8_0_0, GF_8_0_0), "Less than or equal for a == b shall be true.");
assertFalse(EnumUtils.le(GF_7_0_25, GF_6_2_5), "Less than or equal for a > b shall be false.");
assertTrue(EnumUtils.le(GF_7_0_25, GF_7_0_25), "Less than or equal for a == b shall be true.");
assertFalse(EnumUtils.le(GF_7_1_0, GF_6_2_5), "Less than or equal for a > b shall be false.");
assertTrue(EnumUtils.le(GF_7_1_0, GF_7_1_0), "Less than or equal for a == b shall be true.");
assertFalse(EnumUtils.le(GF_4, GF_3), "Less than or equal for a > b shall be false.");
assertTrue(EnumUtils.le(GF_4, GF_4), "Less than or equal for a == b shall be true.");
assertTrue(EnumUtils.le(GF_3, GF_4), "Less than or equal for a < b shall be true.");
Expand All @@ -144,10 +144,10 @@ public void testLe() {
*/
@Test
public void testGt() {
assertTrue(EnumUtils.gt(GF_8_0_0, GF_7_0_25), "Greater than for a > b shall be true.");
assertTrue(EnumUtils.gt(GF_8_0_0, GF_7_1_0), "Greater than for a > b shall be true.");
assertFalse(EnumUtils.gt(GF_8_0_0, GF_8_0_0), "Greater than for a == b shall be false.");
assertTrue(EnumUtils.gt(GF_7_0_25, GF_6_2_5), "Greater than for a > b shall be true.");
assertFalse(EnumUtils.gt(GF_7_0_25, GF_7_0_25), "Greater than for a == b shall be false.");
assertTrue(EnumUtils.gt(GF_7_1_0, GF_6_2_5), "Greater than for a > b shall be true.");
assertFalse(EnumUtils.gt(GF_7_1_0, GF_7_1_0), "Greater than for a == b shall be false.");
assertTrue(EnumUtils.gt(GF_4, GF_3), "Greater than for a > b shall be true.");
assertFalse(EnumUtils.gt(GF_4, GF_4), "Greater than for a == b shall be false.");
assertFalse(EnumUtils.gt(GF_3, GF_4), "Greater than for a < b shall be false.");
Expand All @@ -168,10 +168,10 @@ public void testGt() {
*/
@Test
public void testGe() {
assertTrue(EnumUtils.ge(GF_8_0_0, GF_7_0_25), "Greater than or equal for a > b shall be true.");
assertTrue(EnumUtils.ge(GF_8_0_0, GF_7_1_0), "Greater than or equal for a > b shall be true.");
assertTrue(EnumUtils.ge(GF_8_0_0, GF_8_0_0), "Greater than or equal for a == b shall be true.");
assertTrue(EnumUtils.ge(GF_7_0_25, GF_6_2_5), "Greater than or equal for a > b shall be true.");
assertTrue(EnumUtils.ge(GF_7_0_25, GF_7_0_25), "Greater than or equal for a == b shall be true.");
assertTrue(EnumUtils.ge(GF_7_1_0, GF_6_2_5), "Greater than or equal for a > b shall be true.");
assertTrue(EnumUtils.ge(GF_7_1_0, GF_7_1_0), "Greater than or equal for a == b shall be true.");
assertTrue(EnumUtils.ge(GF_4, GF_3), "Greater than or equal for a > b shall be true.");
assertTrue(EnumUtils.ge(GF_4, GF_4), "Greater than or equal for a == b shall be true.");
assertFalse(EnumUtils.ge(GF_3, GF_4), "Greater than or equal for a < b shall be false.");
Expand Down
Loading