Initial fixes before testing

Author: dmainardi

enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java

@@ -584,8 +584,8 @@ public enum ServerDetails {
     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-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
+        "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0-M14/glassfish-8.0.0-M14.zip", // NOI18N
+        "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0-M14/glassfish-8.0.0-M14.zip", // NOI18N
         "http://www.eclipse.org/legal/epl-2.0" //NOI18N
     );
 

enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV7_1_0.xml

@@ -75,7 +75,7 @@
             </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"/>
+            <link url="https://repo.maven.apache.org/maven2/org/glassfish/jersey/jersey-documentation/3.1.11/jersey-documentation-3.1.11-docbook.zip"/>
         </javadocs>
         <sources>
         </sources>

enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/ServerUtils.java

@@ -557,37 +557,38 @@ public static GlassFishVersion getServerVersion(final String serverHome) {
                 ClassLoader cl = new URLClassLoader(new URL[] {commonUtilJar.
                             toURI().toURL()});
                 Class c = cl.loadClass(VERSION_CLASS);
-                // Try to get version from com.sun.appserv.server.util.Version.
-                try {
-                    Method mGetFullVersion = c.getMethod(VERSION_METHOD);
-                    System.getProperties().put(GF_HOME_PROPERTY, serverHome);
-                    String fullVersionString
-                            = (String)mGetFullVersion.invoke(c);
-                    System.getProperties().remove(GF_HOME_PROPERTY);
-                    String versionString
-                            = getVersionString(fullVersionString);
+                
+                // Use Manifest Bundle-Version.
+                try (JarFile jar = new JarFile(commonUtilJar)) {
+                    Manifest manifest = jar.getManifest();
+                    String versionString = getVersionString(manifest
+                            .getMainAttributes().getValue(BUNDLE_VERSION));
                     if (versionString != null) {
                         version = GlassFishVersion.toValue(versionString);
                     }
-                } catch (IllegalAccessException | IllegalArgumentException
-                        | InvocationTargetException | NoSuchMethodException
-                        | SecurityException | NoClassDefFoundError ex) {
-                    Logger.log(Level.WARNING, "Cannot retrieve Glassfish version from: "
-                            + commonUtilJar.getAbsolutePath() + ". "
-                            + "Using Manifest Bundle-Version as fallback option:", ex);
+                } catch (IOException ioe) {
+                    Logger.log(Level.WARNING, "Cannot retrieve Glassfish version from Manifest: "
+                        + commonUtilJar.getAbsolutePath() + ": ", ioe);
                 }
-                // Use Manifest Bundle-Version as fallback option.
+                
                 if (version == null) {
-                    try (JarFile jar = new JarFile(commonUtilJar)) {
-                        Manifest manifest = jar.getManifest();
-                        String versionString = getVersionString(manifest
-                                .getMainAttributes().getValue(BUNDLE_VERSION));
+                    // Try to get version from com.sun.appserv.server.util.Version as fallback option.
+                    try {
+                        Method mGetFullVersion = c.getMethod(VERSION_METHOD);
+                        System.getProperties().put(GF_HOME_PROPERTY, serverHome);
+                        String fullVersionString = (String)mGetFullVersion.invoke(c);
+                        System.getProperties().remove(GF_HOME_PROPERTY);
+                        String versionString
+                                = getVersionString(fullVersionString);
                         if (versionString != null) {
                             version = GlassFishVersion.toValue(versionString);
                         }
-                    } catch (IOException ioe) {
-                        Logger.log(Level.WARNING, "Cannot retrieve Glassfish version from Manifest: "
-                            + commonUtilJar.getAbsolutePath() + ": ", ioe);
+                    } catch (IllegalAccessException | IllegalArgumentException
+                            | InvocationTargetException | NoSuchMethodException
+                            | SecurityException | NoClassDefFoundError ex) {
+                        Logger.log(Level.WARNING, "Cannot retrieve Glassfish version from: "
+                                + commonUtilJar.getAbsolutePath() + ". "
+                                + "Using Manifest Bundle-Version as fallback option:", ex);
                     }
                 }
             } catch (MalformedURLException | ClassNotFoundException ex) {

enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactoryTest.java

@@ -165,13 +165,39 @@ public void testGetInstanceforVersionGF6() {
     }
 
     /**
-     * Test factory functionality for GlassFish v. 7.1.0
+     * Test factory functionality for GlassFish v. 7.0.25
      * <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);
+        AdminFactory af = AdminFactory.getInstance(srv.getVersion());
+        assertTrue(af instanceof AdminFactoryRest);
+        Command cmd = new CommandVersion();
+        Runner runner;
+        try {
+          runner = af.getRunner(srv, cmd);
+        } catch (GlassFishIdeException gfie) {
+            runner = null;
+            fail("Exception in Runner initialization: " + gfie.getMessage());
+        }
+        // Returned runner should be REST interface.
+        assertTrue(runner instanceof RunnerRest);
+        // Stored command entity should be the one we supplied.
+        assertTrue(cmd.equals(runner.getCommand()));
+    }
+    
+    /**
+     * Test factory functionality for GlassFish v. 7.1.0
+     * <p/>
+     * Factory should initialize REST {@code Runner} and point it to
+     * provided {@code Command} instance.
+     */
+    @Test
+    public void testGetInstanceforVersionGF71() {
         GlassFishServerEntity srv = new GlassFishServerEntity();
         srv.setVersion(GlassFishVersion.GF_7_1_0);
         AdminFactory af = AdminFactory.getInstance(srv.getVersion());