-
Notifications
You must be signed in to change notification settings - Fork 917
Add support for GlassFish 7.1.0, and GlassFish 8.0.0-M14 #9072
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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, | ||
|
|
@@ -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 | ||
| "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0-M12/glassfish-8.0.0-M14.zip", // NOI18N | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||
| ); | ||
|
|
||
|
|
||
| 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"/> | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 |
|---|---|---|
|
|
@@ -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 | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 |
||
| * <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(); | ||
|
|
||
There was a problem hiding this comment.
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