This is an automated email from the ASF dual-hosted git repository.
geertjan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new fa39268 NP-49 Payara Platform 5.193 support (#1470)
fa39268 is described below
commit fa3926882f0f1366ea5aacc23397fea72f7d0f36
Author: Gaurav Gupta <gaurav.gupta...@gmail.com>
AuthorDate: Wed Sep 4 12:29:54 2019 +0100
NP-49 Payara Platform 5.193 support (#1470)
* NP-49 Upgrade Payara Server and Payara Micro to 5.193 as default version
Signed-off-by: Gaurav Gupta <gaurav.gupta...@gmail.com>
* NP-49 Add Jakarta EE and MicroProfile libs to lirary
Signed-off-by: Gaurav Gupta <gaurav.gupta...@gmail.com>
---
.../org-netbeans-modules-payara-common.sig | 1 +
.../modules/payara/common/Bundle.properties | 1 +
.../modules/payara/common/ServerDetails.java | 16 ++-
.../wizards/AddServerLocationVisualPanel.form | 18 +--
.../wizards/AddServerLocationVisualPanel.java | 20 +--
.../modules/payara/spi/ServerUtilities.java | 39 +++---
.../modules/payara/jakartaee/Bundle.properties | 6 +-
.../payara/jakartaee/Hk2LibraryProvider.java | 100 ++++++++++++---
.../jakartaee/JavaEEServerModuleFactory.java | 137 +++++++--------------
.../payara/micro/project/VersionRepository.java | 1 +
.../org-netbeans-modules-payara-tooling.sig | 3 +-
.../modules/payara/tooling/admin/AdminFactory.java | 1 +
.../modules/payara/tooling/data/PayaraVersion.java | 11 +-
.../payara/tooling/server/config/PayaraV4.xml | 1 +
.../payara/tooling/server/config/PayaraV5.xml | 1 +
.../payara/tooling/server/config/PayaraV5_192.xml | 21 +++-
16 files changed, 211 insertions(+), 166 deletions(-)
diff --git
a/enterprise/payara.common/nbproject/org-netbeans-modules-payara-common.sig
b/enterprise/payara.common/nbproject/org-netbeans-modules-payara-common.sig
index e3eb0d6..f9e4015 100644
--- a/enterprise/payara.common/nbproject/org-netbeans-modules-payara-common.sig
+++ b/enterprise/payara.common/nbproject/org-netbeans-modules-payara-common.sig
@@ -1519,6 +1519,7 @@ fld public final static
org.netbeans.modules.payara.common.ServerDetails PAYARA_
fld public final static org.netbeans.modules.payara.common.ServerDetails
PAYARA_SERVER_5_184
fld public final static org.netbeans.modules.payara.common.ServerDetails
PAYARA_SERVER_5_191
fld public final static org.netbeans.modules.payara.common.ServerDetails
PAYARA_SERVER_5_192
+fld public final static org.netbeans.modules.payara.common.ServerDetails
PAYARA_SERVER_5_193
meth public boolean isInstalledInDirectory(java.io.File)
meth public int getVersion()
meth public java.lang.String getDirectUrl()
diff --git
a/enterprise/payara.common/src/org/netbeans/modules/payara/common/Bundle.properties
b/enterprise/payara.common/src/org/netbeans/modules/payara/common/Bundle.properties
index cf6d569..a48096e 100644
---
a/enterprise/payara.common/src/org/netbeans/modules/payara/common/Bundle.properties
+++
b/enterprise/payara.common/src/org/netbeans/modules/payara/common/Bundle.properties
@@ -157,6 +157,7 @@ STR_5183_SERVER_NAME=Payara Server 5.183
STR_5184_SERVER_NAME=Payara Server 5.184
STR_5191_SERVER_NAME=Payara Server 5.191
STR_5192_SERVER_NAME=Payara Server 5.192
+STR_5193_SERVER_NAME=Payara Server 5.193
# CommonServerSupport.java
MSG_FLAKEY_NETWORK=<html>Network communication problem<br/>Could not establish
\
diff --git
a/enterprise/payara.common/src/org/netbeans/modules/payara/common/ServerDetails.java
b/enterprise/payara.common/src/org/netbeans/modules/payara/common/ServerDetails.java
index b36fbcf..04086e3 100644
---
a/enterprise/payara.common/src/org/netbeans/modules/payara/common/ServerDetails.java
+++
b/enterprise/payara.common/src/org/netbeans/modules/payara/common/ServerDetails.java
@@ -237,6 +237,16 @@ public enum ServerDetails {
"https://oss.sonatype.org/service/local/repositories/releases/content/fish/payara/distributions/payara/5.192/payara-5.192.zip";,
// NOI18N
null,
"https://raw.githubusercontent.com/payara/Payara/master/LICENSE.txt";
+ ),
+ /**
+ * details for an instance of Payara Server 5.193
+ */
+ PAYARA_SERVER_5_193(NbBundle.getMessage(ServerDetails.class,
"STR_5193_SERVER_NAME", new Object[]{}), // NOI18N
+ "deployer:pfv5ee8", // NOI18N
+ 5193,
+
"https://oss.sonatype.org/service/local/repositories/releases/content/fish/payara/distributions/payara/5.193/payara-5.193.zip";,
// NOI18N
+ null,
+
"https://raw.githubusercontent.com/payara/Payara/master/LICENSE.txt";
);
/**
@@ -250,6 +260,7 @@ public enum ServerDetails {
return new ServerWizardIterator(
//add new version
new ServerDetails[]{
+ PAYARA_SERVER_5_193,
PAYARA_SERVER_5_192,
PAYARA_SERVER_5_191,
PAYARA_SERVER_5_184,
@@ -272,6 +283,7 @@ public enum ServerDetails {
PAYARA_SERVER_4_1_144
},
new ServerDetails[]{
+ PAYARA_SERVER_5_193,
PAYARA_SERVER_5_192,
PAYARA_SERVER_5_191,
PAYARA_SERVER_5_184,
@@ -344,6 +356,8 @@ public enum ServerDetails {
return PAYARA_SERVER_5_191.getVersion();
case PF_5_192:
return PAYARA_SERVER_5_192.getVersion();
+ case PF_5_193:
+ return PAYARA_SERVER_5_193.getVersion();
default:
return -1;
}
@@ -363,7 +377,7 @@ public enum ServerDetails {
if (null == domainXml || !domainXml.isFile() || !domainXml.canRead()) {
return -1;
}
- return hasDefaultConfig(domainXml) ? PAYARA_SERVER_5_192.getVersion()
: PAYARA_SERVER_5_181.getVersion();
+ return hasDefaultConfig(domainXml) ? PAYARA_SERVER_5_193.getVersion()
: PAYARA_SERVER_5_181.getVersion();
}
private static boolean hasDefaultConfig(File domainXml) throws
IllegalStateException {
diff --git
a/enterprise/payara.common/src/org/netbeans/modules/payara/common/wizards/AddServerLocationVisualPanel.form
b/enterprise/payara.common/src/org/netbeans/modules/payara/common/wizards/AddServerLocationVisualPanel.form
index c13d715..3343e67 100644
---
a/enterprise/payara.common/src/org/netbeans/modules/payara/common/wizards/AddServerLocationVisualPanel.form
+++
b/enterprise/payara.common/src/org/netbeans/modules/payara/common/wizards/AddServerLocationVisualPanel.form
@@ -55,14 +55,6 @@
<EmptySpace max="-2" attributes="0"/>
<Component id="browseButton" min="-2" max="-2"
attributes="0"/>
</Group>
- <Group type="102" attributes="0">
- <Group type="103" groupAlignment="0" attributes="0">
- <Component id="hk2HomeLabel" min="-2" max="-2"
attributes="0"/>
- <Component id="chooseServerLabel" alignment="0"
min="-2" max="-2" attributes="0"/>
- <Component id="chooseServerComboBox" alignment="0"
min="-2" pref="159" max="-2" attributes="0"/>
- </Group>
- <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
- </Group>
<Group type="102" alignment="0" attributes="0">
<Component id="downloadButton" min="-2" max="-2"
attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
@@ -70,6 +62,14 @@
<EmptySpace max="-2" attributes="0"/>
<Component id="readlicenseButton" pref="0" max="32767"
attributes="0"/>
</Group>
+ <Group type="102" attributes="0">
+ <Group type="103" groupAlignment="0" max="-2"
attributes="0">
+ <Component id="hk2HomeLabel" min="-2" max="-2"
attributes="0"/>
+ <Component id="chooseServerComboBox" alignment="0"
max="32767" attributes="0"/>
+ <Component id="chooseServerLabel" alignment="0"
pref="180" max="32767" attributes="0"/>
+ </Group>
+ <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+ </Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
@@ -100,7 +100,7 @@
<Component id="agreeCheckBox" min="-2" max="-2"
attributes="0"/>
<Component id="downloadButton" min="-2" max="-2"
attributes="0"/>
</Group>
- <EmptySpace pref="6" max="32767" attributes="0"/>
+ <EmptySpace pref="9" max="32767" attributes="0"/>
<Component id="downloadStatusLabel" min="-2" max="-2"
attributes="0"/>
</Group>
<Group type="102" attributes="0">
diff --git
a/enterprise/payara.common/src/org/netbeans/modules/payara/common/wizards/AddServerLocationVisualPanel.java
b/enterprise/payara.common/src/org/netbeans/modules/payara/common/wizards/AddServerLocationVisualPanel.java
index f98310d..562168d 100644
---
a/enterprise/payara.common/src/org/netbeans/modules/payara/common/wizards/AddServerLocationVisualPanel.java
+++
b/enterprise/payara.common/src/org/netbeans/modules/payara/common/wizards/AddServerLocationVisualPanel.java
@@ -399,23 +399,23 @@ public class AddServerLocationVisualPanel extends
javax.swing.JPanel implements
.addGroup(layout.createSequentialGroup()
.addComponent(localDomainRadioButton,
javax.swing.GroupLayout.PREFERRED_SIZE, 121,
javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(17, 17, 17)
- .addComponent(remoteDomainRadioButton,
javax.swing.GroupLayout.DEFAULT_SIZE, 253, Short.MAX_VALUE))
+ .addComponent(remoteDomainRadioButton,
javax.swing.GroupLayout.PREFERRED_SIZE, 253, Short.MAX_VALUE))
.addGroup(layout.createSequentialGroup()
.addComponent(hk2HomeTextField)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(browseButton))
.addGroup(layout.createSequentialGroup()
-
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(hk2HomeLabel)
- .addComponent(chooseServerLabel)
- .addComponent(chooseServerComboBox,
javax.swing.GroupLayout.PREFERRED_SIZE, 159,
javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGap(0, 0, Short.MAX_VALUE))
- .addGroup(layout.createSequentialGroup()
.addComponent(downloadButton)
.addGap(18, 18, 18)
.addComponent(agreeCheckBox)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(readlicenseButton,
javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)))
+ .addComponent(readlicenseButton,
javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE))
+ .addGroup(layout.createSequentialGroup()
+
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING,
false)
+ .addComponent(hk2HomeLabel)
+ .addComponent(chooseServerComboBox, 0,
javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(chooseServerLabel,
javax.swing.GroupLayout.DEFAULT_SIZE, 180, Short.MAX_VALUE))
+ .addGap(0, 0, Short.MAX_VALUE)))
.addContainerGap())
);
layout.setVerticalGroup(
@@ -440,10 +440,10 @@ public class AddServerLocationVisualPanel extends
javax.swing.JPanel implements
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(agreeCheckBox)
.addComponent(downloadButton))
-
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 6,
Short.MAX_VALUE)
+
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 9,
Short.MAX_VALUE)
.addComponent(downloadStatusLabel))
.addGroup(layout.createSequentialGroup()
- .addComponent(readlicenseButton,
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(readlicenseButton)
.addGap(0, 0, Short.MAX_VALUE)))
.addContainerGap())
);
diff --git
a/enterprise/payara.common/src/org/netbeans/modules/payara/spi/ServerUtilities.java
b/enterprise/payara.common/src/org/netbeans/modules/payara/spi/ServerUtilities.java
index efd1240..810083f 100644
---
a/enterprise/payara.common/src/org/netbeans/modules/payara/spi/ServerUtilities.java
+++
b/enterprise/payara.common/src/org/netbeans/modules/payara/spi/ServerUtilities.java
@@ -40,7 +40,6 @@ import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Lookup;
-
/**
* General helper methods for accessing Payara server objects.
*
@@ -57,27 +56,21 @@ public final class ServerUtilities {
public static final String VERSION_MATCHER =
"(?:-[0-9bSNAPHOT]+(?:\\.[0-9]+(?:_[0-9]+|)|).*|).jar"; // NOI18N
public static final String GF_JAR_MATCHER = "glassfish" + VERSION_MATCHER;
// NOI18N
public static final String PROP_FIRST_RUN = "first_run";
- private PayaraInstanceProvider pip;
- private PayaraWizardProvider gwp;
+ private final PayaraInstanceProvider pip;
+ private final PayaraWizardProvider pwp;
- private ServerUtilities(PayaraInstanceProvider pip, PayaraWizardProvider
gwp) {
+ private ServerUtilities(PayaraInstanceProvider pip, PayaraWizardProvider
pwp) {
assert null != pip;
this.pip = pip;
- this.gwp = gwp;
+ this.pwp = pwp;
}
-// public static ServerUtilities getPreludeUtilities() {
-// PayaraInstanceProvider pip = PayaraInstanceProvider.getPrelude();
-// return null == pip ? null : new ServerUtilities(pip,null);
-// }
-
public static ServerUtilities getEe6Utilities() {
PayaraInstanceProvider pip = PayaraInstanceProvider.getProvider();
return null == pip ? null : new ServerUtilities(pip,
PayaraWizardProvider.createEe6());
}
-
public static ServerUtilities getEe7Utilities() {
PayaraInstanceProvider pip = PayaraInstanceProvider.getProvider();
@@ -91,12 +84,6 @@ public final class ServerUtilities {
PayaraWizardProvider.createEe8());
}
-// public static ServerUtilities getEe6WCUtilities() {
-// PayaraInstanceProvider pip = PayaraInstanceProvider.getProvider();
-// return null == pip ? null : new ServerUtilities(pip,
-// PayaraWizardProvider.createEe6WC());
-// }
-
/**
* Returns the ServerInstance object for the server with the specified URI.
*
@@ -137,7 +124,7 @@ public final class ServerUtilities {
* Returns the lookup object for a server instance when the caller only has
* the public handle available via common server API.
*
- * @param ServerInstance object for this server instance.
+ * @param instance object for this server instance.
*
* @return Lookup object maintained by backing instance implementation
*/
@@ -200,24 +187,28 @@ public final class ServerUtilities {
/**
* Returns the fqn jar name with the correct version
*
+ * @param payaraHome
+ * @param jarNamePattern
* @return the File with full path of the jar or null
*/
- public static File getJarName(String payaraInstallRoot, String
jarNamePattern) {
- return getJarName(payaraInstallRoot, jarNamePattern,
PF_MODULES_DIR_NAME);
+ public static File getJarName(String payaraHome, String jarNamePattern) {
+ return getJarName(payaraHome, jarNamePattern, PF_MODULES_DIR_NAME);
}
- public static File getJarName(String payaraInstallRoot, String
jarNamePattern, String subdirectoryName) {
- File searchDirectory = new File(payaraInstallRoot + File.separatorChar
+ subdirectoryName);
+ public static File getJarName(String payaraHome, String jarNamePattern,
String subdirectoryName) {
+ File searchDirectory = new File(payaraHome + File.separatorChar +
subdirectoryName);
return Utils.getFileFromPattern(jarNamePattern, searchDirectory);
}
/**
* Returns the fqn jar name with the correct version
*
+ * @param payaraHome
+ * @param jarNamePattern
* @return the File with full path of the jar or null
*/
- public static File getWsJarName(String payaraInstallRoot, String
jarNamePattern) {
- File modulesDir = new File(payaraInstallRoot + File.separatorChar +
PF_MODULES_DIR_NAME);
+ public static File getWsJarName(String payaraHome, String jarNamePattern) {
+ File modulesDir = new File(payaraHome + File.separatorChar +
PF_MODULES_DIR_NAME);
File retVal = Utils.getFileFromPattern(jarNamePattern, modulesDir);
if (null == retVal) {
retVal = Utils.getFileFromPattern(jarNamePattern,
diff --git
a/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/Bundle.properties
b/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/Bundle.properties
index 5db876b..0e0a69c 100644
---
a/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/Bundle.properties
+++
b/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/Bundle.properties
@@ -61,11 +61,11 @@ TITLE_QueryDebugPort=Debug Port for {0}
MSG_SERVER_PROFILING_CLUSTER_NOT_SUPPORTED=Profiling a cluster or stand-alone
instance is not supported.
-DNAME_PF_ECLIPSELINK=EclipseLink from Payara
+DNAME_PF_ECLIPSELINK=EclipseLink from Payara {0}
DESC_PF_ECLIPSELINK=EclipseLink jars that are bundled with the most recently
registered Payara installation
-DNAME_PF_COMET=Comet from Payara
+DNAME_PF_COMET=Comet from Payara {0}
DESC_PF_COMET=Comet jars that are bundled with the most recently registered
Payara installation
-DNAME_PF_JAVA_EE_IMPL=Java EE from Payara
+DNAME_PF_JAVA_EE_IMPL=Java EE from Payara {0}
DESC_PF_JAVA_EE_IMPL=Java EE jars that are bundled with the most recently
registered Payara installation
diff --git
a/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/Hk2LibraryProvider.java
b/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/Hk2LibraryProvider.java
index 51ec055..a073aec 100644
---
a/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/Hk2LibraryProvider.java
+++
b/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/Hk2LibraryProvider.java
@@ -25,6 +25,7 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
@@ -56,6 +57,7 @@ public class Hk2LibraryProvider /*implements
JaxRsStackSupportImplementation*/ {
////////////////////////////////////////////////////////////////////////////
// Class attributes
//
////////////////////////////////////////////////////////////////////////////
+ private static final Logger LOGGER = Logger.getLogger("payara-jakartaee");
/** Library provider type. */
private static final String PROVIDER_TYPE = "j2se";
@@ -65,6 +67,13 @@ public class Hk2LibraryProvider /*implements
JaxRsStackSupportImplementation*/ {
* and some common suffix is used. */
private static final String JAVAEE_NAME_SUFFIX = " Java EE";
+ /**
+ * MicroProfile library name suffix to be added after server instance name.
+ * MicroProfile library name must be unique so combination of instance name
+ * and some common suffix is used.
+ */
+ private static final String MICROPROFILE_NAME_SUFFIX = " MicroProfile";
+
/** Java EE library name suffix to be added after server instance name.
* Jersey library name must be unique so combination of instance name
* and some common suffix is used. */
@@ -77,15 +86,21 @@ public class Hk2LibraryProvider /*implements
JaxRsStackSupportImplementation*/ {
/** Java EE library name pattern to search for it in
* <code>PayaraLibrary</code> list. */
- private Pattern JAVAEE_PATTERN = Pattern.compile("[jJ]ava {0,1}[eE]{2}");
+ private final Pattern JAVAEE_PATTERN = Pattern.compile("[jJ]ava
{0,1}[eE]{2}");
+
+ /**
+ * MicroProfile library name pattern to search for it in
+ * <code>PayaraLibrary</code> list.
+ */
+ private final Pattern MICROPROFILE_PATTERN =
Pattern.compile("[mM]icro[pP]rofile");
/** Jersey library name pattern to search for it in
* <code>PayaraLibrary</code> list. */
- private Pattern JERSEY_PATTERN = Pattern.compile("[jJ]ersey.*");
+ private final Pattern JERSEY_PATTERN = Pattern.compile("[jJ]ersey.*");
/** JAX-RS library name pattern to search for it in
* <code>PayaraLibrary</code> list. */
- private Pattern JAXRS_PATTERN
+ private final Pattern JAXRS_PATTERN
= Pattern.compile("[jJ][aA][xX][ -]{0,1}[rR][sS]");
/** Code base for file locator. */
@@ -146,6 +161,13 @@ public class Hk2LibraryProvider /*implements
JaxRsStackSupportImplementation*/ {
* outside {@see #getJavaEEName()} method! */
private volatile String javaEEName = null;
+ /**
+ * MicroProfile library name associated with current Payara server context.
+ * This is lazy initialized internal cache. Do not access this attribute
+ * outside {@see #getMicroProfileName()} method!
+ */
+ private volatile String microProfileName = null;
+
/** Jersey library name associated with current Payara server context.
* This is lazy initialized internal cache. Do not access this attribute
* outside {@see #getJerseyName()} method! */
@@ -203,6 +225,29 @@ public class Hk2LibraryProvider /*implements
JaxRsStackSupportImplementation*/ {
}
/**
+ * Get MicroProfile library name for this server context.
+ * <p/>
+ * This library name shall be registered in default {@see LibraryManager}
+ * and is unique for MicroProfile modules of given Payara
+ * server instance. Library name is cached after first usage.
+ * <p/>
+ * @return MicroProfile library name for this server context.
+ */
+ public String getMicroProfileName() {
+ if (microProfileName != null) {
+ return microProfileName;
+ }
+ synchronized (this) {
+ StringBuilder sb = new StringBuilder(
+ serverName.length() + MICROPROFILE_NAME_SUFFIX.length());
+ sb.append(serverName);
+ sb.append(MICROPROFILE_NAME_SUFFIX);
+ microProfileName = sb.toString();
+ }
+ return microProfileName;
+ }
+
+ /**
* Get Jersey library name for this server context.
* <p/>
* This library name shall be registered in default {@see LibraryManager}
@@ -311,12 +356,21 @@ public class Hk2LibraryProvider /*implements
JaxRsStackSupportImplementation*/ {
/**
* Return Java EE libraries available in Payara.
* <p/>
- * @return Java EE libraries available in Payara\.
+ * @return Java EE libraries available in Payara.
*/
public Library getJavaEELibrary() {
return getLibrary(JAVAEE_PATTERN, getJavaEEName());
}
+ /**
+ * Return MicroProfile libraries available in Payara.
+ * <p/>
+ * @return MicroProfile libraries available in Payara.
+ */
+ public Library getMicroProfileLibrary() {
+ return getLibrary(MICROPROFILE_PATTERN, getMicroProfileName());
+ }
+
/**
* Set {@see LibraryImplementation} content for Java EE libraries
* available in Payara.
@@ -339,6 +393,15 @@ public class Hk2LibraryProvider /*implements
JaxRsStackSupportImplementation*/ {
}
/**
+ * Get {@see List} of class path {@see URL}s for MicroProfile libraries.
+ * <p/>
+ * @return {@see List} of class path {@see URL}s for MicroProfile
libraries.
+ */
+ public List<URL> getMicroProfileClassPathURLs() {
+ return getLibraryClassPathURLs(MICROPROFILE_PATTERN);
+ }
+
+ /**
* Return libraries available in Payara.
* <p/>
* @param namePattern Library name pattern to search for it in
@@ -355,9 +418,8 @@ public class Hk2LibraryProvider /*implements
JaxRsStackSupportImplementation*/ {
List<PayaraLibrary> gfLibs = cb.getLibraries(server.getVersion());
for (PayaraLibrary gfLib : gfLibs) {
if (namePattern.matcher(gfLib.getLibraryID()).matches()) {
- Map<String,List<URL>> contents
- = new HashMap<String, List<URL>>(1);
- Map<String, String> properties = new HashMap<String,
String>(2);
+ Map<String,List<URL>> contents = new HashMap<>(1);
+ Map<String, String> properties = new HashMap<>(2);
contents.put("classpath",
translateArchiveUrls(gfLib.getClasspath()));
contents.put("javadoc",
translateArchiveUrls(gfLib.getJavadocs()));
properties.put("maven-dependencies", gfLib.getMavenDeps());
@@ -371,7 +433,7 @@ public class Hk2LibraryProvider /*implements
JaxRsStackSupportImplementation*/ {
contents,
properties);
} catch (IOException ioe) {
- Logger.getLogger("payara-jakartaee").log(Level.WARNING,
+ LOGGER.log(Level.WARNING,
"Could not create Jersey library for "
+ serverName + ": ", ioe);
}
@@ -391,14 +453,14 @@ public class Hk2LibraryProvider /*implements
JaxRsStackSupportImplementation*/ {
private void setLibraryImplementationContent(LibraryImplementation lib,
Pattern namePattern, String libraryName) {
ConfigBuilder cb = ConfigBuilderProvider.getBuilder(server);
- List<PayaraLibrary> gfLibs = cb.getLibraries(server.getVersion());
- for (PayaraLibrary gfLib : gfLibs) {
- if (namePattern.matcher(gfLib.getLibraryID()).matches()) {
- List<String> javadocLookups = gfLib.getJavadocLookups();
+ List<PayaraLibrary> pfLibs = cb.getLibraries(server.getVersion());
+ for (PayaraLibrary pfLib : pfLibs) {
+ if (namePattern.matcher(pfLib.getLibraryID()).matches()) {
+ List<String> javadocLookups = pfLib.getJavadocLookups();
lib.setName(libraryName);
// Build class path
- List<URL> cp = new ArrayList<URL>();
- for (URL url : gfLib.getClasspath()) {
+ List<URL> cp = new ArrayList<>();
+ for (URL url : pfLib.getClasspath()) {
if (FileUtil.isArchiveFile(url)) {
cp.add(FileUtil.getArchiveRoot(url));
} else {
@@ -406,7 +468,7 @@ public class Hk2LibraryProvider /*implements
JaxRsStackSupportImplementation*/ {
}
}
// Build java docs
- List<URL> javadoc = new ArrayList<URL>();
+ List<URL> javadoc = new ArrayList<>();
if (javadocLookups != null) {
for (String lookup : javadocLookups) {
try {
@@ -439,10 +501,10 @@ public class Hk2LibraryProvider /*implements
JaxRsStackSupportImplementation*/ {
*/
private List<URL> getLibraryClassPathURLs(Pattern namePattern) {
ConfigBuilder cb = ConfigBuilderProvider.getBuilder(server);
- List<PayaraLibrary> gfLibs = cb.getLibraries(server.getVersion());
- for (PayaraLibrary gfLib : gfLibs) {
- if (namePattern.matcher(gfLib.getLibraryID()).matches()) {
- return gfLib.getClasspath();
+ List<PayaraLibrary> pfLibs = cb.getLibraries(server.getVersion());
+ for (PayaraLibrary pfLib : pfLibs) {
+ if (namePattern.matcher(pfLib.getLibraryID()).matches()) {
+ return pfLib.getClasspath();
}
}
return Collections.<URL>emptyList();
diff --git
a/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/JavaEEServerModuleFactory.java
b/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/JavaEEServerModuleFactory.java
index 483f637..052813b 100644
---
a/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/JavaEEServerModuleFactory.java
+++
b/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/JavaEEServerModuleFactory.java
@@ -42,12 +42,10 @@ import org.netbeans.modules.payara.spi.ServerUtilities;
import
org.netbeans.modules.j2ee.deployment.plugins.api.InstanceCreationException;
import org.netbeans.spi.project.libraries.LibraryTypeProvider;
import org.netbeans.spi.project.libraries.support.LibrariesSupport;
-import org.openide.filesystems.FileUtil;
import org.openide.modules.InstalledFileLocator;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
import org.openide.util.RequestProcessor;
-import org.openide.util.Utilities;
/**
*
@@ -55,6 +53,8 @@ import org.openide.util.Utilities;
*/
public class JavaEEServerModuleFactory implements PayaraModuleFactory {
+ private static final Logger LOGGER = Logger.getLogger("payara-jakartaee");
+
private static final JavaEEServerModuleFactory singleton = new
JavaEEServerModuleFactory();
private JavaEEServerModuleFactory() {
@@ -100,24 +100,21 @@ public class JavaEEServerModuleFactory implements
PayaraModuleFactory {
// exception
ip = InstanceProperties.getInstanceProperties(url);
if (null == ip) {
-
Logger.getLogger("payara-jakartaee").log(Level.WARNING, null, ex); // NOI18N
+ LOGGER.log(Level.WARNING, null, ex); // NOI18N
}
}
if(ip == null) {
- Logger.getLogger("payara-jakartaee").log(Level.INFO,
"Unable to create/locate J2EE InstanceProperties for {0}", url);
+ LOGGER.log(Level.INFO, "Unable to create/locate J2EE
InstanceProperties for {0}", url);
}
}
- final String payaraRoot = commonModule.getInstanceProperties().get(
- PayaraModule.PAYARA_FOLDER_ATTR);
final String installRoot =
commonModule.getInstanceProperties().get(
PayaraModule.INSTALL_FOLDER_ATTR);
RP.post(new Runnable() {
@Override
public void run() {
- ensureEclipseLinkSupport(payaraRoot);
- ensureCometSupport(payaraRoot);
+ ensureEclipseLinkSupport(commonModule.getInstance());
ensurePayaraApiSupport(commonModule.getInstance());
// lookup the javadb register service here and use it.
RegisteredDerbyServer db =
Lookup.getDefault().lookup(RegisteredDerbyServer.class);
@@ -131,7 +128,7 @@ public class JavaEEServerModuleFactory implements
PayaraModuleFactory {
}
});
} else {
- Logger.getLogger("payara-jakartaee").log(Level.WARNING,
"commonModule is NULL");
+ LOGGER.log(Level.WARNING, "commonModule is NULL");
}
return (ip != null) ? new JavaEEServerModule(instanceLookup, ip) :
null;
@@ -139,11 +136,9 @@ public class JavaEEServerModuleFactory implements
PayaraModuleFactory {
private static final String CLASS_LIBRARY_TYPE = "j2se"; // NOI18N
private static final String CLASSPATH_VOLUME = "classpath"; // NOI18N
- private static final String SOURCE_VOLUME = "src"; // NOI18N
private static final String JAVADOC_VOLUME = "javadoc"; // NOI18N
- private static final String ECLIPSE_LINK_LIB =
"EclipseLink-GlassFish-v3-Prelude"; // NOI18N
- private static final String ECLIPSE_LINK_LIB_2 =
"EclipseLink-GlassFish-v3"; // NOI18N
+ private static final String ECLIPSE_LINK_LIB = "EclipseLink-GlassFish-v";
// NOI18N
private static final String EL_CORE_JAR_MATCHER = "eclipselink-wrapper" +
ServerUtilities.VERSION_MATCHER; // NOI18N
private static final String PERSISTENCE_API_JAR_MATCHER_1 = "javax.javaee"
+ ServerUtilities.VERSION_MATCHER; // NOI18N
@@ -151,26 +146,27 @@ public class JavaEEServerModuleFactory implements
PayaraModuleFactory {
private static final String PERSISTENCE_JAVADOC = "javaee-doc-api.jar"; //
NOI18N
- private static boolean ensureEclipseLinkSupport(String installRoot) {
+ private static boolean ensureEclipseLinkSupport(PayaraServer server) {
+ String payaraHome = server.getServerHome();
List<URL> libraryList = new ArrayList<URL>();
List<URL> docList = new ArrayList<URL>();
try {
- File f = ServerUtilities.getJarName(installRoot,
EL_CORE_JAR_MATCHER);
+ File f = ServerUtilities.getJarName(payaraHome,
EL_CORE_JAR_MATCHER);
if (f != null && f.exists()) {
libraryList.add(ServerUtilities.fileToUrl(f));
} else {// we are in the final V3 Prelude jar name structure
// find the org.eclipse.persistence*.jar files and add them
- for (File candidate : new File(installRoot,
"modules").listFiles()) {// NOI18N
+ for (File candidate : new File(payaraHome,
"modules").listFiles()) {// NOI18N
if (candidate.getName().indexOf("org.eclipse.persistence")
!= -1) {// NOI18N
libraryList.add(ServerUtilities.fileToUrl(candidate));
}
}
}
- f = ServerUtilities.getJarName(installRoot,
PERSISTENCE_API_JAR_MATCHER_1);
+ f = ServerUtilities.getJarName(payaraHome,
PERSISTENCE_API_JAR_MATCHER_1);
if (f != null && f.exists()) {
libraryList.add(ServerUtilities.fileToUrl(f));
} else {
- f = ServerUtilities.getJarName(installRoot,
PERSISTENCE_API_JAR_MATCHER_2);
+ f = ServerUtilities.getJarName(payaraHome,
PERSISTENCE_API_JAR_MATCHER_2);
if (f != null && f.exists()) {
libraryList.add(ServerUtilities.fileToUrl(f));
}
@@ -182,67 +178,33 @@ public class JavaEEServerModuleFactory implements
PayaraModuleFactory {
if (j2eeDoc != null) {
docList.add(ServerUtilities.fileToUrl(j2eeDoc));
} else {
- Logger.getLogger("payara-jakartaee").log(Level.WARNING,
"Warning: Java EE documentation not found when registering EclipseLink
library.");
+ LOGGER.log(Level.WARNING, "Warning: Java EE documentation not
found when registering EclipseLink library.");
}
} catch (MalformedURLException ex) {
- Logger.getLogger("payara-jakartaee").log(Level.WARNING,
ex.getLocalizedMessage(), ex);
+ LOGGER.log(Level.WARNING, ex.getLocalizedMessage(), ex);
return false;
}
- String name = ECLIPSE_LINK_LIB;
- File f = ServerUtilities.getJarName(installRoot, "gmbal" +
ServerUtilities.VERSION_MATCHER);
- if (f != null && f.exists()) {
- name = ECLIPSE_LINK_LIB_2;
- }
- return addLibrary(name, libraryList, docList,
- NbBundle.getMessage(JavaEEServerModuleFactory.class,
"DNAME_PF_ECLIPSELINK"), // NOI18N
+ return addLibrary(ECLIPSE_LINK_LIB + server.getVersion().getMajor(),
libraryList, docList,
+ NbBundle.getMessage(JavaEEServerModuleFactory.class,
"DNAME_PF_ECLIPSELINK", server.getVersion().getMajor()), // NOI18N
NbBundle.getMessage(JavaEEServerModuleFactory.class,
"DESC_PF_ECLIPSELINK")); // NOI18N
}
- private static final String COMET_LIB = "Comet-GlassFish-v3-Prelude"; //
NOI18N
- private static final String COMET_LIB_2 = "Comet-GlassFish-v3"; // NOI18N
- private static final String COMET_JAR_MATCHER = "grizzly-module" +
ServerUtilities.VERSION_MATCHER; // NOI18N
- private static final String COMET_JAR_2_MATCHER = "grizzly-comet" +
ServerUtilities.VERSION_MATCHER; // NOI18N
- private static final String GRIZZLY_OPTIONAL_JAR_MATCHER =
"grizzly-optional" + ServerUtilities.VERSION_MATCHER; // NOI18N
-
- private static boolean ensureCometSupport(String installRoot) {
- List<URL> libraryList = new ArrayList<>();
- String name = COMET_LIB;
- File f = ServerUtilities.getJarName(installRoot,
GRIZZLY_OPTIONAL_JAR_MATCHER);
- if (f == null || !f.exists()) {
- f = ServerUtilities.getJarName(installRoot, COMET_JAR_MATCHER);
- }
- if (f == null || !f.exists()) {
- name = COMET_LIB_2;
- f = ServerUtilities.getJarName(installRoot, COMET_JAR_2_MATCHER);
- }
- if (f != null && f.exists()) {
- try {
- libraryList.add(ServerUtilities.fileToUrl(f));
- } catch (MalformedURLException ex) {
- Logger.getLogger("payara-jakartaee").log(Level.WARNING,
ex.getLocalizedMessage(), ex);
- return false;
- }
- }
- return addLibrary(name, libraryList, null,
- NbBundle.getMessage(JavaEEServerModuleFactory.class,
"DNAME_PF_COMET"), // NOI18N
- NbBundle.getMessage(JavaEEServerModuleFactory.class,
"DESC_PF_COMET")); // NOI18N
- }
-
- private static final String[] JAXRS_LIBRARIES
- = {"jackson-asl", "jackson-core-asl", "jersey-bundle",
"jersey-gf-bundle", "jersey-multipart", "jettison", "mimepull", "jsr311-api"};
//NOI18N
private static final String[] PAYARA_LIBRARIES
= {"web-core", "payara-api"}; //NOI18N
- private static final String JAVA_EE_7_LIB = "Java-EE-Payara-v4"; // NOI18N
+ private static final String JAVA_EE_LIB = "Java-EE-Payara-v"; // NOI18N
private static final String JAVA_EE_JAVADOC = "javaee-doc-api.jar"; //
NOI18N
private static boolean ensurePayaraApiSupport(PayaraServer server) {
- String installRoot = server.getServerRoot();
- List<URL> libraryList =
Hk2LibraryProvider.getProvider(server).getJavaEEClassPathURLs();
- List<URL> docList = new ArrayList<>();
- String name = JAVA_EE_7_LIB;
+ String payaraHome = server.getServerHome();
+ Hk2LibraryProvider provider = Hk2LibraryProvider.getProvider(server);
+ List<URL> libraryList = new ArrayList<>();
+ libraryList.addAll(provider.getJavaEEClassPathURLs());
+ libraryList.addAll(provider.getMicroProfileClassPathURLs());
+ libraryList.addAll(provider.getJerseyClassPathURLs());
+ List<URL> docList = new ArrayList<>();
File j2eeDoc = InstalledFileLocator.getDefault().locate(
"docs/" + JAVA_EE_JAVADOC,
Hk2LibraryProvider.JAVAEE_DOC_CODE_BASE, false);
@@ -250,35 +212,25 @@ public class JavaEEServerModuleFactory implements
PayaraModuleFactory {
try {
docList.add(ServerUtilities.fileToUrl(j2eeDoc));
} catch (MalformedURLException ex) {
- Logger.getLogger("payara-jakartaee").log(Level.INFO, "Problem
while registering Java EE API library JavaDoc."); // NOI18N
+ LOGGER.log(Level.INFO, "Problem while registering Java EE API
library JavaDoc."); // NOI18N
}
} else {
- Logger.getLogger("payara-jakartaee").log(Level.INFO, "Java EE
documentation not found when registering Java EE API library."); // NOI18N
+ LOGGER.log(Level.INFO, "Java EE documentation not found when
registering Java EE API library."); // NOI18N
}
for (String entry : PAYARA_LIBRARIES) {
- File f = ServerUtilities.getJarName(installRoot, entry +
ServerUtilities.VERSION_MATCHER);
+ File f = ServerUtilities.getJarName(payaraHome, entry +
ServerUtilities.VERSION_MATCHER);
if (f != null && f.exists()) {
try {
libraryList.add(ServerUtilities.fileToUrl(f));
} catch (MalformedURLException ex) {
- Logger.getLogger("payara-jakartaee").log(Level.INFO,
"Problem while registering web-core into Payara API library."); // NOI18N
+ LOGGER.log(Level.INFO, "Problem while registering web-core
into Payara API library."); // NOI18N
}
}
}
- for (String entry : JAXRS_LIBRARIES) {
- File f = ServerUtilities.getJarName(installRoot, entry +
ServerUtilities.VERSION_MATCHER);
- if ((f != null) && (f.exists())) {
- try {
- libraryList.add(
-
FileUtil.getArchiveRoot(Utilities.toURI(f).toURL()));
- } catch (MalformedURLException ex) {
- }
- }
- }
- return addLibrary(name, libraryList, docList,
- NbBundle.getMessage(JavaEEServerModuleFactory.class,
"DNAME_PF_JAVA_EE_IMPL"), // NOI18N
+ return addLibrary(JAVA_EE_LIB + server.getVersion().getMajor(),
libraryList, docList,
+ NbBundle.getMessage(JavaEEServerModuleFactory.class,
"DNAME_PF_JAVA_EE_IMPL", server.getVersion().getMajor()), // NOI18N
NbBundle.getMessage(JavaEEServerModuleFactory.class,
"DESC_PF_JAVA_EE_IMPL")); // NOI18N
}
@@ -286,8 +238,9 @@ public class JavaEEServerModuleFactory implements
PayaraModuleFactory {
return addLibrary(name, CLASS_LIBRARY_TYPE, libraryList, docList,
displayName, description);
}
- private synchronized static boolean addLibrary(String name, String
libType, List<URL> libraryList, List<URL> docList, String displayName,
- String description) {
+ private synchronized static boolean addLibrary(
+ String name, String libType, List<URL> libraryList,
+ List<URL> docList, String displayName, String description) {
LibraryManager lmgr = LibraryManager.getDefault();
int size = 0;
@@ -305,11 +258,11 @@ public class JavaEEServerModuleFactory implements
PayaraModuleFactory {
libPath = libPath.substring(5);
}
if (!new File(libPath.replace("!/", "")).exists()) {
- Logger.getLogger("payara-jakartaee").log(Level.FINE,
"libPath does not exist. Updating {0}", name);
+ LOGGER.log(Level.FINE, "libPath does not exist. Updating
{0}", name);
try {
lmgr.removeLibrary(lib);
} catch (IOException ex) {
- Logger.getLogger("payara-jakartaee").log(Level.INFO,
ex.getLocalizedMessage(), ex);
+ LOGGER.log(Level.INFO, ex.getLocalizedMessage(), ex);
} catch (IllegalArgumentException ex) {
// Already removed somehow, ignore.
}
@@ -326,7 +279,7 @@ public class JavaEEServerModuleFactory implements
PayaraModuleFactory {
try {
lmgr.removeLibrary(lib);
} catch (IOException ex) {
- Logger.getLogger("payara-jakartaee").log(Level.INFO,
ex.getLocalizedMessage(), ex);
+ LOGGER.log(Level.INFO, ex.getLocalizedMessage(), ex);
} catch (IllegalArgumentException ex) {
// Already removed somehow, ignore.
}
@@ -343,11 +296,11 @@ public class JavaEEServerModuleFactory implements
PayaraModuleFactory {
libPath = libPath.substring(5);
}
if (!new File(libPath.replace("!/", "")).exists()) {
- Logger.getLogger("payara-jakartaee").log(Level.FINE,
"libPath does not exist. Updating {0}", name);
+ LOGGER.log(Level.FINE, "libPath does not exist. Updating
{0}", name);
try {
lmgr.removeLibrary(lib);
} catch (IOException ex) {
- Logger.getLogger("payara-jakartaee").log(Level.INFO,
ex.getLocalizedMessage(), ex);
+ LOGGER.log(Level.INFO, ex.getLocalizedMessage(), ex);
} catch (IllegalArgumentException ex) {
// Already removed somehow, ignore.
}
@@ -364,7 +317,7 @@ public class JavaEEServerModuleFactory implements
PayaraModuleFactory {
try {
lmgr.removeLibrary(lib);
} catch (IOException ex) {
- Logger.getLogger("payara-jakartaee").log(Level.INFO,
ex.getLocalizedMessage(), ex);
+ LOGGER.log(Level.INFO, ex.getLocalizedMessage(), ex);
} catch (IllegalArgumentException ex) {
// Already removed somehow, ignore.
}
@@ -385,16 +338,16 @@ public class JavaEEServerModuleFactory implements
PayaraModuleFactory {
LibraryTypeProvider ltp =
LibrariesSupport.getLibraryTypeProvider(libType);
if (null != ltp) {
lib = lmgr.createLibrary(libType, name, displayName,
description, contents);
- Logger.getLogger("payara-jakartaee").log(Level.FINE,
"Created library {0}", name);
+ LOGGER.log(Level.FINE, "Created library {0}", name);
} else {
lmgr.addPropertyChangeListener(new InitializeLibrary(lmgr,
libType, name, contents, displayName, description));
- Logger.getLogger("payara-jakartaee").log(Level.FINE,
"schedule to create library {0}", name);
+ LOGGER.log(Level.FINE, "schedule to create library {0}",
name);
}
} catch (IOException | IllegalArgumentException ex) {
// Someone must have created the library in a parallel thread,
try again otherwise fail.
lib = lmgr.getLibrary(name);
if (lib == null) {
- Logger.getLogger("payara-jakartaee").log(Level.INFO,
ex.getLocalizedMessage(), ex);
+ LOGGER.log(Level.INFO, ex.getLocalizedMessage(), ex);
}
}
// Someone must have created the library in a parallel thread, try
again otherwise fail.
@@ -433,11 +386,11 @@ public class JavaEEServerModuleFactory implements
PayaraModuleFactory {
LibraryTypeProvider ltp =
LibrariesSupport.getLibraryTypeProvider(libType);
if (null != ltp) {
lmgr.createLibrary(libType, name, displayName,
description, content);
-
Logger.getLogger("payara-jakartaee").log(Level.FINE, "Created library {0}",
name);
+ LOGGER.log(Level.FINE, "Created library {0}",
name);
removeFromListenerList(pcl);
}
} catch (IOException | IllegalArgumentException ex) {
-
Logger.getLogger("payara-jakartaee").log(Level.INFO,
+ LOGGER.log(Level.INFO,
ex.getLocalizedMessage(), ex);
}
} else {
diff --git
a/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/VersionRepository.java
b/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/VersionRepository.java
index eee3e13..9d559e0 100644
---
a/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/VersionRepository.java
+++
b/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/VersionRepository.java
@@ -33,6 +33,7 @@ public class VersionRepository {
private static final List<MicroVersion> MICRO_VERSIONS = new ArrayList<>();
private VersionRepository() {
+ MICRO_VERSIONS.add(new MicroVersion("5.193", "8.0"));
MICRO_VERSIONS.add(new MicroVersion("5.192", "8.0"));
MICRO_VERSIONS.add(new MicroVersion("5.191", "8.0"));
MICRO_VERSIONS.add(new MicroVersion("5.184", "8.0"));
diff --git
a/enterprise/payara.tooling/nbproject/org-netbeans-modules-payara-tooling.sig
b/enterprise/payara.tooling/nbproject/org-netbeans-modules-payara-tooling.sig
index 50ddbb4..af4f229 100644
---
a/enterprise/payara.tooling/nbproject/org-netbeans-modules-payara-tooling.sig
+++
b/enterprise/payara.tooling/nbproject/org-netbeans-modules-payara-tooling.sig
@@ -1421,6 +1421,7 @@ fld public final static
org.netbeans.modules.payara.tooling.data.PayaraVersion P
fld public final static org.netbeans.modules.payara.tooling.data.PayaraVersion
PF_5_184
fld public final static org.netbeans.modules.payara.tooling.data.PayaraVersion
PF_5_191
fld public final static org.netbeans.modules.payara.tooling.data.PayaraVersion
PF_5_192
+fld public final static org.netbeans.modules.payara.tooling.data.PayaraVersion
PF_5_193
meth public boolean
equals(org.netbeans.modules.payara.tooling.data.PayaraVersion)
meth public boolean
equalsMajorMinor(org.netbeans.modules.payara.tooling.data.PayaraVersion)
meth public java.lang.String toFullString()
@@ -1441,7 +1442,7 @@ meth public static
org.netbeans.modules.payara.tooling.data.PayaraVersion toValu
meth public static org.netbeans.modules.payara.tooling.data.PayaraVersion
valueOf(java.lang.String)
meth public static org.netbeans.modules.payara.tooling.data.PayaraVersion[]
values()
supr java.lang.Enum<org.netbeans.modules.payara.tooling.data.PayaraVersion>
-hfds
PF_4_1_144_STR,PF_4_1_144_STR_NEXT,PF_4_1_151_STR,PF_4_1_151_STR_NEXT,PF_4_1_152_STR,PF_4_1_152_STR_NEXT,PF_4_1_153_STR,PF_4_1_153_STR_NEXT,PF_4_1_1_154_STR,PF_4_1_1_154_STR_NEXT,PF_4_1_1_161_STR,PF_4_1_1_161_STR_NEXT,PF_4_1_1_162_STR,PF_4_1_1_162_STR_NEXT,PF_4_1_1_163_STR,PF_4_1_1_163_STR_NEXT,PF_4_1_1_164_STR,PF_4_1_1_164_STR_NEXT,PF_4_1_1_171_STR,PF_4_1_1_171_STR_NEXT,PF_4_1_2_172_STR,PF_4_1_2_172_STR_NEXT,PF_4_1_2_173_STR,PF_4_1_2_173_STR_NEXT,PF_4_1_2_174_STR,PF_4_1_2_174_STR_N
[...]
+hfds
PF_4_1_144_STR,PF_4_1_144_STR_NEXT,PF_4_1_151_STR,PF_4_1_151_STR_NEXT,PF_4_1_152_STR,PF_4_1_152_STR_NEXT,PF_4_1_153_STR,PF_4_1_153_STR_NEXT,PF_4_1_1_154_STR,PF_4_1_1_154_STR_NEXT,PF_4_1_1_161_STR,PF_4_1_1_161_STR_NEXT,PF_4_1_1_162_STR,PF_4_1_1_162_STR_NEXT,PF_4_1_1_163_STR,PF_4_1_1_163_STR_NEXT,PF_4_1_1_164_STR,PF_4_1_1_164_STR_NEXT,PF_4_1_1_171_STR,PF_4_1_1_171_STR_NEXT,PF_4_1_2_172_STR,PF_4_1_2_172_STR_NEXT,PF_4_1_2_173_STR,PF_4_1_2_173_STR_NEXT,PF_4_1_2_174_STR,PF_4_1_2_174_STR_N
[...]
CLSS public abstract interface
org.netbeans.modules.payara.tooling.data.StartupArgs
meth public abstract java.lang.String getJavaHome()
diff --git
a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/admin/AdminFactory.java
b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/admin/AdminFactory.java
index 7dce7d9..f639792 100644
---
a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/admin/AdminFactory.java
+++
b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/admin/AdminFactory.java
@@ -80,6 +80,7 @@ public abstract class AdminFactory {
case PF_5_184:
case PF_5_191:
case PF_5_192:
+ case PF_5_193:
return AdminFactoryRest.getInstance();
// Anything else is not unknown.
default:
diff --git
a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/data/PayaraVersion.java
b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/data/PayaraVersion.java
index d775dcc..4944b1e 100644
---
a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/data/PayaraVersion.java
+++
b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/data/PayaraVersion.java
@@ -77,7 +77,9 @@ public enum PayaraVersion {
/** Payara 5.191 */
PF_5_191 ((short) 5, (short) 0, (short) 0, (short) 0, (short) 19, (short)
1, (short) 0, PayaraVersion.PF_5_191_STR),
/** Payara 5.192 */
- PF_5_192 ((short) 5, (short) 0, (short) 0, (short) 0, (short) 19, (short)
2, (short) 0, PayaraVersion.PF_5_192_STR);
+ PF_5_192 ((short) 5, (short) 0, (short) 0, (short) 0, (short) 19, (short)
2, (short) 0, PayaraVersion.PF_5_192_STR),
+ /** Payara 5.193 */
+ PF_5_193 ((short) 5, (short) 0, (short) 0, (short) 0, (short) 19, (short)
3, (short) 0, PayaraVersion.PF_5_193_STR);
//add new version
/** A <code>String</code> representation of PF_4_1_144 value. */
@@ -160,8 +162,12 @@ public enum PayaraVersion {
static final String PF_5_192_STR = "5.192";
/** Additional <code>String</code> representations of 5.192 value. */
static final String PF_5_192_STR_NEXT[] = {"5.192.0"};
+ /** A <code>String</code> representation of PF_5_193 value. */
+ static final String PF_5_193_STR = "5.193";
+ /** Additional <code>String</code> representations of 5.193 value. */
+ static final String PF_5_193_STR_NEXT[] = {"5.193.0"};
+
-
////////////////////////////////////////////////////////////////////////////
// Class attributes
//
////////////////////////////////////////////////////////////////////////////
@@ -209,6 +215,7 @@ public enum PayaraVersion {
initStringValuesMapFromArray(PF_5_184, PF_5_184_STR_NEXT);
initStringValuesMapFromArray(PF_5_191, PF_5_191_STR_NEXT);
initStringValuesMapFromArray(PF_5_192, PF_5_192_STR_NEXT);
+ initStringValuesMapFromArray(PF_5_193, PF_5_193_STR_NEXT);
}
////////////////////////////////////////////////////////////////////////////
diff --git
a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/config/PayaraV4.xml
b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/config/PayaraV4.xml
index f65b50b..1d66175 100644
---
a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/config/PayaraV4.xml
+++
b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/config/PayaraV4.xml
@@ -55,6 +55,7 @@ under the License.
<include name="jaxrpc-api-osgi.jar"/>
<include name="webservices-osgi.jar"/>
<include name="weld-osgi-bundle.jar"/>
+ <include name="mimepull.+\.jar"/>
</fileset>
<fileset dir="modules/endorsed">
<include name=".+\.jar"/>
diff --git
a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/config/PayaraV5.xml
b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/config/PayaraV5.xml
index f413c99..3963bb3 100644
---
a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/config/PayaraV5.xml
+++
b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/config/PayaraV5.xml
@@ -56,6 +56,7 @@ under the License.
<include name="jaxrpc-api-osgi.jar"/>
<include name="webservices-osgi.jar"/>
<include name="weld-osgi-bundle.jar"/>
+ <include name="mimepull.+\.jar"/>
</fileset>
<fileset dir="modules/endorsed">
<include name=".+\.jar"/>
diff --git
a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/config/PayaraV5_192.xml
b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/config/PayaraV5_192.xml
index ba7de9f..39ab275 100644
---
a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/config/PayaraV5_192.xml
+++
b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/config/PayaraV5_192.xml
@@ -50,11 +50,10 @@ under the License.
<classpath>
<fileset dir="modules">
<include name="javax\..+\.jar"/>
- <include name="bean-validator.jar"/>
+ <include name="jakarta\..+\.jar"/>
+ <include name="hibernate-validator.jar"/>
<include name="cdi-api.jar"/>
<include name="jaxb-osgi.jar"/>
- <include name="jaxr-api-osgi.jar"/>
- <include name="jaxrpc-api-osgi.jar"/>
<include name="webservices-osgi.jar"/>
<include name="weld-osgi-bundle.jar"/>
</fileset>
@@ -68,6 +67,17 @@ under the License.
<sources>
</sources>
</library>
+ <library id="MicroProfile">
+ <classpath>
+ <fileset dir="modules">
+ <include name="microprofile.*\-api.jar"/>
+ </fileset>
+ </classpath>
+ <javadocs>
+ </javadocs>
+ <sources>
+ </sources>
+ </library>
<library id="Jersey 2">
<classpath>
<fileset dir="modules">
@@ -76,10 +86,11 @@ under the License.
<!-- include name="javax.ws.+\.jar"/ -->
<include name="jersey.+\.jar"/>
<include name="jettison.*\.jar"/>
+ <include name="mimepull.+\.jar"/>
</fileset>
</classpath>
<javadocs>
- <link
url="http://repo1.maven.org/maven2/org/glassfish/jersey/jersey-documentation/2.0-m05-2/jersey-documentation-2.0-m05-2-docbook.zip"/>
+ <link
url="http://repo1.maven.org/maven2/org/glassfish/jersey/jersey-documentation/2.9.1/jersey-documentation-2.9.1-docbook.zip"/>
</javadocs>
<sources>
</sources>
@@ -87,7 +98,7 @@ under the License.
<library id="JAX-RS">
<classpath>
<fileset dir="modules">
- <include name="javax.ws.rs-api.jar"/>
+ <include name=".+\.ws.rs-api.jar"/>
</fileset>
</classpath>
<javadocs>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
