You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jg...@apache.org on 2019/12/16 09:39:39 UTC
[netbeans] branch master updated: NETBEANS-3584 Payara Platform
5.194/5.201 support in Apache NetBeans IDE
This is an automated email from the ASF dual-hosted git repository.
jgauravgupta 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 c5f509b NETBEANS-3584 Payara Platform 5.194/5.201 support in Apache NetBeans IDE
new f4b48e1 Merge pull request #1772 from jGauravGupta/NETBEANS-3584
c5f509b is described below
commit c5f509b72acd1d314383736248e91f7ac21158f3
Author: Gaurav Gupta <ga...@gmail.com>
AuthorDate: Thu Dec 12 14:22:17 2019 +0530
NETBEANS-3584 Payara Platform 5.194/5.201 support in Apache NetBeans IDE
Signed-off-by: Gaurav Gupta <ga...@gmail.com>
---
.../org-netbeans-modules-payara-common.sig | 2 ++
.../modules/payara/common/Bundle.properties | 2 ++
.../modules/payara/common/ServerDetails.java | 31 ++++++++++++++++++++--
.../payara/micro/project/VersionRepository.java | 1 +
.../org-netbeans-modules-payara-tooling.sig | 4 ++-
.../modules/payara/tooling/admin/AdminFactory.java | 2 ++
.../modules/payara/tooling/data/PayaraVersion.java | 16 ++++++++++-
7 files changed, 54 insertions(+), 4 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 758b0ab..e0057fb 100644
--- a/enterprise/payara.common/nbproject/org-netbeans-modules-payara-common.sig
+++ b/enterprise/payara.common/nbproject/org-netbeans-modules-payara-common.sig
@@ -1520,6 +1520,8 @@ fld public final static org.netbeans.modules.payara.common.ServerDetails PAYARA_
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
+fld public final static org.netbeans.modules.payara.common.ServerDetails PAYARA_SERVER_5_194
+fld public final static org.netbeans.modules.payara.common.ServerDetails PAYARA_SERVER_5_201
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 a48096e..5195229 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
@@ -158,6 +158,8 @@ 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
+STR_5194_SERVER_NAME=Payara Server 5.194
+STR_5201_SERVER_NAME=Payara Server 5.201
# 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 04086e3..870ace8 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
@@ -244,7 +244,27 @@ public enum ServerDetails {
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
+ "https://oss.sonatype.org/service/local/repositories/releases/content/fish/payara/distributions/payara/5.193.1/payara-5.193.1.zip", // NOI18N
+ null,
+ "https://raw.githubusercontent.com/payara/Payara/master/LICENSE.txt"
+ ),
+ /**
+ * details for an instance of Payara Server 5.194
+ */
+ PAYARA_SERVER_5_194(NbBundle.getMessage(ServerDetails.class, "STR_5194_SERVER_NAME", new Object[]{}), // NOI18N
+ "deployer:pfv5ee8", // NOI18N
+ 5194,
+ "https://oss.sonatype.org/service/local/repositories/releases/content/fish/payara/distributions/payara/5.194/payara-5.194.zip", // NOI18N
+ null,
+ "https://raw.githubusercontent.com/payara/Payara/master/LICENSE.txt"
+ ),
+ /**
+ * details for an instance of Payara Server 5.201
+ */
+ PAYARA_SERVER_5_201(NbBundle.getMessage(ServerDetails.class, "STR_5201_SERVER_NAME", new Object[]{}), // NOI18N
+ "deployer:pfv5ee8", // NOI18N
+ 5201,
+ "", // NOI18N
null,
"https://raw.githubusercontent.com/payara/Payara/master/LICENSE.txt"
);
@@ -260,6 +280,8 @@ public enum ServerDetails {
return new ServerWizardIterator(
//add new version
new ServerDetails[]{
+ PAYARA_SERVER_5_201,
+ PAYARA_SERVER_5_194,
PAYARA_SERVER_5_193,
PAYARA_SERVER_5_192,
PAYARA_SERVER_5_191,
@@ -283,6 +305,7 @@ public enum ServerDetails {
PAYARA_SERVER_4_1_144
},
new ServerDetails[]{
+ PAYARA_SERVER_5_194,
PAYARA_SERVER_5_193,
PAYARA_SERVER_5_192,
PAYARA_SERVER_5_191,
@@ -358,6 +381,10 @@ public enum ServerDetails {
return PAYARA_SERVER_5_192.getVersion();
case PF_5_193:
return PAYARA_SERVER_5_193.getVersion();
+ case PF_5_194:
+ return PAYARA_SERVER_5_194.getVersion();
+ case PF_5_201:
+ return PAYARA_SERVER_5_201.getVersion();
default:
return -1;
}
@@ -377,7 +404,7 @@ public enum ServerDetails {
if (null == domainXml || !domainXml.isFile() || !domainXml.canRead()) {
return -1;
}
- return hasDefaultConfig(domainXml) ? PAYARA_SERVER_5_193.getVersion() : PAYARA_SERVER_5_181.getVersion();
+ return hasDefaultConfig(domainXml) ? PAYARA_SERVER_5_194.getVersion() : PAYARA_SERVER_5_181.getVersion();
}
private static boolean hasDefaultConfig(File domainXml) throws IllegalStateException {
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 9d559e0..98d2cfc 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.194", "8.0"));
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"));
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 99fca79..c618407 100644
--- a/enterprise/payara.tooling/nbproject/org-netbeans-modules-payara-tooling.sig
+++ b/enterprise/payara.tooling/nbproject/org-netbeans-modules-payara-tooling.sig
@@ -1422,6 +1422,8 @@ 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_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
+fld public final static org.netbeans.modules.payara.tooling.data.PayaraVersion PF_5_194
+fld public final static org.netbeans.modules.payara.tooling.data.PayaraVersion PF_5_201
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()
@@ -1442,7 +1444,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 f639792..9017ae1 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
@@ -81,6 +81,8 @@ public abstract class AdminFactory {
case PF_5_191:
case PF_5_192:
case PF_5_193:
+ case PF_5_194:
+ case PF_5_201:
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 4944b1e..a32f021 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
@@ -79,7 +79,11 @@ public enum PayaraVersion {
/** 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),
/** 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);
+ PF_5_193 ((short) 5, (short) 0, (short) 0, (short) 0, (short) 19, (short) 3, (short) 0, PayaraVersion.PF_5_193_STR),
+ /** Payara 5.194 */
+ PF_5_194 ((short) 5, (short) 0, (short) 0, (short) 0, (short) 19, (short) 4, (short) 0, PayaraVersion.PF_5_194_STR),
+ /** Payara 5.201 */
+ PF_5_201 ((short) 5, (short) 0, (short) 0, (short) 0, (short) 20, (short) 1, (short) 0, PayaraVersion.PF_5_201_STR);
//add new version
/** A <code>String</code> representation of PF_4_1_144 value. */
@@ -166,6 +170,14 @@ public enum PayaraVersion {
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"};
+ /** A <code>String</code> representation of PF_5_194 value. */
+ static final String PF_5_194_STR = "5.194";
+ /** Additional <code>String</code> representations of 5.194 value. */
+ static final String PF_5_194_STR_NEXT[] = {"5.194.0"};
+ /** A <code>String</code> representation of PF_5_201 value. */
+ static final String PF_5_201_STR = "5.201";
+ /** Additional <code>String</code> representations of 5.201 value. */
+ static final String PF_5_201_STR_NEXT[] = {"5.201.0"};
////////////////////////////////////////////////////////////////////////////
@@ -216,6 +228,8 @@ public enum PayaraVersion {
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);
+ initStringValuesMapFromArray(PF_5_194, PF_5_194_STR_NEXT);
+ initStringValuesMapFromArray(PF_5_201, PF_5_201_STR_NEXT);
}
////////////////////////////////////////////////////////////////////////////
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists