You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by pe...@apache.org on 2023/05/11 21:59:07 UTC
[netbeans] branch master updated: Adding support for port offset Adding support for WidFly 28
This is an automated email from the ASF dual-hosted git repository.
pepness 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 c3058e604f Adding support for port offset Adding support for WidFly 28
new 667fd62394 Merge pull request #5597 from ehsavoie/support_port_offset_for_wildfly_server
c3058e604f is described below
commit c3058e604fb5135d2df231665f2a85b767e7c4c0
Author: Emmanuel Hugonnet <eh...@redhat.com>
AuthorDate: Fri Mar 3 19:35:12 2023 +0100
Adding support for port offset
Adding support for WidFly 28
Co-authored-by: akronenw <ak...@gmail.com>
Signed-off-by: Emmanuel Hugonnet <eh...@redhat.com>
---
.../javaee/wildfly/WildflyDeploymentManager.java | 16 ++++++++--
.../javaee/wildfly/ide/WildflyStartRunnable.java | 6 ++++
.../javaee/wildfly/ide/commands/WildflyClient.java | 27 ++++++++++------
.../wildfly/ide/commands/WildflyManagementAPI.java | 14 ++++++--
.../wildfly/ide/ui/AddServerLocationPanel.java | 1 +
.../wildfly/ide/ui/AddServerPropertiesPanel.java | 7 ++++
.../ide/ui/AddServerPropertiesVisualPanel.java | 37 ++++++++++++++++++++--
.../javaee/wildfly/ide/ui/Bundle.properties | 2 ++
.../ide/ui/WildflyInstantiatingIterator.java | 6 ++++
.../wildfly/ide/ui/WildflyPluginProperties.java | 1 +
.../javaee/wildfly/ide/ui/WildflyPluginUtils.java | 2 +-
.../modules/javaee/wildfly/nodes/Bundle.properties | 2 ++
.../javaee/wildfly/nodes/WildflyManagerNode.java | 29 ++++++++++++++---
13 files changed, 128 insertions(+), 22 deletions(-)
diff --git a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyDeploymentManager.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyDeploymentManager.java
index b661f27902..a37178f132 100644
--- a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyDeploymentManager.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyDeploymentManager.java
@@ -108,7 +108,11 @@ public class WildflyDeploymentManager implements DeploymentManager2 {
int controllerPort = CONTROLLER_PORT;
String adminPort = this.instanceProperties.getProperty(PROPERTY_ADMIN_PORT);
if(adminPort != null) {
- controllerPort = Integer.parseInt(this.instanceProperties.getProperty(PROPERTY_ADMIN_PORT));
+ controllerPort = Integer.parseInt(adminPort);
+ }
+ String portOffSet = this.instanceProperties.getProperty(WildflyPluginProperties.PROPERTY_PORT_OFFSET);
+ if(portOffSet != null) {
+ controllerPort = controllerPort + Integer.parseInt(portOffSet);
}
if (username != null && password != null) {
this.client = new WildflyClient(instanceProperties, version, getHost(), controllerPort, username, password);
@@ -364,9 +368,15 @@ public class WildflyDeploymentManager implements DeploymentManager2 {
}
public int getPort() {
- String port = InstanceProperties.getInstanceProperties(realUri).
+ String httpPort = InstanceProperties.getInstanceProperties(realUri).
getProperty(WildflyPluginProperties.PROPERTY_PORT);
- return Integer.parseInt(port);
+ String offSet = InstanceProperties.getInstanceProperties(realUri)
+ .getProperty(WildflyPluginProperties.PROPERTY_PORT_OFFSET);
+ int port = Integer.parseInt(httpPort);
+ if (offSet != null) {
+ port = port + Integer.parseInt(offSet);
+ }
+ return port;
}
public Version getServerVersion() {
diff --git a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyStartRunnable.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyStartRunnable.java
index cd4eb5a327..58d9ea5d67 100644
--- a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyStartRunnable.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyStartRunnable.java
@@ -201,6 +201,12 @@ class WildflyStartRunnable implements Runnable {
javaOptsBuilder.append(" -Djava.net.preferIPv4Stack=true -Djboss.modules.system.pkgs=org.jboss.byteman -Djava.awt.headless=true");
}
+ if(ip.getProperty(WildflyPluginProperties.PROPERTY_PORT_OFFSET) != null ) {
+ int portOffSet = Integer.parseInt(ip.getProperty(WildflyPluginProperties.PROPERTY_PORT_OFFSET));
+ if(portOffSet > 0 ) {
+ javaOptsBuilder.append(" -Djboss.socket.binding.port-offset=").append(portOffSet);
+ }
+ }
if (ip.getProperty(WildflyPluginProperties.PROPERTY_CONFIG_FILE) != null) {
File configFile = new File(ip.getProperty(WildflyPluginProperties.PROPERTY_CONFIG_FILE));
if (configFile.exists() && configFile.getParentFile().exists() && configFile.getParentFile().getParentFile().exists()) {
diff --git a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/WildflyClient.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/WildflyClient.java
index 1af0a771d8..45d792f434 100644
--- a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/WildflyClient.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/WildflyClient.java
@@ -357,7 +357,6 @@ public class WildflyClient {
Object readDeployments = createReadResourceOperation(cl, deploymentAddressModelNode, true, true);
// ModelNode
Object response = executeOnModelNode(cl, readDeployments);
- String httpPort = ip.getProperty(WildflyPluginProperties.PROPERTY_PORT);
if (isSuccessfulOutcome(cl, response)) {
// ModelNode
Object result = readResult(cl, response);
@@ -369,7 +368,7 @@ public class WildflyClient {
Object deployment = getModelNodeChild(cl, getModelNodeChild(cl, readResult(cl, application), SUBSYSTEM), WEB_SUBSYSTEM);
WildflyModule module = new WildflyModule(applicationName, true);
if (modelNodeIsDefined(cl, deployment)) {
- String url = "http://" + serverAddress + ':' + httpPort + modelNodeAsString(cl, getModelNodeChild(cl, deployment, "context-root"));
+ String url = "http://" + serverAddress + ':' + getHttpPort() + modelNodeAsString(cl, getModelNodeChild(cl, deployment, "context-root"));
module.setUrl(url);
}
modules.add(module);
@@ -390,8 +389,7 @@ public class WildflyClient {
// ModelNode
Object readDeployments = createReadResourceOperation(cl, deploymentAddressModelNode, true, true);
// ModelNode
- Object response = executeOnModelNode(cl, readDeployments);
- String httpPort = ip.getProperty(WildflyPluginProperties.PROPERTY_PORT);
+ Object response = executeOnModelNode(cl, readDeployments);
if (isSuccessfulOutcome(cl, response)) {
// ModelNode
Object result = readResult(cl, response);
@@ -403,7 +401,7 @@ public class WildflyClient {
// ModelNode
Object deployment = getModelNodeChild(cl, getModelNodeChild(cl, readResult(cl, application), SUBSYSTEM), WEB_SUBSYSTEM);
if (modelNodeIsDefined(cl, deployment)) {
- String url = "http://" + serverAddress + ':' + httpPort + modelNodeAsString(cl, getModelNodeChild(cl, deployment, "context-root"));
+ String url = "http://" + serverAddress + ':' + getHttpPort() + modelNodeAsString(cl, getModelNodeChild(cl, deployment, "context-root"));
modules.add(new WildflyWebModuleNode(applicationName, lookup, url));
} else {
modules.add(new WildflyWebModuleNode(applicationName, lookup, null));
@@ -426,7 +424,6 @@ public class WildflyClient {
Object readDeployments = createReadResourceOperation(cl, deploymentAddressModelNode, true, true);
// ModelNode
Object response = executeOnModelNode(cl, readDeployments);
- String httpPort = ip.getProperty(WildflyPluginProperties.PROPERTY_PORT);
if (isSuccessfulOutcome(cl, response)) {
// ModelNode
Object result = readResult(cl, response);
@@ -435,7 +432,7 @@ public class WildflyClient {
// ModelNode
Object deployment = getModelNodeChild(cl, getModelNodeChild(cl, result, SUBSYSTEM), WEB_SUBSYSTEM);
if (modelNodeIsDefined(cl, deployment)) {
- return "http://" + serverAddress + ':' + httpPort + modelNodeAsString(cl, getModelNodeChild(cl, deployment, "context-root")); // NOI18N
+ return "http://" + serverAddress + ':' + getHttpPort() + modelNodeAsString(cl, getModelNodeChild(cl, deployment, "context-root")); // NOI18N
}
} else if (applicationName.endsWith(".ear")) { // NOI18N
Object subdeployment = getModelNodeChild(cl, result, Constants.SUBDEPLOYMENT);
@@ -447,7 +444,7 @@ public class WildflyClient {
Object deployment = getModelNodeChild(cl, getModelNodeChild(cl, child, SUBSYSTEM), WEB_SUBSYSTEM);
if (modelNodeIsDefined(cl, deployment)) {
return "http://" + serverAddress + ':' // NOI18N
- + httpPort + modelNodeAsString(cl, getModelNodeChild(cl, deployment, "context-root")); // NOI18N
+ + getHttpPort() + modelNodeAsString(cl, getModelNodeChild(cl, deployment, "context-root")); // NOI18N
}
}
}
@@ -968,7 +965,7 @@ public class WildflyClient {
// ModelNode
Object response = executeOnModelNode(cl, readJaxrsResources);
if (isSuccessfulOutcome(cl, response)) {
- String serverUrl = "http://" + serverAddress + ':' + ip.getProperty(WildflyPluginProperties.PROPERTY_PORT);
+ String serverUrl = "http://" + serverAddress + ':' + getHttpPort();
// List<ModelNode>
Object result = readResult(cl, response);
if (modelNodeIsDefined(cl, result)) {
@@ -1053,7 +1050,7 @@ public class WildflyClient {
Object readDeployments = createReadResourceOperation(cl, deploymentAddressModelNode, true, true);
Object response = executeOnModelNode(cl, readDeployments);
if (isSuccessfulOutcome(cl, response)) {
- String httpPort = ip.getProperty(WildflyPluginProperties.PROPERTY_PORT);
+ int httpPort = getHttpPort();
Object result = readResult(cl, response);
List subDeployments = modelNodeAsList(cl, getModelNodeChild(cl, result, "subdeployment"));
for (Object subDeployment : subDeployments) {
@@ -1372,4 +1369,14 @@ public class WildflyClient {
}
return HORNETQ_SERVER_TYPE;
}
+
+ private int getHttpPort() {
+ String httpPort = ip.getProperty(WildflyPluginProperties.PROPERTY_PORT);
+ String offSet = ip.getProperty(WildflyPluginProperties.PROPERTY_PORT_OFFSET);
+ int port = Integer.parseInt(httpPort);
+ if (offSet != null) {
+ port = port + Integer.parseInt(offSet);
+ }
+ return port;
+ }
}
diff --git a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/WildflyManagementAPI.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/WildflyManagementAPI.java
index 338f247875..106bf54324 100644
--- a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/WildflyManagementAPI.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/WildflyManagementAPI.java
@@ -45,14 +45,24 @@ public class WildflyManagementAPI {
private static final String SASL_DISALLOWED_MECHANISMS = "SASL_DISALLOWED_MECHANISMS";
private static final String JBOSS_LOCAL_USER = "JBOSS-LOCAL-USER";
- private static final Map<String, String> DISABLED_LOCAL_AUTH = Collections.singletonMap(SASL_DISALLOWED_MECHANISMS, JBOSS_LOCAL_USER);
private static final Map<String, String> ENABLED_LOCAL_AUTH = Collections.emptyMap();
private static final int TIMEOUT = 1000;
static Object createClient(WildflyDeploymentFactory.WildFlyClassLoader cl, Version version, final String serverAddress, final int serverPort,
final CallbackHandler handler) throws ClassNotFoundException, NoSuchMethodException,
- IllegalAccessException, InvocationTargetException, NoSuchAlgorithmException {
+ IllegalAccessException, InvocationTargetException, NoSuchAlgorithmException, InstantiationException {
Class<?> clazz = cl.loadClass("org.jboss.as.controller.client.ModelControllerClient$Factory"); // NOI18N
+ if (version.compareTo(WildflyPluginUtils.WILDFLY_26_0_0) >= 0) {
+ Class<?> configurationBuilderClazz = cl.loadClass("org.jboss.as.controller.client.ModelControllerClientConfiguration$Builder");
+ Object configurationBuilder = configurationBuilderClazz.getConstructor().newInstance();
+ configurationBuilderClazz.getDeclaredMethod("setHostName", String.class).invoke(configurationBuilder, serverAddress);
+ configurationBuilderClazz.getDeclaredMethod("setPort", int.class).invoke(configurationBuilder, serverPort);
+ configurationBuilderClazz.getDeclaredMethod("setHandler", CallbackHandler.class).invoke(configurationBuilder, handler);
+ configurationBuilderClazz.getDeclaredMethod("setConnectionTimeout", int.class).invoke(configurationBuilder, TIMEOUT);
+ configurationBuilderClazz.getDeclaredMethod("setSaslOptions", Map.class).invoke(configurationBuilder, ENABLED_LOCAL_AUTH);
+ Method method = clazz.getDeclaredMethod("create", cl.loadClass("org.jboss.as.controller.client.ModelControllerClientConfiguration"));
+ return method.invoke(null, configurationBuilderClazz.getDeclaredMethod("build").invoke(configurationBuilder));
+ }
if (version.compareTo(WildflyPluginUtils.WILDFLY_9_0_0) >= 0) {
Method method = clazz.getDeclaredMethod("create", String.class, int.class, CallbackHandler.class, SSLContext.class, int.class, Map.class);
return method.invoke(null, serverAddress, serverPort, handler, SSLContext.getDefault(), TIMEOUT, ENABLED_LOCAL_AUTH);
diff --git a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerLocationPanel.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerLocationPanel.java
index 0e43fd6773..6d0a890a20 100644
--- a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerLocationPanel.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerLocationPanel.java
@@ -148,6 +148,7 @@ public class AddServerLocationPanel implements WizardDescriptor.FinishablePanel,
instantiatingIterator.setAdminPort("" + WildflyPluginProperties.getInstance().getAdminPort());
instantiatingIterator.setHost("localhost");
instantiatingIterator.setPort("8080");
+ instantiatingIterator.setPortOffset("0");
}
@Override
diff --git a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerPropertiesPanel.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerPropertiesPanel.java
index 44f0acee07..b4a5a07a8c 100644
--- a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerPropertiesPanel.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerPropertiesPanel.java
@@ -50,6 +50,7 @@ public class AddServerPropertiesPanel implements WizardDescriptor.Panel, ChangeL
AddServerPropertiesVisualPanel panel = (AddServerPropertiesVisualPanel)getComponent();
String host = panel.getHost();
+ String portoffSet = panel.getPortOffSet();
String port = panel.getPort();
String adminPort = panel.getManagementPort();
@@ -113,6 +114,11 @@ public class AddServerPropertiesPanel implements WizardDescriptor.Panel, ChangeL
NbBundle.getMessage(AddServerPropertiesPanel.class, "MSG_InvalidPort")); //NOI18N
return false;
}
+ try{
+ Integer.parseInt(portoffSet);
+ } catch(Exception e) {
+ portoffSet = "0";
+ }
try{
Integer.parseInt(adminPort);
@@ -142,6 +148,7 @@ public class AddServerPropertiesPanel implements WizardDescriptor.Panel, ChangeL
instantiatingIterator.setHost(host);
instantiatingIterator.setPort(port);
instantiatingIterator.setAdminPort(adminPort);
+ instantiatingIterator.setPortOffset(portoffSet);
instantiatingIterator.setServer(panel.getDomain());
instantiatingIterator.setServerPath(panel.getDomainPath());
instantiatingIterator.setDeployDir(WildflyPluginUtils.getDeployDir( panel.getDomainPath()));
diff --git a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerPropertiesVisualPanel.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerPropertiesVisualPanel.java
index e84fb97744..d07e471eb0 100644
--- a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerPropertiesVisualPanel.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerPropertiesVisualPanel.java
@@ -61,6 +61,8 @@ public class AddServerPropertiesVisualPanel extends JPanel {
private javax.swing.JTextField portField;
private javax.swing.JLabel managementPortLabel;
private javax.swing.JTextField managementPortField;
+ private javax.swing.JLabel portOffsetLabel;
+ private javax.swing.JTextField portOffsetField;
private javax.swing.JLabel userLabel;
private javax.swing.JTextField userField;
private javax.swing.JLabel passwordLabel;
@@ -112,6 +114,10 @@ public class AddServerPropertiesVisualPanel extends JPanel {
public String getPort(){
return portField.getText().trim();
}
+
+ public String getPortOffSet(){
+ return portOffsetField.getText().trim();
+ }
public String getManagementPort(){
return managementPortField.getText().trim();
@@ -261,6 +267,17 @@ public class AddServerPropertiesVisualPanel extends JPanel {
managementPortLabel.setLabelFor(managementPortField);
+ portOffsetLabel = new JLabel();
+ org.openide.awt.Mnemonics.setLocalizedText(portOffsetLabel, NbBundle.getMessage(AddServerPropertiesVisualPanel.class, "LBL_Port_Offset")); // NOI18N
+
+ portOffsetField = new JTextField();
+ portOffsetField.setColumns(20);
+ portOffsetField.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(AddServerPropertiesVisualPanel.class, "LBL_Port_Offset"));
+ portOffsetField.getAccessibleContext().setAccessibleName(NbBundle.getMessage(AddServerPropertiesVisualPanel.class, "LBL_Port_Offset"));
+ portOffsetField.addKeyListener(new SomeChangesListener());
+
+ portOffsetLabel.setLabelFor(portOffsetField);
+
userLabel = new JLabel(NbBundle.getMessage(AddServerPropertiesVisualPanel.class, "LBL_User"));//NOI18N
userField = new JTextField();
userField.addKeyListener(new SomeChangesListener());
@@ -374,6 +391,21 @@ public class AddServerPropertiesVisualPanel extends JPanel {
gridBagConstraints.insets = new java.awt.Insets(0, 0, 12, 0);
add(managementPortField, gridBagConstraints);
+ //-------------- port offset ---------------
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.insets = new java.awt.Insets(0, 0, 12, 6);
+ gridBagConstraints.anchor = GridBagConstraints.WEST;
+ add(portOffsetLabel, gridBagConstraints);
+
+
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridy = 6;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
+ gridBagConstraints.weightx = 1.0;
+ gridBagConstraints.insets = new java.awt.Insets(0, 0, 12, 0);
+ add(portOffsetField, gridBagConstraints);
+
//-------------- User ---------------
gridBagConstraints = new java.awt.GridBagConstraints();
@@ -384,7 +416,7 @@ public class AddServerPropertiesVisualPanel extends JPanel {
gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridy = 6;
+ gridBagConstraints.gridy = 7;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 1.0;
gridBagConstraints.insets = new java.awt.Insets(0, 0, 12, 0);
@@ -401,7 +433,7 @@ public class AddServerPropertiesVisualPanel extends JPanel {
gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridy = 7;
+ gridBagConstraints.gridy = 8;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 1.0;
gridBagConstraints.insets = new java.awt.Insets(0, 0, 12, 0);
@@ -430,6 +462,7 @@ public class AddServerPropertiesVisualPanel extends JPanel {
hostField.setText("localhost");//NOI18N
portField.setText(WildflyPluginUtils.getHTTPConnectorPort(domainPathField.getText()));//NOI18N
+ portOffsetField.setText("0");//NOI18N
domainChanged();
}
diff --git a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/Bundle.properties b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/Bundle.properties
index 31a405fa6b..c972a1e5a2 100644
--- a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/Bundle.properties
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/Bundle.properties
@@ -57,6 +57,8 @@ LBL_Port=&Port:
LBL_Management_Port=&Management Port:
+LBL_Port_Offset=&Port Offset:
+
LBL_User=User
LBL_Password=Password
diff --git a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyInstantiatingIterator.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyInstantiatingIterator.java
index 8a18f1bbe6..d95460d568 100644
--- a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyInstantiatingIterator.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyInstantiatingIterator.java
@@ -146,6 +146,7 @@ public class WildflyInstantiatingIterator implements WizardDescriptor.Instantiat
initialProperties.put(WildflyPluginProperties.PROPERTY_ROOT_DIR, installLocation);
initialProperties.put(WildflyPluginProperties.PROPERTY_HOST, host);
initialProperties.put(WildflyPluginProperties.PROPERTY_PORT, port);
+ initialProperties.put(WildflyPluginProperties.PROPERTY_PORT_OFFSET, portOffset);
initialProperties.put(WildflyPluginProperties.PROPERTY_CONFIG_FILE, configFile);
initialProperties.put(WildflyPluginProperties.PROPERTY_ADMIN_PORT, adminPort);
initialProperties.put(WildflyPluginProperties.PROPERTY_JAVA_OPTS, WILDFLY_JAVA_OPTS);
@@ -261,6 +262,7 @@ public class WildflyInstantiatingIterator implements WizardDescriptor.Instantiat
private String host;
private String port;
private String adminPort;
+ private String portOffset;
private String userName="";
private String password="";
private String server;
@@ -293,6 +295,10 @@ public class WildflyInstantiatingIterator implements WizardDescriptor.Instantiat
this.adminPort = port.trim();
}
+ public void setPortOffset(String portOffset){
+ this.portOffset = portOffset;
+ }
+
public void setServer(String server){
this.server = server;
}
diff --git a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyPluginProperties.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyPluginProperties.java
index 8d74a086c5..9559535f20 100644
--- a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyPluginProperties.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyPluginProperties.java
@@ -40,6 +40,7 @@ public final class WildflyPluginProperties {
public static final String PROPERTY_ROOT_DIR = "root-dir";//NOI18N
public static final String PROPERTY_HOST = "host";//NOI18N
public static final String PROPERTY_PORT = "port";//NOI18N
+ public static final String PROPERTY_PORT_OFFSET = "port-offset";//NOI18N
public static final String PROPERTY_ADMIN_PORT = "admin-port";//NOI18N
public static final String PROPERTY_JAVA_OPTS = "java_opts"; // NOI18N
public static final String PROPERTY_CONFIG_FILE = "config_file"; // NOI18N
diff --git a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyPluginUtils.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyPluginUtils.java
index f404e9e1ee..099040fad7 100644
--- a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyPluginUtils.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyPluginUtils.java
@@ -244,7 +244,7 @@ public class WildflyPluginUtils {
return defaultPort;
}
- public static String getManagementConnectorPort(String configFile) {
+ public static String getManagementConnectorPort(String configFile) {
String defaultPort = "9990"; // NOI18N
return defaultPort;
}
diff --git a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/Bundle.properties b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/Bundle.properties
index 24183496b0..8e2938f659 100644
--- a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/Bundle.properties
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/Bundle.properties
@@ -29,6 +29,8 @@ LBL_HOST=Host
HINT_HOST=Wildlfy's Host
LBL_PORT=Port
HINT_PORT=Wildlfy's Port
+LBL_PORT_OFFSET= Port OffSet
+HINT_PORT_OFFSET=Wildlfy's Port OffSet
LBL_Apps=Applications
LBL_WaitNode_DisplayName=Please wait ...
LBL_InfoNode_DisplayName=<No Management Support>
diff --git a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyManagerNode.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyManagerNode.java
index f067252947..6d83e75b2a 100644
--- a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyManagerNode.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyManagerNode.java
@@ -128,7 +128,7 @@ public class WildflyManagerNode extends AbstractNode implements Node.Cookie {
properties.put(property);
- // servewr name
+ // server name
property = new PropertySupport.ReadOnly(
NbBundle.getMessage(WildflyManagerNode.class, "LBL_SERVER_NAME"), //NOI18N
String.class,
@@ -171,7 +171,19 @@ public class WildflyManagerNode extends AbstractNode implements Node.Cookie {
NbBundle.getMessage(WildflyManagerNode.class, "LBL_PORT"), NbBundle.getMessage(WildflyManagerNode.class, "HINT_PORT")) {
@Override
public Object getValue() {
- return new Integer(ip.getProperty(WildflyPluginProperties.PROPERTY_PORT));
+ return Integer.parseInt(ip.getProperty(WildflyPluginProperties.PROPERTY_PORT));
+ }
+ };
+ properties.put(property);
+
+ //port-offset
+ property = new PropertySupport.ReadOnly(
+ NbBundle.getMessage(WildflyManagerNode.class, "LBL_PORT_OFFSET"), //NOI18N
+ Integer.TYPE,
+ NbBundle.getMessage(WildflyManagerNode.class, "LBL_PORT_OFFSET"), NbBundle.getMessage(WildflyManagerNode.class, "HINT_PORT_OFFSET")) {
+ @Override
+ public Object getValue() {
+ return Integer.parseInt(ip.getProperty(WildflyPluginProperties.PROPERTY_PORT_OFFSET));
}
};
properties.put(property);
@@ -198,11 +210,20 @@ public class WildflyManagerNode extends AbstractNode implements Node.Cookie {
@Override
public String getShortDescription() {
InstanceProperties ip = InstanceProperties.getInstanceProperties(getDeploymentManager().getUrl());
- String host = ip.getProperty(WildflyPluginProperties.PROPERTY_HOST);
- String port = ip.getProperty(WildflyPluginProperties.PROPERTY_PORT);
+ String host = ip.getProperty(WildflyPluginProperties.PROPERTY_HOST);
+ int port = getHttpPort(ip);
return HTTP_HEADER + host + ":" + port + "/"; // NOI18N
}
+ private int getHttpPort(InstanceProperties ip) {
+ String httpPort = ip.getProperty(WildflyPluginProperties.PROPERTY_PORT);
+ String offSet = ip.getProperty(WildflyPluginProperties.PROPERTY_PORT_OFFSET);
+ int port = Integer.parseInt(httpPort);
+ if (offSet != null) {
+ port = port + Integer.parseInt(offSet);
+ }
+ return port;
+ }
public final WildflyDeploymentManager getDeploymentManager() {
return ((WildflyDeploymentManager) lookup.lookup(WildflyDeploymentManager.class));
}
---------------------------------------------------------------------
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