[jboss-cvs] JBossAS SVN: r87841 - in trunk: testsuite/src/main/org/jboss/test/profileservice/test and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Apr 25 08:17:59 EDT 2009
Author: bstansberry at jboss.com
Date: 2009-04-25 08:17:59 -0400 (Sat, 25 Apr 2009)
New Revision: 87841
Modified:
trunk/server/src/etc/conf/all/bootstrap/bindings.xml
trunk/testsuite/src/main/org/jboss/test/profileservice/test/ServiceBindingManagedObjectsTestCase.java
trunk/varia/src/main/org/jboss/services/binding/ServiceBinding.java
trunk/varia/src/main/org/jboss/services/binding/ServiceBindingMetadata.java
Log:
[JBAS-6828] Add a description property to ServiceBindingMetadata
Modified: trunk/server/src/etc/conf/all/bootstrap/bindings.xml
===================================================================
--- trunk/server/src/etc/conf/all/bootstrap/bindings.xml 2009-04-25 11:54:32 UTC (rev 87840)
+++ trunk/server/src/etc/conf/all/bootstrap/bindings.xml 2009-04-25 12:17:59 UTC (rev 87841)
@@ -106,24 +106,28 @@
<property name="serviceName">jboss:service=Naming</property>
<property name="bindingName">Port</property>
<property name="port">1099</property>
+ <property name="description">The listening socket for the Naming service</property>
</bean>
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">jboss:service=Naming</property>
<property name="bindingName">RmiPort</property>
<property name="port">1098</property>
+ <property name="description">Socket Naming service uses to receive RMI requests from client proxies</property>
</bean>
<!-- Remote classloading service -->
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">jboss:service=WebService</property>
<property name="port">8083</property>
+ <property name="description">Socket for dynamic class and resource loading</property>
</bean>
<!-- Remoting Connector -->
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">UnifiedInvokerConnector</property>
<property name="port">4446</property>
+ <property name="description">Socket for JBoss Remoting Connector used by UnifiedInvoker</property>
</bean>
<!-- Used to create a multihome Remoting server. See -->
@@ -132,6 +136,7 @@
<property name="serviceName">UnifiedInvokerConnector:bindingHome1</property>
<parameter>192.168.2.2</property>
<property name="port">7777</property>
+ <property name="description">Socket for JBoss Remoting Connector used by UnifiedInvoker on a multihome server</property>
</bean-->
<!-- Used to create a multihome Remoting server. See -->
@@ -140,6 +145,7 @@
<property name="serviceName">UnifiedInvokerConnector:bindingHome2</property>
<parameter>10.11.12.238</property>
<property name="port">8888</property>
+ <property name="description">Socket for JBoss Remoting Connector used by UnifiedInvoker on a multihome server</property>
</bean-->
<!-- ********************* deploy/legacy-invokers-service.xml ****************** -->
@@ -148,12 +154,14 @@
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">jboss:service=invoker,type=jrmp</property>
<property name="port">4444</property>
+ <property name="description">Socket for the legacy RMI/JRMP invoker</property>
</bean>
<!-- Pooled invoker -->
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">jboss:service=invoker,type=pooled</property>
<property name="port">4445</property>
+ <property name="description">Socket for the legacy Pooled invoker</property>
</bean>
<!-- ********************* deploy/cluster/hajndi-service.xml ****************** -->
@@ -162,18 +170,21 @@
<property name="serviceName">jboss:service=HAJNDI</property>
<property name="bindingName">Port</property>
<property name="port">1100</property>
+ <property name="description">The listening socket for the HA-JNDI service</property>
</bean>
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">jboss:service=HAJNDI</property>
<property name="bindingName">RmiPort</property>
<property name="port">1101</property>
+ <property name="description">Socket HA-JNDI service uses to receive RMI requests from client proxies</property>
</bean>
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">jboss:service=HAJNDI</property>
<property name="bindingName">AutoDiscoveryMulticastAddress</property>
<property name="hostName">${jboss.partition.udpGroup:230.0.0.4}</property>
+ <property name="description">Multicast socket on which HA-JNDI listens for auto-discovery requests from clients</property>
<!-- This address should not be changed between different
binding sets; all nodes need to listen on the same
multicast address -->
@@ -184,6 +195,7 @@
<property name="serviceName">jboss:service=HAJNDI</property>
<property name="bindingName">AutoDiscoveryPort</property>
<property name="port">1102</property>
+ <property name="description">Multicast socket on which HA-JNDI listens for auto-discovery requests from clients</property>
<!-- This port should not be changed between different
binding sets; all nodes need to listen on the same port -->
<property name="fixedPort">true</property>
@@ -195,12 +207,14 @@
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">jboss:service=invoker,type=jrmpha</property>
<property name="port">4447</property>
+ <property name="description">Socket for high availability version of the legacy RMI/JRMP invoker</property>
</bean>
<!-- HA Pooled invoker -->
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">jboss:service=invoker,type=pooledha</property>
<property name="port">4448</property>
+ <property name="description">Socket for high availability version of the legacy Pooled invoker</property>
</bean>
<!-- ********************* deploy/iiop-service.xml ****************** -->
@@ -208,6 +222,7 @@
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">jboss:service=CorbaORB</property>
<property name="port">3528</property>
+ <property name="description">IIOP socket for the Corba ORB</property>
</bean>
<!-- ********************* deploy/snmp-adaptor.sar **************** -->
@@ -216,12 +231,14 @@
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">jboss.jmx:name=SnmpAgent,service=trapd,type=logger</property>
<property name="port">1162</property>
+ <property name="description">Socket for the SNMP trap receiver</property>
</bean>
<!-- The SNMP adaptor MBean -->
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">jboss.jmx:name=SnmpAgent,service=snmp,type=adaptor</property>
<property name="port">1161</property>
+ <property name="description">Socket for the SNMP adaptor MBean</property>
</bean>
<!-- ********************* deploy/jmx-remoting.sar **************** -->
@@ -229,6 +246,7 @@
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">jboss.remoting:service=JMXConnectorServer,protocol=rmi</property>
<property name="port">1090</property>
+ <property name="description">RMI/JRMP socket for connecting to the JMX MBeanServer</property>
</bean>
<!-- ********************* deploy/ejb3-connectors-service.xml **************** -->
@@ -257,6 +275,7 @@
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">jboss.web:service=WebServer</property>
<property name="port">8080</property>
+ <property name="description">JBoss Web HTTP connector socket; also drives the values for the HTTPS and AJP sockets</property>
<!--
Inject a XSLT transform configuration (see below) that describes
@@ -273,6 +292,7 @@
<property name="serviceName">jboss.web:service=WebServer</property>
<property name="bindingName">HttpsConnector</property>
<property name="port">8443</property>
+ <property name="description">JBoss Web HTTPS connector socket</property>
</bean>
<!-- ********************* deploy/messaging/remoting-bisocket-service.xml ********************** -->
@@ -281,8 +301,25 @@
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">jboss.messaging:service=Connector,transport=bisocket</property>
<property name="port">4457</property>
+ <property name="description">Socket for JBoss Messaging 1.x</property>
</bean>
+ <!-- ********************* JBoss Messaging 2 **************** -->
+
+ <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+ <property name="serviceName">JBM2</property>
+ <property name="bindingName">netty-port</property>
+ <property name="port">5445</property>
+ <property name="description">Socket for JBoss Messaging 2.x</property>
+ </bean>
+
+ <bean class="org.jboss.services.binding.ServiceBindingMetadata">
+ <property name="serviceName">JBM2</property>
+ <property name="bindingName">netty-ssl-port</property>
+ <property name="port">5446</property>
+ <property name="description">SSL socket for JBoss Messaging 2.x</property>
+ </bean>
+
<!-- ********************* deploy/transaction-jboss-beans.xml ********************** -->
<!-- JBossTS Recovery Manager -->
@@ -290,6 +327,7 @@
<property name="serviceName">TransactionManager</property>
<property name="bindingName">recoveryManager</property>
<property name="port">4712</property>
+ <property name="description">Socket for JBossTS Recovery Manager</property>
</bean>
<!-- JBossTS Transaction Status Manager -->
@@ -297,6 +335,7 @@
<property name="serviceName">TransactionManager</property>
<property name="bindingName">transactionStatusManager</property>
<property name="port">4713</property>
+ <property name="description">Socket for JBossTS Transaction Status Manager</property>
</bean>
<!-- JBossTS SocketProcessId. The address part is ignored,
@@ -305,23 +344,9 @@
<property name="serviceName">TransactionManager</property>
<property name="bindingName">socketProcessId</property>
<property name="port">4714</property>
+ <property name="description">Socket used to provide unique process id for JBossTS. The address configuration is ignored; will always use localhost/127.0.0.1</property>
</bean>
-
- <!-- ********************* JBoss Messaging 2 **************** -->
-
- <bean class="org.jboss.services.binding.ServiceBindingMetadata">
- <property name="serviceName">JBM2</property>
- <property name="bindingName">netty-port</property>
- <property name="port">5445</property>
- </bean>
-
- <bean class="org.jboss.services.binding.ServiceBindingMetadata">
- <property name="serviceName">JBM2</property>
- <property name="bindingName">netty-ssl-port</property>
- <property name="port">5446</property>
- </bean>
-
<!-- ********************* deploy/hsqldb-ds.xml **************** -->
<!-- Commented out as tcp/ip access to Hypersonic is not enabled by default -->
@@ -329,6 +354,7 @@
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">jboss:service=Hypersonic</property>
<property name="port">1701</property>
+ <property name="description">TCP/IP socket for remote connection to Hypersonic database</property>
</bean>
-->
@@ -342,6 +368,7 @@
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">jboss.mq:service=InvocationLayer,type=UIL2</property>
<property name="port">8093</property>
+ <property name="description">UIL2 socket for JBossMQ</property>
</bean>
-->
</set>
Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/test/ServiceBindingManagedObjectsTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/ServiceBindingManagedObjectsTestCase.java 2009-04-25 11:54:32 UTC (rev 87840)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/ServiceBindingManagedObjectsTestCase.java 2009-04-25 12:17:59 UTC (rev 87841)
@@ -240,9 +240,7 @@
if (val != null)
{
checkedHostName = true;
- assertNotNull("property hostName has no value", val);
assertTrue("property hostName value is SimpleValue", val instanceof SimpleValue);
- assertNotNull("property hostName value is not null", ((SimpleValue) val).getValue());
assertEquals("type of hostName value isn't String", String.class.getName(), val.getMetaType().getClassName());
}
@@ -254,6 +252,17 @@
assertNotNull("property port value is not null", ((SimpleValue) val).getValue());
assertEquals("type of port value isn't Integer", Integer.class.getName(), val.getMetaType().getClassName());
assertNotNull("property port value is not null", ((SimpleValue) val).getValue());
+
+ prop = properties.get("description");
+ assertNotNull("Missing property 'description'", prop);
+ val = prop.getValue();
+ if (val != null)
+ {
+ checkedHostName = true;
+ assertNotNull("property hostName has no value", val);
+ assertTrue("property description value is SimpleValue", val instanceof SimpleValue);
+ assertEquals("type of description value isn't String", String.class.getName(), val.getMetaType().getClassName());
+ }
}
}
Modified: trunk/varia/src/main/org/jboss/services/binding/ServiceBinding.java
===================================================================
--- trunk/varia/src/main/org/jboss/services/binding/ServiceBinding.java 2009-04-25 11:54:32 UTC (rev 87840)
+++ trunk/varia/src/main/org/jboss/services/binding/ServiceBinding.java 2009-04-25 12:17:59 UTC (rev 87841)
@@ -78,6 +78,9 @@
*/
private final InetAddress bindAddress;
+ /** Description of the binding that can be displayed by management tools */
+ private String description;
+
/** The ServiceBindingValueSource implementation class
*/
private final String serviceBindingValueSourceClassName;
@@ -129,6 +132,7 @@
this.port = metadata.isFixedPort() ? metadata.getPort() : metadata.getPort() + portOffset;
this.hostName = metadata.isFixedHostName() ? metadata.getHostName() : defaulHostName;
this.bindAddress = InetAddress.getByName(this.hostName);
+ this.description = metadata.getDescription();
this.serviceBindingValueSourceConfig = metadata.getServiceBindingValueSourceConfig();
@@ -249,9 +253,30 @@
public InetAddress getBindAddress()
{
return this.bindAddress;
+ }
+
+ /**
+ * Gets a description of the binding suitable for display by management tools.
+ *
+ * @return the description, or <code>null</code> if there isn't one
+ */
+ @ManagementProperty(use={ViewUse.STATISTIC}, description="description of the binding")
+ public String getDescription()
+ {
+ return description;
}
/**
+ * Sets a description of the binding suitable for display by management tools.
+ *
+ * @param description the description; may be <code>null</code>
+ */
+ public void setDescription(String description)
+ {
+ this.description = description;
+ }
+
+ /**
* Gets the object that can return this ServiceBinding's values in formats
* usable by consumers. If unset (the norm), {@link ServiceBindingManager} will use
* reasonable defaults based on the format requested by the consumer.
Modified: trunk/varia/src/main/org/jboss/services/binding/ServiceBindingMetadata.java
===================================================================
--- trunk/varia/src/main/org/jboss/services/binding/ServiceBindingMetadata.java 2009-04-25 11:54:32 UTC (rev 87840)
+++ trunk/varia/src/main/org/jboss/services/binding/ServiceBindingMetadata.java 2009-04-25 12:17:59 UTC (rev 87841)
@@ -116,6 +116,9 @@
*/
private Boolean fixedHostName;
+ /** Description of the binding that can be displayed by management tools */
+ private String description;
+
// ------------------------------------------------------------ Constructors
/**
@@ -338,9 +341,30 @@
public void setPort(int port)
{
this.port = port;
+ }
+
+ /**
+ * Gets a description of the binding suitable for display by management tools.
+ *
+ * @return the description, or <code>null</code> if there isn't one
+ */
+ @ManagementProperty(use={ViewUse.CONFIGURATION}, description="description of the binding")
+ public String getDescription()
+ {
+ return description;
}
/**
+ * Sets a description of the binding suitable for display by management tools.
+ *
+ * @param description the description; may be <code>null</code>
+ */
+ public void setDescription(String description)
+ {
+ this.description = description;
+ }
+
+ /**
* Gets the object that can return this ServiceBinding's values in formats
* usable by consumers. If unset (the norm), {@link ServiceBindingManager} will use
* reasonable defaults based on the format requested by the consumer.
More information about the jboss-cvs-commits
mailing list