[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server ...
Robert Stryker
rawblem at gmail.com
Tue Sep 19 14:51:42 EDT 2006
User: rawb
Date: 06/09/19 14:51:42
Modified: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server
ServerAttributeHelper.java JBossServer.java
Log:
API to get port list
Revision Changes Path
1.12 +93 -1 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerAttributeHelper.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ServerAttributeHelper.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerAttributeHelper.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ServerAttributeHelper.java 18 Sep 2006 17:50:11 -0000 1.11
+++ ServerAttributeHelper.java 19 Sep 2006 18:51:42 -0000 1.12
@@ -6,11 +6,13 @@
import java.util.Iterator;
import java.util.List;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.wst.server.core.IServerWorkingCopy;
+import org.eclipse.wst.server.core.ServerPort;
import org.eclipse.wst.server.core.internal.ServerType;
import org.eclipse.wst.server.core.internal.ServerWorkingCopy;
import org.jboss.ide.eclipse.as.core.model.SimpleTreeItem;
+import org.jboss.ide.eclipse.as.core.model.DescriptorModel.ServerDescriptorModel.XPathTreeItem;
+import org.jboss.ide.eclipse.as.core.model.DescriptorModel.ServerDescriptorModel.XPathTreeItem2;
import org.jboss.ide.eclipse.as.core.server.runtime.AbstractServerRuntimeDelegate;
import org.jboss.ide.eclipse.as.core.util.ASDebug;
@@ -21,6 +23,8 @@
public static final String JBOSS_CONFIG = "JBOSS_CONFIG";
public static final String JBOSS_CONFIG_DEFAULT = "default";
+ public static final String PORT_CATEGORY_PREF_KEY = "_PORT_CATEGORY_NAME_";
+ public static final String PORT_NUMBERS_LIST = "_PORT_NUMBERS_LIST_";
public static final String XPATH_CATEGORIES = "_XPATH_CATEGORIES_";
public static final String XPATH_CATEGORY2_PREFIX = "_XPATH_CATEGORY2_PREFIX_";
@@ -134,6 +138,67 @@
return this.server;
}
+ public String getDefaultPortCategoryName() {
+ return server.getAttribute(PORT_CATEGORY_PREF_KEY, "");
+ }
+ public void setDefaultPortCategoryName(String s) {
+ server.setAttribute(PORT_CATEGORY_PREF_KEY, s);
+ }
+
+ public void setServerPorts(SimpleXPathPreferenceTreeItem root) {
+ String portCategory = getDefaultPortCategoryName();
+ SimpleTreeItem[] categories = root.getChildren2();
+ SimpleTreeItem portCategoryObject = null;
+ for( int i = 0; i < categories.length && portCategoryObject == null; i++ ) {
+ if( categories[i].getData().equals(portCategory))
+ portCategoryObject = categories[i];
+ }
+
+ ArrayList list = new ArrayList();
+
+ if( portCategoryObject != null ) {
+ SimpleTreeItem[] xpaths = portCategoryObject.getChildren2();
+ for( int i = 0; i < xpaths.length; i++ ) {
+ XPathPreferenceTreeItem xpItem = (XPathPreferenceTreeItem)xpaths[i];
+ String name = xpItem.getName();
+ SimpleTreeItem[] xpItemChildren = xpItem.getChildren2();
+ for( int j = 0; j < xpItemChildren.length; j++ ) {
+ SimpleTreeItem[] leafs = xpItemChildren[j].getChildren2();
+ for( int k = 0; k < leafs.length; k++ ) {
+ Object o = leafs[k];
+ if( o instanceof XPathTreeItem2 ) {
+ try {
+ String port = ((XPathTreeItem2)o).getText();
+ int port2 = Integer.parseInt(port);
+ list.add(name + ":" + port2);
+ } catch( Exception e ) {}
+ }
+ }
+ }
+ }
+ }
+
+ server.setAttribute(PORT_NUMBERS_LIST, list);
+ save();
+ }
+
+ public ServerPort[] getServerPorts() {
+ ArrayList serverPorts = new ArrayList();
+ List portList = server.getAttribute(PORT_NUMBERS_LIST, new ArrayList());
+ Iterator i = portList.iterator();
+ while(i.hasNext()) {
+ String s = (String)i.next();
+ int loc = s.lastIndexOf(':');
+ String name = s.substring(0, loc);
+ String port = s.substring(loc+1);
+ int port2 = Integer.parseInt(port);
+ serverPorts.add(new ServerPort(s, name, port2, null));
+ }
+
+ ServerPort[] sps = (ServerPort[]) serverPorts.toArray(new ServerPort[portList.size()]);
+ return sps;
+ }
+
public SimpleXPathPreferenceTreeItem getXPathPreferenceTree() {
List categories = server.getAttribute(XPATH_CATEGORIES, (List)null);
if( categories == null ) {
@@ -166,7 +231,11 @@
private SimpleXPathPreferenceTreeItem getDefaultXPathPreferenceTree() {
SimpleXPathPreferenceTreeItem model = new SimpleXPathPreferenceTreeItem(null, XPATH_CATEGORIES);
+
SimpleXPathPreferenceTreeItem ports = new SimpleXPathPreferenceTreeItem(model, "Ports");
+
+
+
XPathPreferenceTreeItem jndi = new XPathPreferenceTreeItem(ports,
"JNDI", "/server/mbean[@name='jboss:service=Naming']/attribute[@name='Port']");
XPathPreferenceTreeItem jndiRMI = new XPathPreferenceTreeItem(ports,
@@ -278,6 +347,29 @@
this.attributeName = attName;
}
+ // actually a forced refresh
+ public void ensureLoaded(JBossServer jbServer) {
+ String XPATH_PROPERTY_LOADED = "_XPATH_PROPERTY_LOADED_";
+
+ String xpath = getXPath();
+ String attribute = getAttributeName();
+ XPathTreeItem[] items = new XPathTreeItem[0];
+ if( attribute == null || attribute.equals("")) {
+ items = jbServer.getDescriptorModel().getXPath(xpath);
+ } else {
+ items = jbServer.getDescriptorModel().getXPath(xpath, attribute);
+ }
+
+ if( getProperty(XPATH_PROPERTY_LOADED) != null ) {
+ //deleteChildren();
+ return;
+ }
+ for( int i = 0; i < items.length; i++ ) {
+ addChild(items[i]);
+ }
+ setProperty(XPATH_PROPERTY_LOADED, new Boolean(true));
+ }
+
}
}
1.11 +4 -9 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServer.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JBossServer.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- JBossServer.java 18 Sep 2006 17:50:11 -0000 1.10
+++ JBossServer.java 19 Sep 2006 18:51:42 -0000 1.11
@@ -37,8 +37,11 @@
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.model.DescriptorModel;
import org.jboss.ide.eclipse.as.core.model.ServerProcessModel;
+import org.jboss.ide.eclipse.as.core.model.SimpleTreeItem;
import org.jboss.ide.eclipse.as.core.model.DescriptorModel.ServerDescriptorModel;
import org.jboss.ide.eclipse.as.core.model.ServerProcessModel.ServerProcessModelEntity;
+import org.jboss.ide.eclipse.as.core.server.ServerAttributeHelper.SimpleXPathPreferenceTreeItem;
+import org.jboss.ide.eclipse.as.core.server.ServerAttributeHelper.XPathPreferenceTreeItem;
import org.jboss.ide.eclipse.as.core.server.runtime.JBossServerRuntime;
import org.jboss.ide.eclipse.as.core.util.ASDebug;
@@ -65,16 +68,12 @@
*/
public void setDefaults(IProgressMonitor monitor) {
- debug("setDefaults");
}
public void importRuntimeConfiguration(IRuntime runtime, IProgressMonitor monitor) throws CoreException {
- debug("import Runtime Configuration");
- //getJBossRuntime();
}
public void saveConfiguration(IProgressMonitor monitor) throws CoreException {
- debug("saveConfiguration");
// Saving a change in server properties (via server editor)
String newHost = getServer().getHost();
@@ -85,7 +84,6 @@
}
public void configurationChanged() {
- debug("configurationChanged");
}
@@ -120,7 +118,6 @@
* Abstracts to implement
*/
public IStatus canModifyModules(IModule[] add, IModule[] remove) {
- debug("canModifyModules");
return new Status(IStatus.OK, JBossServerCorePlugin.PLUGIN_ID,0, "OK", null);
}
@@ -143,9 +140,7 @@
}
public ServerPort[] getServerPorts() {
- debug("****** getServerPorts");
- //return new ServerPort[] { new ServerPort("portid1", "portname1", 1099, "TCPIP") };
- return null;
+ return getAttributeHelper().getServerPorts();
}
public ServerProcessModelEntity getProcessModel() {
More information about the jboss-cvs-commits
mailing list