[rhq] Branch 'linux-config' - modules/plugins
by Partha Aji
modules/plugins/samba/src/test/java/org/rhq/plugins/samba/SambaComponentTest.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 6e4b2329300ee16b3ff6d2591badb7e4ff2ee2dd
Author: Partha Aji <paji(a)redhat.com>
Date: Tue Jan 5 12:13:07 2010 -0500
Fixed unit tests related to samba ads commit
diff --git a/modules/plugins/samba/src/test/java/org/rhq/plugins/samba/SambaComponentTest.java b/modules/plugins/samba/src/test/java/org/rhq/plugins/samba/SambaComponentTest.java
index 82b527b..f36253e 100644
--- a/modules/plugins/samba/src/test/java/org/rhq/plugins/samba/SambaComponentTest.java
+++ b/modules/plugins/samba/src/test/java/org/rhq/plugins/samba/SambaComponentTest.java
@@ -38,9 +38,7 @@ public class SambaComponentTest extends AbstractAugeasConfigurationComponentTest
config.put(new PropertySimple("idmap uid", null));
config.put(new PropertySimple("idmap gid", null));
- config.put(new PropertySimple("winbind use default domain", null));
- config.put(new PropertySimple("winbind offline logon", null));
- config.put(new PropertySimple("winbind offline logon", null));
+ config.put(new PropertySimple("template shell", null));
config.put(new PropertySimple("winbind enum users", null));
config.put(new PropertySimple("winbind enum groups", null));
config.put(new PropertySimple("winbind separator", null));
14 years, 4 months
[rhq] Branch 'linux-config' - 2 commits - modules/core modules/plugins
by ips
modules/core/native-system/src/test/java/org/rhq/core/system/SigarTest.java | 69
modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 5930 +++++-----
2 files changed, 3014 insertions(+), 2985 deletions(-)
New commits:
commit caf70df8617c2d75413a28f416ae17d54a75a43f
Author: Ian P. Springer <ips(a)jetengine.springer.net>
Date: Tue Jan 5 11:28:08 2010 -0500
remove all deps on other RHQ classes
diff --git a/modules/core/native-system/src/test/java/org/rhq/core/system/SigarTest.java b/modules/core/native-system/src/test/java/org/rhq/core/system/SigarTest.java
index b4088df..8f6332a 100644
--- a/modules/core/native-system/src/test/java/org/rhq/core/system/SigarTest.java
+++ b/modules/core/native-system/src/test/java/org/rhq/core/system/SigarTest.java
@@ -23,16 +23,21 @@
package org.rhq.core.system;
import java.util.Arrays;
-import org.hyperic.sigar.Sigar;
+import java.util.List;
+import java.util.Map;
-/**
+import org.hyperic.sigar.*;
+
+ /**
* The purpose of this class is to provide a simple main class that can be run from the command line so we can send it
* to the SIGAR project team members when we need to report a bug and they need a simple replication test case. All
* tests that we replicate with this class needs to also have a corresponding unit test. When the bug is fixed, we can
* clean out this class's main() for the next replication procedure - we won't lose the test because it will have been
- * duplicated somewhere in our unit test suite.
+ * duplicated somewhere in our unit test suite. In order to make this class as simple as possible for others to compile
+ * and run, it has no dependencies on other RHQ classes.
*
* @author John Mazzitelli
+ * @author Ian Springer
*/
public class SigarTest {
static {
@@ -51,23 +56,47 @@ public class SigarTest {
Sigar sigar = new Sigar();
long[] pids = sigar.getProcList();
for (long pid : pids) {
- ProcessInfo p = new ProcessInfo(pid);
- System.out.println("-->info: " + p);
- System.out.println(" name: " + p.getName());
- System.out.println(" base: " + p.getBaseName());
- System.out.println(" pid: " + p.getPid());
- System.out.println(" ppid: " + p.getParentPid());
- System.out.println(" cmdlin: "
- + ((p.getCommandLine() != null) ? Arrays.asList(p.getCommandLine()) : "<null>"));
- System.out.println(" envvar: " + p.getEnvironmentVariables());
-
- System.out.println(" aggr: " + p.getAggregateProcessTree());
- System.out.println(" exec: " + p.getExecutable());
- System.out.println(" memory: " + p.getMemory());
- System.out.println(" cpu: " + p.getCpu());
- System.out.println(" state: " + p.getState());
- System.out.println(" time: " + p.getTime());
- System.out.println();
+ printNow("*** Retrieving process info for PID [" + pid + "]...");
+
+ ProcExe exe = sigar.getProcExe(pid);
+ printNow(" exe: " + exe.toMap());
+
+ ProcState state = sigar.getProcState(pid);
+ printNow(" state: " + state.toMap());
+
+ List<String> args = Arrays.asList(sigar.getProcArgs(pid));
+ printNow(" args: " + args);
+
+ Map env = sigar.getProcEnv(pid);
+ printNow(" env: " + env);
+
+ ProcCpu cpu = sigar.getProcCpu(pid);
+ printNow(" cpu: " + cpu.toMap());
+
+ ProcCred cred = sigar.getProcCred(pid);
+ printNow(" cred: " + cred.toMap());
+
+ ProcFd fd = sigar.getProcFd(pid);
+ printNow(" fd: " + fd.toMap());
+
+ ProcMem mem = sigar.getProcMem(pid);
+ printNow(" mem: " + mem.toMap());
+
+ List modules = sigar.getProcModules(pid);
+ printNow(" modules:" + modules);
+
+ ProcStat stat = sigar.getProcStat();
+ printNow(" stat: " + stat.toMap());
+
+ ProcTime time = sigar.getProcTime(pid);
+ printNow(" time: " + time.toMap());
+
+ printNow("");
}
}
+
+ private static void printNow(String s) {
+ System.out.println(s);
+ System.out.flush();
+ }
}
\ No newline at end of file
commit 25250de250169da18f29f119a27990dd988297c7
Author: Ian P. Springer <ips(a)jetengine.springer.net>
Date: Tue Jan 5 10:04:01 2010 -0500
rename 'hostname' prop to 'hostName' in ServiceBindingManager resource config (https://jira.jboss.org/jira/browse/JOPR-407)
diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
index 1eef403..df6a2d5 100644
--- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
@@ -1,2965 +1,2965 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!DOCTYPE plugin [
-
-<!ENTITY managedObjectMetrics '
- <metric property="runState" displayType="summary"
- defaultOn="true" defaultInterval="30000" dataType="trait" category="performance"/>
-'>
-
-<!ENTITY datasourceAndConnectionFactoryOperations '
- <operation name="flush" displayName="Flush"
- description="Flush the connections in the pool"/>
-
- <operation name="listFormattedSubPoolStatistics" displayName="List Formatted Sub Pool Statistics"
- description="Obtain a formatted sub pool statistics report">
- <parameters>
- <c:simple-property required="false" name="formatClassName"
- defaultValue="org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter">
- <c:description>
- The fully qualified name of the Java class to use to format the the sub pool statistics. The default
- is "org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter".
- </c:description>
- </c:simple-property>
- </parameters>
- <results>
- <c:simple-property name="result" type="longString">
- <c:description>
- A formatted sub pool statistics report.
- </c:description>
- </c:simple-property>
- </results>
- </operation>
-
- <operation name="listStatistics" displayName="List Statistics" description="Obtain a statistics report">
- <results>
- <c:map-property name="result"/>
- </results>
- </operation>
-
- <operation name="testConnection" displayName="Test Connection" description="Test if a connection can be obtained">
- <results>
- <c:notes>Test if a connection can be obtained</c:notes>
- <c:simple-property type="boolean" name="result" description="Was a connection obtained?"/>
- </results>
- </operation>
-'>
-
-<!-- TODO: Use one shared XML entity for datasource and connection factory metrics. -->
-<!ENTITY datasourceMetrics '
- <!-- Traits -->
- <metric property="poolJndiName" displayType="summary" displayName="Pool JNDI Name"
- defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"
- description="the JNDI name of the connection pool for this datasource"/>
-
- <!-- Numerics -->
- <metric property="availableConnectionCount" measurementType="dynamic" displayType="summary"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"
- description="the maximum number of connections that are available"/>
-
- <metric property="connectionCount" measurementType="dynamic" displayType="summary"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"
- description="the number of connections that are currently in the pool"/>
-
- <metric property="connectionCreatedCount" measurementType="dynamic" displayType="detail"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"
- description="the number of connections that have been created since the datasource was last started"/>
-
- <metric property="connectionDestroyedCount" measurementType="dynamic" displayType="detail"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"
- description="the number of connections that have been destroyed since the datasource was last started"/>
-
- <metric property="inUseConnectionCount" measurementType="dynamic" displayType="detail"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"
- description="the number of connections that are currently in use"/>
-
- <metric property="local-transaction" displayType="summary"
- defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
-
- <metric property="maxConnectionsInUseCount" measurementType="dynamic" displayType="detail"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"
- description="the most connections that have been simultaneously in use since this datasource was started"/>
-
- <metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-
- <metric property="minSize" measurementType="dynamic" displayType="detail" displayName="Min Size"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-'>
-
-<!-- NOTE: For Datasource ManagedProperty annotations, see:
- https://anonsvn.jboss.org/repos/jbossas/trunk/connector/src/main/org/jbos...
- Descriptions of datasource config props can also be culled from the following locations:
- https://anonsvn.jboss.org/repos/jbossas/trunk/connector/src/resources/dtd...
- http://www.jboss.org/file-access/default/members/jbossas/freezone/docs/Ad...
- http://www.jboss.org/community/wiki/ConfigDataSources
- http://www.jboss.org/community/wiki/ConfigJCACommon
- -->
-
-<!ENTITY datasourceAndConnectionFactoryConnectionResourceConfigProps '
- <c:simple-property name="min-pool-size"
- displayName="Minimum Pool Size"
- type="integer"
- required="false"
- defaultValue="0">
- <c:description>
- The minimum number of connections the pool should hold. The default is 0.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="0"/>
- </c:constraint>
- </c:simple-property>
-
- <c:simple-property name="max-pool-size"
- displayName="Maximum Pool Size"
- type="integer"
- required="false"
- defaultValue="10">
- <c:description>
- The maximum number of connections the pool should hold. The default is 10.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="0"/>
- </c:constraint>
- </c:simple-property>
-'>
-
-<!ENTITY datasourceConnectionResourceConfigProps '
- <c:simple-property name="jndi-name"
- displayName="JNDI Name"
- description="The global JNDI Name under which to bind the datasource"
- type="string"/>
-
- <c:simple-property name="user-name"
- displayName="Username"
- description="The default username when creating a new connection."
- type="string"
- activationPolicy="immediate"
- required="false"/>
-
- <c:simple-property name="password"
- displayName="Password"
- description="The default password when creating a new connection."
- type="password"
- activationPolicy="immediate"
- required="false"/>
-'>
-
-<!ENTITY datasourceAndConnectionFactoryAdvancedResourceConfigProps '
- <c:simple-property name="allocation-retry" type="integer" required="false"
- defaultValue="0">
- <c:description>
- The number of times that allocating a connection should be tried before throwing an exception. The default
- is 0.
- </c:description>
- </c:simple-property>
-
- <c:simple-property name="allocation-retry-wait-millis" type="long" required="false" units="milliseconds"
- defaultValue="5000">
- <c:description>
- The time in milliseconds to wait between retrying to allocate a connection. The default is 5000 (5 seconds).
- </c:description>
- </c:simple-property>
-
- <c:simple-property name="background-validation" type="boolean" required="false" defaultValue="false">
- <c:description>
- Specify if connections should be validated on a background thread versus being validated
- prior to use. Background validation is meant to reduce the overall load on the RDBMS system when validating
- a connection. The default is No.
- </c:description>
- </c:simple-property>
-
- <c:simple-property name="background-validation-millis" type="long" required="false" units="milliseconds"
- defaultValue="0">
- <c:description>
- The interval, in milliseconds, at which the ConnectionValidator will run. Set to 0 to disable background
- validation. The default is 0.
- </c:description>
- </c:simple-property>
-
- <c:simple-property name="blocking-timeout-millis" displayName="Blocking Timeout in Milliseconds"
- units="milliseconds" defaultValue="30000"
- type="integer" required="false">
- <c:description>
- Indicates the maximum time in milliseconds to block while waiting for a connection before throwing
- an exception. Note that this blocks only while waiting for a permit for a connection, and will never
- throw an exception if creating a new connection takes an inordinately long time. The default is 30000
- (30 seconds).
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="0"/>
- </c:constraint>
- </c:simple-property>
-
- <c:simple-property name="idle-timeout-minutes" type="integer" activationPolicy="immediate"
- displayName="Idle Timeout" units="minutes" required="false" defaultValue="30">
- <c:description>
- The maximum time, in minutes, a connection may be idle before being closed. The default is 30.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="0"/>
- </c:constraint>
- </c:simple-property>
-
- <c:simple-property name="isSameRM-override-value" type="boolean" required="false">
- <c:description>
- If set, unconditionally sets the boolean return value of javax.transaction.xa.XAResource.isSameRM(XAResource).
- </c:description>
- </c:simple-property>
-
- <c:simple-property name="jmx-invoker-name" required="false">
- <c:description>
- The ObjectName of the JMX Invoker MBean associated with this datasource.
- </c:description>
- </c:simple-property>
-
- <c:map-property name="metadata" required="false" description="Metadata properties.">
- <c:simple-property required="false" name="typeMapping">
- <c:description>
- The name of the corresponding type-mapping in conf/standardjbosscmp-jdbc.xml.
- </c:description>
- <c:property-options>
- <c:option name="Cloudscape" value="Cloudscape"/>
- <c:option name="DB2" value="DB2"/>
- <c:option name="DB2/400" value="DB2/400"/>
- <c:option name="Derby" value="Derby"/>
- <c:option name="Firebird" value="Firebird"/>
- <c:option name="FirstSQL/J" value="FirstSQL/J"/>
- <c:option name="Hypersonic SQL" value="Hypersonic SQL"/>
- <c:option name="InformixDB" value="InformixDB"/>
- <c:option name="Ingres" value="Ingres"/>
- <c:option name="InterBase" value="InterBase"/>
- <c:option name="MaxDB" value="MaxDB"/>
- <c:option name="McKoi" value="McKoi"/>
- <c:option name="Mimer SQL" value="Mimer SQL"/>
- <c:option name="MS SQLSERVER" value="MS SQLSERVER"/>
- <c:option name="MS SQLSERVER2000" value="MS SQLSERVER2000"/>
- <c:option name="Oracle7" value="Oracle7"/>
- <c:option name="Oracle8" value="Oracle8"/>
- <c:option name="Oracle9i" value="Oracle9i"/>
- <c:option name="PointBase" value="PointBase"/>
- <c:option name="PostgreSQL" value="PostgreSQL"/>
- <c:option name="PostgreSQL 7.2" value="PostgreSQL 7.2"/>
- <c:option name="PostgreSQL 8.0" value="PostgreSQL 8.0"/>
- <c:option name="SapDB" value="SapDB"/>
- <c:option name="SOLID" value="SOLID"/>
- <c:option name="Sybase" value="Sybase"/>
- </c:property-options>
- </c:simple-property>
- </c:map-property>
-
- <c:simple-property name="no-tx-separate-pools" type="boolean"
- displayName="No Tx Separate Pools" required="false">
- <c:description>
- If true, the datasource cannot reuse a connection outside a transaction once enlisted in a global transaction
- and vice-versa. The default is Yes.
- </c:description>
- </c:simple-property>
-
- <c:simple-property name="prefill" type="boolean" required="false">
- <c:description>
- Whether to attempt to prefill the connection pool to the minimum number of connections. NOTE: Only
- supporting pools (OnePool) support this feature. A warning can be found in the logs if the pool does not
- support this. The default is No.
- </c:description>
- </c:simple-property>
-
- <c:map-property name="security-domain" displayName="Security Settings" required="false">
- <c:description>
- Security settings for connections in the pool.
- </c:description>
-
- <c:simple-property name="securityDeploymentType" type="string"
- required="false" defaultValue="NONE">
- <c:description>
- Indicates whether Subject (from security domain), application-supplied parameters
- (such as from getConnection(user, pw)), both Subject and app-supplied parameters,
- or neither Subject nor app-supplied parameters are used to distinguish connections
- in the pool. The default is "NONE".
- </c:description>
- <c:property-options>
- <c:option name="None" value="NONE"/>
- <c:option name="Application" value="APPLICATION"/>
- <c:option name="Domain" value="DOMAIN"/>
- <c:option name="Domain and Application" value="DOMAIN_AND_APPLICATION"/>
- </c:property-options>
- </c:simple-property>
-
- <c:simple-property name="domain" type="string"
- required="false">
- <c:description>
- The name of the JAAS security manager that will handle authentication (only required if security
- deployment type is DOMAIN or DOMAIN_AND_APPLICATION). This name correlates to the JAAS login-config.xml
- descriptor application-policy/name attribute.
- </c:description>
- </c:simple-property>
- </c:map-property>
-
- <c:simple-property name="statistics-formatter" required="false">
- <c:description>
- The fully qualified class name of the class to use for formatting managed connection pool statistics for
- this datasource. The class must implement the org.jboss.resource.statistic.formatter.StatisticsFormatter.
- interface. The default is "org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter".
- </c:description>
- </c:simple-property>
-
- <c:simple-property name="type-mapping" displayName="Type Mapping" required="false">
- <c:description>
- The name of the corresponding type-mapping in conf/standardjbosscmp-jdbc.xml.
- </c:description>
- <c:property-options>
- <c:option name="Cloudscape" value="Cloudscape"/>
- <c:option name="DB2" value="DB2"/>
- <c:option name="DB2/400" value="DB2/400"/>
- <c:option name="Derby" value="Derby"/>
- <c:option name="Firebird" value="Firebird"/>
- <c:option name="FirstSQL/J" value="FirstSQL/J"/>
- <c:option name="Hypersonic SQL" value="Hypersonic SQL"/>
- <c:option name="InformixDB" value="InformixDB"/>
- <c:option name="Ingres" value="Ingres"/>
- <c:option name="InterBase" value="InterBase"/>
- <c:option name="MaxDB" value="MaxDB"/>
- <c:option name="McKoi" value="McKoi"/>
- <c:option name="Mimer SQL" value="Mimer SQL"/>
- <c:option name="MS SQLSERVER" value="MS SQLSERVER"/>
- <c:option name="MS SQLSERVER2000" value="MS SQLSERVER2000"/>
- <c:option name="Oracle7" value="Oracle7"/>
- <c:option name="Oracle8" value="Oracle8"/>
- <c:option name="Oracle9i" value="Oracle9i"/>
- <c:option name="PointBase" value="PointBase"/>
- <c:option name="PostgreSQL" value="PostgreSQL"/>
- <c:option name="PostgreSQL 7.2" value="PostgreSQL 7.2"/>
- <c:option name="PostgreSQL 8.0" value="PostgreSQL 8.0"/>
- <c:option name="SapDB" value="SapDB"/>
- <c:option name="SOLID" value="SOLID"/>
- <c:option name="Sybase" value="Sybase"/>
- </c:property-options>
- </c:simple-property>
-
- <c:simple-property name="use-java-context"
- displayName="Use Java Context"
- type="boolean" defaultValue="true"
- required="false">
- <c:description>
- Indicates whether the JNDI name should be bound under the "java" context,
- which causes the DataSource to only be accessible from within the JBossAS VM.
- The default is Yes.
- </c:description>
- </c:simple-property>
-
- <c:simple-property name="use-strict-min" type="boolean" required="false">
- <c:description>
- Whether idle connections below the min-pool-size should be closed. The default is No.
- </c:description>
- </c:simple-property>
-
- <c:simple-property name="validate-on-match" type="boolean" required="false" defaultValue="true">
- <c:description>
- The validate-on-match element indicates whether or not connection level validation should be done when a
- connection factory attempts to match a managed connection for a given set. This is typically exclusive to
- the use of background validation. The default is Yes.
- </c:description>
- </c:simple-property>
-'>
-
-<!ENTITY datasourceAdvancedResourceConfigProps '
- <c:simple-property name="check-valid-connection-sql" type="longString"
- displayName="Check Valid Connection SQL" required="false">
- <c:description>The SQL statement to use to check the validity of a pool connection.</c:description>
- </c:simple-property>
-
- <c:simple-property required="false" name="connection-definition">
- <c:description>
- The connection definition inside the RAR deployment uniquely identified by the connection factory interface,
- e.g. "javax.sql.DataSource".
- </c:description>
- </c:simple-property>
-
- <c:simple-property name="exception-sorter-class-name" type="string" activationPolicy="immediate"
- displayName="Exception Sorter Class Name" required="false">
- <c:description>
- The fully qualified name of a Java class implementing the org.jboss.resource.adapter.jdbc.ExceptionSorter
- interface that should be used to check if a JDBC exception should be broadcast.
- </c:description>
- </c:simple-property>
-
- <c:simple-property name="new-connection-sql" type="longString" activationPolicy="immediate"
- displayName="New Connection SQL" required="false">
- <c:description>
- An SQL statement to execute whenever a new connection is added to the pool; this can be used to set the
- connection schema, etc.
- </c:description>
- </c:simple-property>
-
- <c:simple-property name="prepared-statement-cache-size" type="integer"
- displayName="Prepared Statement Cache Size" required="false" defaultValue="0">
- <c:description>
- The number of prepared statements per connection to be kept open and reused in subsequent requests. They are
- stored in an LRU cache. Set to 0 to disable the cache. The default is 0.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="0"/>
- </c:constraint>
- </c:simple-property>
-
- <c:simple-property name="query-timeout"
- displayName="Query Timeout"
- type="integer"
- units="seconds"
- required="false">
- <c:description>
- Any configured query timeout in seconds. A value of 0 means no timeout. The default is 0.
- </c:description>
- </c:simple-property>
-
- <c:simple-property name="rar-name" required="false">
- <c:description>
- The RAR deployment to associate with the connection manager MBean. e.g. jms-ra.rar or
- myapplication.ear#my.rar for nested rars.
- </c:description>
- </c:simple-property>
-
- <c:simple-property name="set-tx-query-timeout"
- displayName="Set Tx Query Timeout"
- type="boolean"
- required="false"
- defaultValue="false">
- <c:description>
- Whether to set the query timeout based on the time remaining until transaction timeout;
- any configured query timeout will be used if there is no transaction. The default is No.
- </c:description>
- </c:simple-property>
-
- <c:simple-property name="share-prepared-statements" displayName="Share Prepared Statements"
- type="boolean"
- required="false" defaultValue="false">
- <c:description>
- Should prepared statements be shared? The default is No.
- </c:description>
- </c:simple-property>
-
- <c:simple-property name="stale-connection-checker-class-name"
- displayName="Stale Connection Checker Class Name"
- type="string"
- required="false">
- <c:description>
- Fully qualified name of the Java class used to check if a connection has become stale.
- </c:description>
- </c:simple-property>
-
- <c:simple-property name="track-statements" type="string"
- displayName="Track Statements" required="false">
- <c:description>
- Whether to check for unclosed Statements and ResultSets when connections are returned to the pool. The
- default is "yes-no-warnings".
- </c:description>
- <c:property-options>
- <c:option name="No" value="no"/>
- <c:option name="Yes" value="yes"/>
- <c:option name="Yes, but no warnings" value="yes-no-warnings" default="true"/>
- </c:property-options>
- </c:simple-property>
-
- <c:simple-property name="transaction-isolation" required="false"
- description="The Transaction Isolation level. The default setting is to use whichever isolation level is provided by default by the database.">
- <c:property-options>
- <c:option value="TRANSACTION_READ_UNCOMMITTED" name="Read Uncommitted"/>
- <c:option value="TRANSACTION_READ_COMMITTED" default="true" name="Read Committed"/>
- <c:option value="TRANSACTION_REPEATABLE_READ" name="Repeatable Read"/>
- <c:option value="TRANSACTION_SERIALIZABLE" name="Serializable"/>
- <c:option value="TRANSACTION_NONE" name="None"/>
- </c:property-options>
- </c:simple-property>
-
- <c:simple-property name="url-delimiter" required="false" default="|">
- <c:description>
- Specifies the delimiter for URLs in the value of the connection-url property for HA datasources.
- The default is "|".
- </c:description>
- </c:simple-property>
-
- <c:simple-property name="url-selector-strategy-class-name" required="false">
- <c:description>
- The fully qualified class name of a Java class implementing the
- org.jboss.resource.adapter.jdbc.URLSelectorStrategy interface.
- </c:description>
- </c:simple-property>
-
- <c:simple-property name="use-try-lock" type="long" required="false" defaultValue="0">
- <c:description>
- Any configured timeout, in milliseconds, for internal locks on the resource adapter objects. A value of 0
- means no timeout. The default is 0.
- </c:description>
- </c:simple-property>
-
- <c:simple-property name="valid-connection-checker-class-name" type="string"
- displayName="Valid Connection Checker Class Name" required="false">
- <c:description>
- The fully qualified name of a Java class implementing the
- org.jboss.resource.adapter.jdbc.ValidConnectionChecker whose pingDatabase method should be used to check if
- a connection is still valid before handing it out from the pool.
- </c:description>
- </c:simple-property>
-'>
-
-<!ENTITY nonXaDatasourceConnectionResourceConfigProps '
- <c:simple-property name="driver-class"
- displayName="JDBC Driver Class"
- type="string">
- <c:description>
- The fully qualified name of the JDBC driver class (e.g. "oracle.jdbc.driver.OracleDriver").
- </c:description>
- </c:simple-property>
-
- <c:simple-property name="connection-url"
- displayName="Connection URL"
- type="string">
- <c:description>
- The JDBC URL for the database (e.g. "jdbc:oracle:thin:@host.example.com:1521:db"). To define a high
- availablity (HA) datasource, specify a list of URLs separated by URL delimiters
- (e.g. "jdbc:oracle:thin:@host1.example.com:1521:db1|jdbc:oracle:thin:@host2.example.com:1521:db2").
- </c:description>
- </c:simple-property>
-
- <c:map-property name="connection-properties" required="false"
- description="Arbitrary connection properties that should be passed to the java.sql.Driver.connect(url, props) method."/>
-'>
-
-<!ENTITY nonXaDatasourceOracleTemplateProps '
- <c:simple-property name="driver-class" default="oracle.jdbc.driver.OracleDriver"/>
- <c:simple-property name="connection-url" default="jdbc:oracle:oci:@youroracle-tns-name"/>
- <c:simple-property name="exception-sorter-class-name"
- default="org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter"/>
- <c:simple-property name="check-valid-connection-sql" default="SELECT * FROM DUAL"/>
- <c:simple-property name="type-mapping" default="oracle.jdbc.driver.OracleDriver"/>
- <c:simple-property name="use-try-lock" default="60000"/>
- <c:map-property name="metadata">
- <c:simple-property name="typeMapping" default="Oracle9i"/>
- </c:map-property>
- <c:simple-property name="type-mapping" default="Oracle9i"/>
-'>
-
-<!--
- See:
- https://anonsvn.jboss.org/repos/jbossas/trunk/connector/src/main/org/jbos...
- http://www.jboss.org/community/wiki/ConfigJCACommon
- -->
-
-<!ENTITY connectionFactoryConnectionResourceConfigProps '
- <c:simple-property required="true" name="jndi-name" displayName="JNDI Name"
- description="The global JNDI name to bind the connection factory under."/>
-
- <c:simple-property required="true" name="rar-name" displayName="RAR Name">
- <c:description>
- The name of the RAR file that contains the definition for the resource we want to provide. For nested RAR
- files, the name would look like myapplication.ear#my.rar.
- </c:description>
- </c:simple-property>
-
- <c:simple-property required="true" name="connection-definition">
- <c:description>
- The connection factory interface class. It should match the connectionfactory-interface in the ra.xml file.
- </c:description>
- </c:simple-property>
-
-'>
-
-
-<!ENTITY connectionFactoryAdvancedResourceConfigProps '
- <c:list-property required="false" name="config-property">
- <c:description>
- Properties to supply to the ManagedConnectionFactory (MCF) MBean service configuration.
- </c:description>
- <c:map-property name="config-property">
- <c:simple-property name="name" description="The name of the configuration property." />
- <c:simple-property name="type" description="The type of the configuration property.">
- <c:property-options>
- <c:option value="java.lang.String" default="true"/>
- <c:option value="java.lang.Boolean"/>
- <c:option value="java.lang.Integer"/>
- <c:option value="java.lang.Double"/>
- <c:option value="java.lang.Byte"/>
- <c:option value="java.lang.Short"/>
- <c:option value="java.lang.Long"/>
- <c:option value="java.lang.Float"/>
- <c:option value="java.lang.Character"/>
- </c:property-options>
- </c:simple-property>
- <c:simple-property name="value" required="false" description="The value of the configuration property." />
- </c:map-property>
- </c:list-property>
-'>
-
-<!ENTITY connectionFactoryMetrics '
- <!-- Traits -->
- <metric property="poolJndiName" displayType="summary" displayName="Pool JNDI Name" defaultOn="true"
- defaultInterval="600000" dataType="trait" category="performance"/>
-
- <!-- Numerics -->
- <metric property="availableConnectionCount" measurementType="dynamic" displayType="summary"
- displayName="Available Connection Count" description="Number of available connections."
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-
- <metric property="connectionCount" measurementType="dynamic" displayType="summary"
- displayName="Connection Count" defaultOn="true" defaultInterval="60000" dataType="measurement"
- category="performance"/>
-
- <metric property="connectionCreatedCount" measurementType="dynamic" displayType="detail"
- displayName="Connection Created Count" defaultOn="true" defaultInterval="60000"
- dataType="measurement" category="performance"/>
-
- <metric property="connectionDestroyedCount" measurementType="dynamic" displayType="detail"
- displayName="Connection Destroyed Count" defaultOn="true" defaultInterval="60000"
- dataType="measurement" category="performance"/>
-
- <metric property="inUseConnectionCount" measurementType="dynamic" displayType="detail"
- displayName="In Use Connection Count" description="Mumber of connections currently in use."
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-
- <metric property="maxConnectionsInUseCount" measurementType="dynamic" displayType="detail"
- displayName="Max Connections In Use Count" description="Maximum number of maximum connections that have been in use."
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-
- <metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-
- <metric property="minSize" measurementType="dynamic" displayType="detail" displayName="Min Size"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-'>
-
-<!-- These are the operations that both Topics and Queues have. -->
-<!ENTITY destinationOperations '
- <operation name="removeAllMessages" displayName="Remove All Messages" description="Remove all messages from the destination."/>
-
- <operation name="start" displayName="Start" description="Start the destination."/>
-
- <operation name="stop" displayName="Stop" description="Stop the destination."/>
-'>
-
-<!ENTITY deploymentContentConfigProps '
- <configuration>
- <c:group name="deployment" displayName="Deployment Options">
- <c:simple-property name="deployExploded" displayName="Deploy Exploded?" type="boolean" required="true"
- default="false">
- <c:description>
- Should the archive be deployed in exploded form (i.e. as a directory)?
- </c:description>
- </c:simple-property>
- <c:simple-property name="deployFarmed" type="boolean" required="true" default="false">
- <c:description>
- Should the application be deployed as a farmed deployment (i.e. to the farm directory, rather than
- the deploy directory)? This option should only be set to Yes if this application server instance is
- a node in a cluster, otherwise the application creation will fail. If set to Yes, the Deploy
- Exploded property must be set to No, since exploded deployments to farm via the Profile Service are
- currently not supported.
- </c:description>
- </c:simple-property>
- </c:group>
- </configuration>
-'>
-
-<!ENTITY webApplicationMetrics '
- <metric property="contextRoot"
- dataType="trait" displayType="summary"
- description="this context root of this WAR (e.g. jmx-console) - used as a unique path prefix for URLs
- corresponding to this WAR"/>
-
- <metric property="virtualHosts"
- dataType="trait" displayType="summary"
- description="the virtual host(s) to which this WAR is deployed"/>
-'>
-
-<!ENTITY webApplicationContextMetrics '
- <metric property="virtualHost"
- dataType="trait" displayType="summary"
- description="the virtual host with which this context is associated"/>
-
- <metric property="responseTime"
- dataType="calltime" defaultOn="false" defaultInterval="600000" units="milliseconds" destinationType="URL"
- description="the minimum, maximum, and average response times for requests serviced by this webapp"/>
-
- <metric property="activeSessions"
- displayName="Currently Active Sessions"
- units="none" description="the number of sessions that are currently active for this WAR" />
-
- <metric property="maxActive" displayName="Maximum Active Sessions"
- units="none" description="the maximum number of sessions that have been active for this WAR" />
-
- <metric property="sessionCounter" displayName="Created Sessions"
- units="none" description="the number of sessions created for this WAR"
- measurementType="trendsup" />
-
- <metric property="expiredSessions" displayName="Expired Sessions"
- units="none" description="the number of expired sessions for this WAR"
- measurementType="trendsup" />
-
- <metric property="rejectedSessions" displayName="Rejected Sessions"
- units="none" description="the number of sessions rejected for this WAR"
- measurementType="trendsup" />
-
- <metric property="sessionAverageAliveTime" displayName="Average Session Alive Time"
- units="seconds" description="the average alive time of sessions for this WAR" />
-
- <metric property="sessionMaxAliveTime" displayName="Max Session Alive Time"
- units="seconds" description="the maximum alive time of sessions for this WAR" />
-
- <metric property="Servlet.minimumResponseTime" displayName="Minimum Response Time"
- units="milliseconds"
- description="the minimum response time for requests serviced by this WAR"/>
-
- <metric property="Servlet.averageResponseTime" displayName="Average Response Time"
- units="milliseconds"
- description="the average response time for requests serviced by this WAR"/>
-
- <metric property="Servlet.maximumResponseTime" displayName="Maximum Response Time"
- units="milliseconds"
- description="the maximum response time for requests serviced by this WAR"/>
-
- <metric property="Servlet.totalResponseTime" displayName="Total Response Time"
- units="milliseconds" measurementType="trendsup"
- description="the total response time for requests serviced by this WAR"/>
-
- <metric property="Servlet.requestCount" displayName="Number of Requests Serviced"
- units="none" description="the number of requests serviced by this WAR"
- measurementType="trendsup" displayType="summary"/>
-
- <metric property="Servlet.errorCount" displayName="Number of Error Responses"
- units="none" description="the number of error responses sent by this WAR"
- measurementType="trendsup" displayType="summary"/>
-'>
-
-<!ENTITY ejb3StatelessSessionBeanDefinition '
- <plugin-configuration>
- <c:simple-property name="componentType" default="EJB3" readOnly="true"/>
- <c:simple-property name="componentSubtype" default="StatelessSession" readOnly="true"/>
- <c:simple-property name="componentName" readOnly="true"/>
- <c:simple-property name="invocationStatsPropertyName" default="invocationStats" readOnly="true"/>
- </plugin-configuration>
-'>
-
-<!ENTITY ejb3StatefulSessionBeanDefinition '
- <plugin-configuration>
- <c:simple-property name="componentType" default="EJB3" readOnly="true"/>
- <c:simple-property name="componentSubtype" default="StatefulSession" readOnly="true"/>
- <c:simple-property name="componentName" readOnly="true"/>
- <c:simple-property name="invocationStatsPropertyName" default="invocationStats" readOnly="true"/>
- </plugin-configuration>
-'>
-
-<!ENTITY ejb3MessageDrivenBeanDefinition '
- <plugin-configuration>
- <c:simple-property name="componentType" default="EJB3" readOnly="true"/>
- <c:simple-property name="componentSubtype" default="MessageDriven" readOnly="true"/>
- <c:simple-property name="componentName" readOnly="true"/>
- <c:simple-property name="invocationStatsPropertyName" default="invocationStats" readOnly="true"/>
- </plugin-configuration>
-'>
-
-<!ENTITY ejb3CommonMetrics '
- <metric property="name" displayName="EJB Name" dataType="trait" displayType="summary"
- description="the name of this EJB"/>
-'>
-
-<!ENTITY ejb3SessionBeanMetrics '
- <metric property="availableCount"
- description="The number of pooled instances of this EJB3 Session Bean in the method-ready state"/>
-
- <metric property="createCount" displayType="summary" measurementType="trendsup"
- description="The number of instances of this EJB3 Session Bean that have been created since server start"/>
-
- <metric property="currentSize" displayName="Current Count"
- description="The total number of currently pooled instances of this EJB3 Session Bean"/>
-
- <metric property="maxSize"
- description="The maximum number of instances that are allowed to be pooled"/>
-
- <metric property="removeCount" displayType="summary" measurementType="trendsup"
- description="The number of instances of this EJB3 Session Bean that have been removed since server start"/>
-
- <!-- default interval == 600000 ms == 10 min -->
- <metric property="methodInvocationTime" dataType="calltime" units="milliseconds"
- defaultOn="false" defaultInterval="600000" destinationType="Method Name"
- description="The minimum, maximum, and average invocation times for each of the methods exposed by this EJB"/>
-'>
-
-<!ENTITY ejb3StatefulSessionBeanMetrics '
- <metric property="cacheSize" measurementType="dynamic" displayType="detail" displayName="Cache Size"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-
- <metric property="passivatedCount" measurementType="dynamic" displayType="detail" displayName="Passivated Count"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-
- <metric property="totalSize" measurementType="dynamic" displayType="detail" displayName="Total Size"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-'>
-
-<!ENTITY ejb3MessageDrivenBeanMetrics '
- <metric property="minPoolSize" measurementType="dynamic" displayType="detail" displayName="Minimum Pool Size"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-
- <metric property="maxPoolSize" measurementType="dynamic" displayType="detail" displayName="Maximum Pool Size"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-
- <metric property="maxMessages" measurementType="dynamic" displayType="detail" displayName="Maximum number of Messages"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-'>
-
-<!ENTITY ejb2PoolMetrics '
- <metric property="CurrentPoolSize" displayName="Current Pool Size" displayType="summary" measurementType="dynamic"
- description="The number of beans in the pool."/>
-
- <metric property="MaxPoolSize" displayName="Max Pool Size" displayType="summary" measurementType="dynamic"
- description="The maximum pool size."/>
-'>
-
-<!ENTITY ejb2CreateRemoveMetrics '
- <metric property="CreateCount" displayName="Create Count" displayType="summary" measurementType="trendsup"
- description="The number of instances of this EJB2 Session Bean that have been created. since server start."/>
-
- <metric property="RemoveCount" displayName="Remove Count" displayType="summary" measurementType="trendsup"
- description="The number of instances of this EJB2 Session Bean that have been removed since server start."/>
-'>
-
-<!ENTITY ejb2SessionBeanMetrics '
- <!-- default interval == 600000 ms == 10 min -->
- <metric property="methodInvocationTime" dataType="calltime" units="milliseconds"
- defaultOn="false" defaultInterval="600000" destinationType="Method Name"
- description="The minimum, maximum, and average invocation times for each of the methods exposed by this EJB"/>
-'>
-
-<!ENTITY ejbInvocationStatsOperation '
- <operation name="viewInvocationStats" displayName="View Method Statistics" description="Display detailed method invocation statistics.">
- <results>
- <c:list-property name="methods">
- <c:map-property name="method">
- <c:simple-property name="methodName" displayName="Method Name" />
- <c:simple-property name="count" displayName="Count" description="The number of times this method has been called."/>
- <c:simple-property name="totalTime" displayName="Total Time" description="The total time spent executing this method."/>
- <c:simple-property name="minTime" displayName="Min Invocation Time" description="The fastest execution of this method."/>
- <c:simple-property name="maxTime" displayName="Max Invocation Time" description="The slowest execution of this method."/>
- </c:map-property>
- </c:list-property>
- </results>
- </operation>
-'>
-
-<!ENTITY ejb2StatelessSessionBeanDefinition '
- <plugin-configuration>
- <c:simple-property name="componentType" default="EJB" readOnly="true"/>
- <c:simple-property name="componentSubtype" default="StatelessSession" readOnly="true"/>
- <c:simple-property name="componentName" readOnly="true"/>
- <c:simple-property name="invocationStatsPropertyName" default="DetypedInvocationStatistics" readOnly="true"/>
- </plugin-configuration>
-'>
-
-<!ENTITY ejb2StatelessSessionBeanMetrics '
- <!-- no additional metrics apart from the common ones are defined for the SLSBs -->
-'>
-
-<!ENTITY ejb2StatefulSessionBeanDefinition '
- <plugin-configuration>
- <c:simple-property name="componentType" default="EJB" readOnly="true"/>
- <c:simple-property name="componentSubtype" default="StatefulSession" readOnly="true"/>
- <c:simple-property name="componentName" readOnly="true"/>
- <c:simple-property name="invocationStatsPropertyName" default="DetypedInvocationStatistics" readOnly="true"/>
- </plugin-configuration>
-'>
-
-<!ENTITY ejb2StatefulSessionBeanMetrics '
- <metric displayName="Passive Beans"
- description="The count of beans in the passivated state"
- property="PassivatedCount"
- displayType="summary"/>
-'>
-
-<!ENTITY ejb2MessageDrivenBeanDefinition '
- <plugin-configuration>
- <c:simple-property name="componentType" default="EJB" readOnly="true"/>
- <c:simple-property name="componentSubtype" default="MDB" readOnly="true"/>
- <c:simple-property name="componentName" readOnly="true"/>
- </plugin-configuration>
-'>
-
-<!ENTITY ejb2MessageDrivenBeanMetrics '
- <metric property="MessageCount" displayName="Message Count"
- description="The number of messages sent/received"
- displayType="summary"
- measurementType="trendsup" />
-'>
-
-<!ENTITY ejb2EntityBeanDefinition '
- <plugin-configuration>
- <c:simple-property name="componentType" default="EJB" readOnly="true"/>
- <c:simple-property name="componentSubtype" default="Entity" readOnly="true"/>
- <c:simple-property name="componentName" readOnly="true"/>
- </plugin-configuration>
-'>
-
-<!ENTITY ejb2EntityBeanMetrics '
- <metric property="CacheSize"
- displayName="Cache Size"
- displayType="summary"
- defaultOn="true"/>
-'>
-
-<!ENTITY subscriptionsResultProperty '
- <c:list-property name="result">
- <c:map-property name="subscription">
- <c:simple-property name="id" summary="true"
- description="the unique ID of the subscription"/>
- <c:simple-property name="clientID"
- description="the subscriber-specified client ID"/>
- <c:simple-property name="name"
- description="the topic name"/>
- <c:simple-property name="selector" required="false"
- description="the selector, if the subscriber specified one"/>
- <c:simple-property name="durable" type="boolean" summary="true"
- description="is the subscription durable?"/>
- <c:simple-property name="maxSize" type="integer"/>
- <c:simple-property name="messageCount" type="integer" summary="true"
- description="the number of messages the subscription has received"/>
- </c:map-property>
- </c:list-property>
-'>
-
-]>
-
-<!--############################################# END OF XML ENTITIES ###############################################-->
-
-
-
-<plugin name="JBossAS5" displayName="JBoss Application Server 5.x" package="org.rhq.plugins.jbossas5"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- description="Supports management and monitoring of JBoss AS from version EAP 5"
- xmlns="urn:xmlns:rhq-plugin"
- xmlns:c="urn:xmlns:rhq-configuration">
-
- <depends plugin="JMX" useClasses="true"/>
-
- <server name="JBossAS Server"
- classLoader="instance"
- class="ApplicationServerComponent"
- discovery="ApplicationServerDiscoveryComponent"
- description="JBoss Application Server (AS) or Enterprise Application Platform (EAP) 5.x">
-
- <subcategories>
- <subcategory name="Resources"
- description="Different types of Resources">
- <subcategory name="Datasources"
- description="Different types of Datasources"/>
- <subcategory name="Connection Factories"
- description="Different types of Connection Factories"/>
- <subcategory name="JMS Destinations"
- description="Different types of JMS Destinations"/>
- </subcategory>
- <subcategory name="Applications"
- description="Different types of Applications (WARs, EARs, etc.)">
- </subcategory>
- </subcategories>
-
- <plugin-configuration>
- <c:group name="connectionInfo">
- <c:simple-property name="namingURL" displayName="Naming Provider URL"
- description="The JBoss Naming Provider (JNP) URL with which to connect to the JBoss AS or EAP instance (e.g. jnp://127.0.0.1:1099)."/>
- <c:simple-property name="principal" required="false" description="The name of the principal (i.e. user) to authenticate."/>
- <c:simple-property name="credentials" type="password" required="false"
- description="The credentials (i.e. password) that should be used to authenticate the principal."/>
- <c:simple-property name="homeDir" displayName="JBoss Home Directory" type="directory" readOnly="true"
- description="The absolute path to the directory where JBoss AS or EAP is installed (e.g. /opt/jboss-5.1.0.GA)."/>
- <c:simple-property name="serverHomeDir" type="directory" readOnly="true"
- description="The path to the configuration directory under which this instance
- operates (e.g. /opt/jboss-5.2.0.GA/server/default); if the path is not absolute,
- then it will be resolved relative to {homeDir}."/>
- <c:simple-property name="serverName" required="false"
- description="The name of the server configuration (e.g. minimal, default, or all);
- if not specified, it will default to the last path component of {serverHomeDir}."
- default="default"/>
- </c:group>
- <c:group name="control" displayName="Operations">
- <c:simple-property name="scriptPrefix" displayName="Script Prefix" type="string" required="false"
- description="A prefix applied to script execution commands. Typically a sudo
- for applicable platforms. The prefix is applied verbatim. As such, a
- sudo user must be configured appropriately. Ignored if not set."/>
- <c:simple-property name="startScript" displayName="Start Script" type="file" required="false"
- description="The path to the script used by the 'Start' operation
- to start this JBossAS server
- (e.g. /opt/jboss-5.2.0.GA/bin/run.sh); if the path is not absolute,
- then it will be resolved relative to {jbossHomeDir};
- defaults to 'bin/run.sh' on UNIX or 'bin\run.bat' on Windows."/>
- <c:simple-property name="shutdownScript" displayName="Shutdown Script" type="file" required="false"
- description="The path to the script used by the Shut Down operation
- to shut down this JBossAS server
- (e.g. /opt/jboss-5.2.0.GA/bin/shutdown.sh); if the path is not absolute,
- then it will be resolved relative to {jbossHomeDir};
- defaults to 'bin/shutdown.sh' on UNIX or 'bin\shutdown.bat' on Windows."/>
- <c:simple-property name="shutdownMethod" displayName="Shutdown Method" type="string" required="false" default="JMX"
- description="The method used to execute the Shut Down operation;
- defaults to 'JMX MBean'.">
- <c:property-options>
- <c:option value="JMX" name="JMX MBean" default="true"/>
- <c:option value="SCRIPT" name="shutdown script"/>
- </c:property-options>
- </c:simple-property>
- <c:simple-property name="bindAddress" displayName="Bind Address" required="false" default="127.0.0.1"
- description="The host or IP address that all application server services should listen on
- (e.g. 10.11.14.233 or foo.example.com); specify 0.0.0.0 to tell the
- application server to bind to all available network interfaces; defaults to
- '127.0.0.1'."/>
- </c:group>
-
- <c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
- <c:simple-property name="shutdownMBeanName" displayName="Shutdown MBean Name"
- default="jboss.system:type=Server"
- description="Name of the MBean to use when shutting down this server through JMX."/>
- <c:simple-property name="shutdownMBeanOperation" displayName="Shutdown MBean Operation" default="shutdown"
- description="Name of the operation to invoke when shutting down this server through JMX.
- Note that only operations with no parameter or with one int parameter are supported. If the
- operation requires an int parameter, '0' will be supplied."/>
- <c:simple-property name="availabilityCheckPeriod" description="The amount of time, in seconds, that must elapse between availability checks to see if the server is up. If set, the availability checks will be performed asynchronously thus allowing slow-responding servers to avoid being falsely reported as down."
- units="seconds" required="false" type="integer">
- <c:constraint>
- <c:integer-constraint minimum="60"/>
- </c:constraint>
- </c:simple-property>
- </c:group>
-
- <c:group name="events">
- <c:list-property name="logEventSources">
- <c:map-property name="logEventSource">
- <c:simple-property name="logFilePath" type="file" summary="true"
- description="The absolute path to the source log file."/>
- <c:simple-property name="enabled" type="boolean" summary="true"
- description="A flag indicating whether of not this log Event source is currently
- enabled (i.e. whether the associated log file should be tailed for
- new entries)."/>
- <c:simple-property name="dateFormat" required="false"
- description="The date format to use when parsing the dates in log entries. The
- format must be in the syntax defined by the Java SimpleDateFormat
- class. If not specified, the three date formats that are predefined
- by Log4J (ISO8601, DATE, and ABSOLUTE) will be tried."/>
- <c:simple-property name="includesPattern" required="false"
- description="A regular expression against which a log entry's detail is matched
- to determine if an Event should be fired for that entry. If not
- specified, no filtering of log entries will be done based on their
- detail."/>
- <c:simple-property name="minimumSeverity" required="false" default="error"
- description="The minimum severity of Events that should be collected for this
- source. If not specified, there is no minimum severity (i.e. all
- events will be collected).">
- <c:property-options>
- <c:option name="debug" value="debug"/>
- <c:option name="info" value="info"/>
- <c:option name="warn" value="warn"/>
- <c:option name="error" value="error" default="true"/>
- <c:option name="fatal" value="fatal"/>
- </c:property-options>
- </c:simple-property>
- </c:map-property>
- </c:list-property>
- </c:group>
- </plugin-configuration>
-
- <process-scan name="jbossas" query="process|basename|match=^java.*,arg|org.jboss.Main|match=.*"/>
-
- <operation name="start" displayName="Start"
- description="Start this application server. The script used is specified in the Operations group of connection properties. This operation will fail if the server is already started.">
- <results><c:simple-property name="operationResult" description="Outcome of starting the server."/></results>
- </operation>
-
- <operation name="shutdown" displayName="Shut Down"
- description="Shut down this application server via script or JMX, depending on the settings in the Operations and Advanced groups of connection properties. This operation will fail if the server is already shut down.">
- <results><c:simple-property name="operationResult" description="Outcome of shutting down the server."/></results>
- </operation>
-
- <operation name="restart" displayName="Restart"
- description="Shut down (if started) and then start this application server.">
- <results><c:simple-property name="operationResult" description="Outcome of restarting the server."/></results>
- </operation>
-
- <metric displayName="Partition Name" property="MCBean|ServerConfig|*|partitionName"
- dataType="trait" displayType="summary"
- description="the name of the cluster partition this server belongs to"/>
-
- <metric displayName="Server Name" property="MCBean|ServerConfig|*|serverName"
- dataType="trait" displayType="summary"
- description="the name of the active profile (i.e. configuration set) this server is using"/>
-
- <metric displayName="Server Home Dir" property="MCBean|ServerConfig|*|serverHomeDir"
- dataType="trait" displayType="summary"
- description="the full path of the configuration set directory this server is using (e.g. /opt/jboss-5.1.0.CR1/server/default)"/>
-
- <metric displayName="Home Dir" property="MCBean|ServerConfig|*|serverHomeDir"
- dataType="trait" displayType="summary"
- description="the full path of the JBoss AS installation directory this server is using (e.g. /opt/jboss-5.1.0.CR1)"/>
-
- <metric displayName="Version Name" property="MCBean|MCServer|*|versionName"
- dataType="trait" displayType="summary"
- description="the code name for the this app server instance's major version (AS 5.0 = Morpheus, AS 5.1 = The Oracle, AS 6.0 = Neo)"/>
-
- <metric displayName="Build Date" property="MCBean|MCServer|*|buildDate"
- dataType="trait" displayType="summary"
- description="the date this app server was built"/>
-
- <metric displayName="Start Date" property="MCBean|MCServer|*|startDate"
- dataType="trait" displayType="summary"
- description="the date and time this app server instance was started"/>
-
- <metric displayName="Active Thread Count" property="MCBean|ServerInfo|*|activeThreadCount"
- description="The current number of active threads for this app server instance"
- defaultInterval="300000" displayType="summary" category="throughput"/>
-
- <metric displayName="Active Thread Group Count" property="MCBean|ServerInfo|*|activeThreadGroupCount"
- description="The current number of active thread groups for this app server instance"
- defaultInterval="300000" defaultOn="true" category="throughput"/>
-
- <metric displayName="JVM Free Memory" property="MCBean|ServerInfo|*|freeMemory" displayType="summary"
- description="The amount of free memory for the JVM this app server instance is running on"
- defaultInterval="300000" defaultOn="true" category="utilization" units="bytes"/>
-
- <metric displayName="JVM Max Memory" property="MCBean|ServerInfo|*|maxMemory"
- description="The amount of max memory for the JVM this app server instance is running on"
- defaultInterval="1800000" defaultOn="true" category="utilization" units="bytes"/>
-
- <metric displayName="JVM Total Memory" property="MCBean|ServerInfo|*|totalMemory" displayType="summary"
- description="The amount of total memory for the JVM this app server instance is running on"
- defaultInterval="300000" defaultOn="true" category="utilization" units="bytes"/>
-
- <metric displayName="Total Transactions" property="MCBean|JTA|*|transactionCount" measurementType="trendsup"
- defaultInterval="300000" defaultOn="true" category="utilization"
- description="Total number of transactions since last restart"/>
-
- <metric displayName="Transactions Committed" property="MCBean|JTA|*|commitCount" displayType="summary" measurementType="trendsup"
- defaultInterval="600000" defaultOn="true" category="utilization"
- description="Number of transactions committed since last restart"/>
-
- <metric displayName="Transactions Rolled Back" property="MCBean|JTA|*|rollbackCount" measurementType="trendsup"
- defaultInterval="600000" defaultOn="true" category="utilization"
- description="Number of transactions committed since last restart"/>
-
- <event name="logEntry" description="an entry was appended to a log file"/>
-
- <content name="library" displayName="JAR Library" category="deployable"
- description="Library Jar files deployed in JBoss AS">
- <configuration>
- <c:simple-property name="version" readOnly="true" description="The version declared by the JAR's manifest."/>
- <c:simple-property name="title" readOnly="true" description="The title declared by the JAR's manifest."/>
- <c:simple-property name="url" readOnly="true" description="The url declared by the JAR's manifest."/>
- <c:simple-property name="vendor" readOnly="true" description="The vendor declared by the JAR's manifest."/>
- <c:simple-property name="classpath" readOnly="true"
- description="The classpath declared by the JAR's manifest."/>
- <c:simple-property name="sealed" readOnly="true" type="boolean" description="True if the JAR is sealed."/>
- </configuration>
- </content>
-
- <content name="cumulativePatch" displayName="Cumulative Patch" category="deployable"
- description="Automatically installable application server patches">
- <configuration>
- <c:simple-property name="jiraId"/>
- <c:simple-property name="distributionStatus"/>
- <c:simple-property name="downloadUrl"/>
- <c:simple-property name="instructionCompatibilityVersion"/>
- </configuration>
- </content>
-
- <server name="JBoss AS JVM"
- description="JVM of the JBossAS"
- sourcePlugin="JMX"
- sourceType="JMX Server"
- discovery="org.rhq.plugins.jmx.EmbeddedJMXServerDiscoveryComponent"
- class="org.rhq.plugins.jmx.JMXServerComponent"
- singleton="true"/>
-
- <service name="JBoss Web"
- description="JBoss Web Servlet Container"
- subCategory="Resources"
- discovery="JBossWebDiscoveryComponent"
- class="JBossWebComponent"
- singleton="true">
-
- <service name="Connector"
- description="a JBoss Web Connector"
- discovery="ConnectorDiscoveryComponent"
- class="ConnectorComponent">
-
- <plugin-configuration>
- <c:simple-property name="protocol" type="string" description="this connector's protocol (e.g. jk, ajp, http)" default="http"/>
- <c:simple-property name="address" type="string" description="the IP address this connector listens on" readOnly="true"/>
- <c:simple-property name="port" type="integer" description="the port this connector listens on" readOnly="true"/>
- <c:group name="advanced">
- <c:simple-property name="componentType" default="MBean" readOnly="true"/>
- <c:simple-property name="componentSubtype" default="WebRequestProcessor" readOnly="true"/>
- <c:simple-property name="componentName" readOnly="true"/>
- </c:group>
- </plugin-configuration>
-
- <metric property="maxTime"
- displayName="Maximum Request Time"
- description="the maximum time it took to process a request since the last restart"
- units="milliseconds"
- defaultOn="true" category="performance"/>
-
- <metric property="requestCount"
- displayName="Request Count" description="the total number of requests processed since the last restart"
- defaultOn="false" category="utilization" measurementType="trendsup"/>
-
- <metric property="errorCount"
- displayName="Error Count" description="the number of errors while processing requests since the last restart"
- defaultOn="true" category="utilization" measurementType="trendsup"/>
-
- <metric property="ThreadPool|currentThreadsBusy"
- displayName="Current Active Threads"
- defaultOn="true" category="utilization" displayType="summary"
- description="the number of threads for this connector that are currently active"/>
-
- <metric property="ThreadPool|currentThreadCount"
- displayName="Current Thread Count"
- defaultOn="true" category="utilization" displayType="summary"
- description="the number of threads for this connector that currently exist"/>
-
- </service>
-
- <service name="Virtual Host"
- discovery="VirtualHostDiscoveryComponent"
- class="VirtualHostComponent"
- description="a JBoss Web virtual host">
-
- <plugin-configuration>
- <c:simple-property name="name" type="string" description="the virtual host's name (e.g. localhost)"/>
- <c:group name="advanced">
- <c:simple-property name="componentType" default="MBean" readOnly="true"/>
- <c:simple-property name="componentSubtype" default="WebHost" readOnly="true"/>
- <c:simple-property name="componentName" readOnly="true"/>
- </c:group>
- </plugin-configuration>
-
- <metric property="aliases"
- description="the aliases for this virtual host, if any"
- dataType="trait" displayType="summary"/>
- </service>
-
- </service>
-
-
- <!-- =================================== ManagedComponent Resource types =================================== -->
-
- <service name="No Tx Datasource"
- class="ManagedComponentComponent"
- discovery="ManagedComponentDiscoveryComponent"
- createDeletePolicy="both"
- subCategory="Datasources"
- description="No Transaction Datasources deployed in the instance of JBoss AS">
-
- <plugin-configuration>
- <c:simple-property name="componentType" default="DataSource" readOnly="true"/>
- <c:simple-property name="componentSubtype" default="NoTx" readOnly="true"/>
- <c:simple-property name="componentName" readOnly="true"/>
- <c:simple-property name="templateName" default="NoTxDataSourceTemplate" readOnly="true"/>
- <c:simple-property name="componentNameProperty" default="jndi-name" readOnly="true">
- <c:description>
- The name of the Resource configuration property whose value should be used as the
- ManagedComponent name when creating a new Resource of this type.
- </c:description>
- </c:simple-property>
- </plugin-configuration>
-
- &datasourceAndConnectionFactoryOperations;
-
- &managedObjectMetrics;
- &datasourceMetrics;
-
- <resource-configuration>
-
- <!-- For ManagedProperty annotations, see:
- https://anonsvn.jboss.org/repos/jbossas/trunk/connector/src/main/org/jbos... -->
-
- <c:group name="connection" displayName="Connection Information">
- &datasourceConnectionResourceConfigProps;
- &datasourceAndConnectionFactoryConnectionResourceConfigProps;
- &nonXaDatasourceConnectionResourceConfigProps;
- </c:group>
-
- <c:group name="advanced" displayName="Advanced">
- &datasourceAndConnectionFactoryAdvancedResourceConfigProps;
- &datasourceAdvancedResourceConfigProps;
- </c:group>
-
- <c:template name="Oracle No TX" description="No Transaction Datasource for Oracle">
- &nonXaDatasourceOracleTemplateProps;
- </c:template>
-
- </resource-configuration>
-
- </service>
-
- <service name="Local Tx Datasource"
- class="ManagedComponentComponent"
- discovery="ManagedComponentDiscoveryComponent"
- createDeletePolicy="both"
- subCategory="Datasources"
- description="Local Transaction Datasources deployed in the instance of JBoss AS">
-
- <plugin-configuration>
- <c:simple-property name="componentType" default="DataSource" readOnly="true"/>
- <c:simple-property name="componentSubtype" default="LocalTx" readOnly="true"/>
- <c:simple-property name="componentName" readOnly="true"/>
- <c:simple-property name="templateName" default="LocalTxDataSourceTemplate" readOnly="true"/>
- <c:simple-property name="componentNameProperty" default="jndi-name" readOnly="true">
- <c:description>
- The name of the Resource configuration property whose value should be used as the
- underlying ManagedComponent name when creating a new Resource of this type.
- </c:description>
- </c:simple-property>
- </plugin-configuration>
-
- &datasourceAndConnectionFactoryOperations;
-
- &managedObjectMetrics;
- &datasourceMetrics;
-
- <resource-configuration>
-
- <!-- For ManagedProperty annotations, see:
- https://anonsvn.jboss.org/repos/jbossas/trunk/connector/src/main/org/jbos... -->
-
- <c:group name="connection" displayName="Connection Information">
- &datasourceConnectionResourceConfigProps;
- &datasourceAndConnectionFactoryConnectionResourceConfigProps;
- &nonXaDatasourceConnectionResourceConfigProps;
- </c:group>
-
- <c:group name="advanced" displayName="Advanced">
- &datasourceAndConnectionFactoryAdvancedResourceConfigProps;
- &datasourceAdvancedResourceConfigProps;
- </c:group>
-
- <c:template name="Oracle Local TX" description="Local Transaction Datasource for Oracle">
- &nonXaDatasourceOracleTemplateProps;
- <c:simple-property name="track-connection-by-tx" default="true"/>
- </c:template>
-
- </resource-configuration>
-
- </service>
-
- <service name="XA Datasource"
- class="ManagedComponentComponent"
- discovery="ManagedComponentDiscoveryComponent"
- createDeletePolicy="both"
- subCategory="Datasources"
- description="XA Datasources deployed in the instance of JBoss AS">
-
- <plugin-configuration>
- <c:simple-property name="componentType" default="DataSource" readOnly="true"/>
- <c:simple-property name="componentSubtype" default="XA" readOnly="true"/>
- <c:simple-property name="componentName" readOnly="true"/>
- <c:simple-property name="templateName" default="XADataSourceTemplate" readOnly="true"/>
- <c:simple-property name="componentNameProperty" default="jndi-name" readOnly="true">
- <c:description>
- The name of the Resource configuration property whose value should be used as the
- underlying ManagedComponent name when creating a new Resource of this type.
- </c:description>
- </c:simple-property>
- </plugin-configuration>
-
- &datasourceAndConnectionFactoryOperations;
-
- &managedObjectMetrics;
- &datasourceMetrics;
-
- <resource-configuration>
-
- <!-- For ManagedProperty annotations, see:
- https://anonsvn.jboss.org/repos/jbossas/trunk/connector/src/main/org/jbos... -->
- <c:group name="connection" displayName="Connection Information">
-
- &datasourceConnectionResourceConfigProps;
- &datasourceAndConnectionFactoryConnectionResourceConfigProps;
-
- <c:simple-property name="xa-datasource-class"
- displayName="XA DataSource Class"
- description="The fully qualified name of the javax.sql.XADataSource implementation class."
- activationPolicy="immediate"/>
-
- <c:map-property name="xa-datasource-properties" displayName="XA Datasource Properties" required="true">
- <c:description>
- The properties to assign to the XADataSource implementation class.
- Each property is mapped
- onto the XADataSource implementation by looking for a JavaBeans style
- getter method for the property name. If found, the value of the property is
- set using the JavaBeans setter with the element text translated to the true
- property type using the java.beans.PropertyEditor for the type.
- </c:description>
- </c:map-property>
-
- <c:simple-property name="xa-resource-timeout"
- displayName="XA Resource Timeout"
- required="false"
- type="integer"
- activationPolicy="immediate">
- <c:description>
- XA transaction timeout, in seconds (passed to XAResource.setTransactionTimeout()) -
- default is zero which does not invoke the setter.
- </c:description>
- </c:simple-property>
-
- <c:simple-property name="url-property"
- displayName="URL Property"
- required="false"
- description="For HA XA datasources, specifies the name of an XADataSource property that contains a list of URLs."
- activationPolicy="immediate"/>
- </c:group>
-
- <c:group name="advanced" displayName="Advanced">
- &datasourceAndConnectionFactoryAdvancedResourceConfigProps;
- &datasourceAdvancedResourceConfigProps;
-
- <c:simple-property name="interleaving" type="boolean" required="false" defaultValue="false">
- <c:description>
- If true, enable transaction interleaving if the DB vendor supports it (most do not).
- This property supersedes the "track-connection-by-tx" property from earlier versions of
- JBoss AS. The default is false.
- </c:description>
- </c:simple-property>
- </c:group>
-
- <c:template name="Oracle XA" description="XA Transaction Datasource for Oracle">
- <c:simple-property name="track-connection-by-tx" default="true"/>
- <c:simple-property name="isSameRM-override-value" default="false"/>
- <c:simple-property name="xa-datasource-class" default="oracle.jdbc.xa.client.OracleXADataSource"/>
- <c:simple-property name="exception-sorter-class-name"
- default="org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter"/>
- <!-- Oracle's XA datasource cannot reuse a connection outside a transaction once enlisted in a
- global transaction and vice-versa. -->
- <c:simple-property name="no-tx-separate-pools" default="true"/>
- <c:simple-property name="use-try-lock" default="60000"/>
- <c:map-property name="metadata">
- <c:simple-property name="typeMapping" default="Oracle9i"/>
- </c:map-property>
- <c:simple-property name="type-mapping" default="Oracle9i"/>
- </c:template>
-
- </resource-configuration>
-
- </service>
-
- <service name="No Tx ConnectionFactory"
- description="A ConnectionFactory that does not take part in JTA transactions."
- class="ManagedComponentComponent"
- createDeletePolicy="both"
- subCategory="Connection Factories"
- discovery="ManagedComponentDiscoveryComponent">
-
- <plugin-configuration>
- <c:simple-property name="componentType" default="ConnectionFactory" readOnly="true"/>
- <c:simple-property name="componentSubtype" default="NoTx" readOnly="true"/>
- <c:simple-property name="componentName" readOnly="true"/>
- <c:simple-property name="templateName" default="NoTxConnectionFactoryTemplate" readOnly="true"/>
- <c:simple-property name="componentNameProperty" default="jndi-name" readOnly="true">
- <c:description>
- The name of the Resource configuration property whose value should be used as the
- underlying ManagedComponent name when creating a new Resource of this type.
- </c:description>
- </c:simple-property>
- <c:group name="managedPropertyGroup"
- displayName="managedPropertyGroup"
- hiddenByDefault="true">
- <c:map-property name="customProperties"
- description="Maps a list of custom property names to the the fully qualified class names of the org.rhq.plugins.jbossas5.adapter.api.PropertyAdapter implementations that should be used for those properties.">
- <c:simple-property name="config-property"
- default="org.rhq.plugins.jbossas5.adapter.impl.configuration.custom.ConnectionFactoryConfigPropertyAdapter" />
- </c:map-property>
- </c:group>
- </plugin-configuration>
-
- &datasourceAndConnectionFactoryOperations;
-
- &managedObjectMetrics;
- &connectionFactoryMetrics;
-
- <resource-configuration>
-
- <c:group name="connection" displayName="Connection Information">
- &connectionFactoryConnectionResourceConfigProps;
- &datasourceAndConnectionFactoryConnectionResourceConfigProps;
- </c:group>
-
- <c:group name="advanced" displayName="Advanced">
- &datasourceAndConnectionFactoryAdvancedResourceConfigProps;
- &connectionFactoryAdvancedResourceConfigProps;
- </c:group>
- </resource-configuration>
-
- </service>
-
- <service name="Tx ConnectionFactory"
- description="A ConnectionFactory that takes part in JTA transactions."
- class="TxConnectionFactoryComponent"
- createDeletePolicy="both"
- subCategory="Connection Factories"
- discovery="ManagedComponentDiscoveryComponent">
-
- <plugin-configuration>
- <c:simple-property name="componentType" default="ConnectionFactory" readOnly="true"/>
- <c:simple-property name="componentSubtype" default="Tx" readOnly="true"/>
- <c:simple-property name="componentName" readOnly="true"/>
- <c:simple-property name="templateName" default="TxConnectionFactoryTemplate" readOnly="true"/>
- <c:simple-property name="componentNameProperty" default="jndi-name" readOnly="true">
- <c:description>
- The name of the Resource configuration property whose value should be used as the
- underlying ManagedComponent name when creating a new Resource of this type.
- </c:description>
- </c:simple-property>
- <c:group name="managedPropertyGroup"
- displayName="managedPropertyGroup"
- hiddenByDefault="true">
- <c:map-property name="customProperties"
- description="Maps a list of custom property names to the the fully qualified class names of the org.rhq.plugins.jbossas5.adapter.api.PropertyAdapter implementations that should be used for those properties.">
- <c:simple-property name="config-property"
- default="org.rhq.plugins.jbossas5.adapter.impl.configuration.custom.ConnectionFactoryConfigPropertyAdapter" />
- </c:map-property>
- </c:group>
- </plugin-configuration>
-
- &datasourceAndConnectionFactoryOperations;
-
- <metric property="custom.transactionType" displayName="Transaction Type" displayType="summary"
- description="The type of transactions used by this connection factory - Local or XA"
- defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
-
- &managedObjectMetrics;
- &connectionFactoryMetrics;
-
- <resource-configuration>
-
- <c:group name="connection" displayName="Connection Information">
-
- &connectionFactoryConnectionResourceConfigProps;
- &datasourceAndConnectionFactoryConnectionResourceConfigProps;
-
- <c:simple-property name="xa-transaction"
- type="boolean"
- displayName="XA Transaction"
- required="false" readOnly="true">
- <c:description>
- Whether on not to use XA transactions. The default is No.
- </c:description>
- </c:simple-property>
-
- </c:group>
-
- <c:group name="advanced" displayName="Advanced">
-
- &datasourceAndConnectionFactoryAdvancedResourceConfigProps;
- &connectionFactoryAdvancedResourceConfigProps;
-
- <c:simple-property name="interleaving" type="boolean" required="false" defaultValue="false">
- <c:description>
- If true, enable transaction interleaving if the DB vendor supports it (most do not).
- Can only be set to true if XA transactions are enabled.
- This property supersedes the "track-connection-by-tx" property from earlier versions of
- JBoss AS. The default is false.
- </c:description>
- </c:simple-property>
-
- <c:simple-property name="xa-resource-timeout"
- type="integer"
- displayName="XA Resource Timeout"
- units="minutes"
- defaultValue="0"
- required="false">
- <c:description>
- The maximum time, in minutes, an XA Resource can be idle before it is removed. 0 means no
- timeout. The default is 0.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="0"/>
- </c:constraint>
- </c:simple-property>
-
- </c:group>
-
- <c:template name="Local Transaction" description="a connection factory that uses local transactions">
- <c:simple-property name="xa-transaction" default="false"/>
- </c:template>
-
- <c:template name="XA Transaction" description="a connection factory that uses XA transactions">
- <c:simple-property name="xa-transaction" default="true"/>
- </c:template>
- </resource-configuration>
-
- </service>
-
- <service name="Queue"
- class="JmsDestinationComponent"
- createDeletePolicy="both"
- subCategory="JMS Destinations"
- discovery="JmsDestinationDiscoveryComponent">
-
- <plugin-configuration>
- <c:simple-property name="componentType" default="JMSDestination" readOnly="true"/>
- <c:simple-property name="componentSubtype" default="Queue" readOnly="true"/>
- <c:simple-property name="componentName" readOnly="true"/>
- <c:simple-property name="templateName" default="QueueTemplate" readOnly="true"/>
- <c:simple-property name="componentNameProperty" default="JNDIName" readOnly="true">
- <c:description>
- The name of the Resource configuration property whose value should be used as the
- underlying ManagedComponent name when creating a new Resource of this type.
- </c:description>
- </c:simple-property>
- <c:group name="managedPropertyGroup" displayName="managedPropertyGroup" hiddenByDefault="true">
- <c:simple-property name="jms-type" default="queue"/>
- <c:map-property name="customProperties"
- description="Maps a list of custom property names to the the fully qualified class names of the org.rhq.plugins.jbossas5.adapter.api.PropertyAdapter implementations that should be used for those properties.">
- <c:simple-property name="securityConfig"
- default="org.rhq.plugins.jbossas5.adapter.impl.configuration.custom.JMSSecurityConfigAdapter"/>
- </c:map-property>
- </c:group>
- </plugin-configuration>
-
- &destinationOperations;
-
- <operation name="listAllMessages" displayName="List All Messages" description="List all messages for the specified selector">
- <parameters>
- <c:simple-property required="false" name="arg#0" displayName="selector"/>
- </parameters>
- <results>
- <c:notes>List all messages with selector</c:notes>
- <c:list-property name="result">
- <c:map-property required="false" name="element">
- <c:simple-property required="false" name="JMSCorrelationID"/>
- <c:simple-property required="false" name="JMSMessageID"/>
- <c:simple-property type="long" required="false" name="JMSTimestamp"/>
- </c:map-property>
- </c:list-property>
- </results>
- </operation>
-
- <operation name="listDurableMessages" displayName="List Durable Messages" description="List all durable messages for the specified selector">
- <parameters>
- <c:simple-property required="false" name="arg#0" displayName="selector"/>
- </parameters>
- <results>
- <c:notes>List all durable messages using a selector</c:notes>
- <c:list-property name="result">
- <c:map-property required="false" name="element">
- <c:simple-property required="false" name="JMSCorrelationID"/>
- <c:simple-property required="false" name="JMSMessageID"/>
- <c:simple-property type="long" required="false" name="JMSTimestamp"/>
- </c:map-property>
- </c:list-property>
- </results>
- </operation>
-
- <operation name="listNonDurableMessages" displayName="List Non Durable Messages" description="List all non durable messages for the specified selector">
- <parameters>
- <c:simple-property required="false" name="arg#0" displayName="selector"/>
- </parameters>
- <results>
- <c:notes>List all non durable messages using a selector</c:notes>
- <c:list-property name="result">
- <c:map-property required="false" name="element">
- <c:simple-property required="false" name="JMSCorrelationID"/>
- <c:simple-property required="false" name="JMSMessageID"/>
- <c:simple-property type="long" required="false" name="JMSTimestamp"/>
- </c:map-property>
- </c:list-property>
- </results>
- </operation>
-
- <operation name="listMessageCounterAsHTML" displayName="List Message Counter As HTML" description="Get the message counter as HTML">
- <results>
- <c:notes>Get the message counter as HTML</c:notes>
- <c:simple-property name="result" type="longString"/>
- </results>
- </operation>
-
- <operation name="listMessageCounterHistoryAsHTML" displayName="List Message Counter History As HTML" description="Get the message counter history as HTML">
- <results>
- <c:notes>Get the message counter history as HTML</c:notes>
- <c:simple-property name="result" type="longString"/>
- </results>
- </operation>
-
- <operation name="resetMessageCounter" displayName="Reset Message Counter" description="Reset the message counter"/>
-
- <operation name="resetMessageCounterHistory" displayName="Reset Message Counter History" description="Reset the message counter history"/>
-
- &managedObjectMetrics;
-
- <!-- Traits -->
-
- <metric property="createdProgrammatically" displayType="summary"
- defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"
- description="Was this queue created programmatically? If Yes, the queue will not survive a restart of the application server. If No, the queue was created via a deployment XML file."/>
-
- <!-- NOTE: We have to make this a trait rather than a resource config prop due to a bug in JBMESSAGING
- (see https://jira.jboss.org/jira/browse/JBAS-6721). -->
- <metric property="messageCounterHistoryDayLimit"
- defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"
- description="This queue's message counter history day limit - <0: unlimited, =0: history disabled, >0: maximum day count"/>
-
- <!-- Numerics -->
-
- <metric property="consumerCount" measurementType="dynamic" displayType="summary" displayName="Consumer Count"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
- description="The number of consumers on the queue"/>
-
- <metric property="deliveringCount" measurementType="dynamic" displayType="detail" displayName="Delivering Count"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
- description="The number of messages currently being delivered"/>
-
- <metric property="messageCount" measurementType="dynamic" displayType="summary" displayName="Message Count"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
- description="The number of messages in the queue"/>
-
- <metric property="scheduledMessageCount" measurementType="dynamic" displayType="detail" displayName="Scheduled Message Count"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
- description="The number of scheduled messages in the queue"/>
-
- <metric property="messageStatistics.count" measurementType="dynamic" displayType="detail" displayName="Count"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization"
- description="The total message count since startup or last counter reset"/>
-
- <metric property="messageStatistics.countDelta" measurementType="dynamic" displayType="detail" displayName="Count Delta"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization"
- description="The message count delta since last method call"/>
-
- <metric property="messageStatistics.depth" measurementType="dynamic" displayType="detail" displayName="Depth"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization"
- description="The current message count of pending messages within the queue waiting for dispatch"/>
-
- <metric property="messageStatistics.depthDelta" measurementType="dynamic" displayType="detail" displayName="Depth Delta"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization"
- description="The message count delta of pending messages since last method call"/>
-
- <metric property="messageStatistics.timeLastUpdate" measurementType="dynamic" displayType="detail" displayName="Time Last Update"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization"
- description="The timestamp of the last message add"/>
-
- <resource-configuration>
-
- <!-- See: https://anonsvn.jboss.org/repos/jbossas/trunk/messaging/src/main/org/jbos... -->
-
- <c:simple-property required="true" name="name" readOnly="true"
- description="The name of this queue (e.g. 'MyQueue')."/>
-
- <c:simple-property required="true" name="JNDIName" readOnly="true"
- description="This queue's JNDI name (e.g. '/queue/MyQueue')."/>
-
- <c:simple-property type="boolean" required="false" name="clustered" readOnly="true" defaultValue="false">
- <c:description>
- Is this queue clustered? For an existing queue, this property is read-only. If not specified
- when creating a new queue, the default value is false.
- </c:description>
- </c:simple-property>
-
- <c:simple-property type="integer" required="false" name="downCacheSize" defaultValue="2000">
- <c:description>
- When paging messages to storage from a subscription, they first go into a "Down Cache" before
- being written to storage. This enables the write to occur as a single operation, thus aiding
- performance. This setting determines the maximum number of messages that the Down Cache will hold
- before they are flushed to storage.
- Updates to this property will not go into effect until the queue has been restarted.
- The default value is 2000.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="1"/>
- </c:constraint>
- </c:simple-property>
-
- <c:simple-property type="integer" required="false" name="fullSize" defaultValue="200000">
- <c:description>
- The maximum number of messages for the queue held in memory at any one time.
- The actual queue can hold many more messages than this, but these are paged to and from
- storage as necessary, as messages are added or consumed.
- Updates to this property will not go into effect until the queue has been restarted.
- The default value is 200000.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="1"/>
- </c:constraint>
- </c:simple-property>
-
- <c:simple-property type="integer" required="false" name="maxDeliveryAttempts" defaultValue="-1">
- <c:description>
- The number of delivery attempts before a message to a subscriber of this queue is moved to the
- DLQ. The default value is 10. A value of -1 indicates the default value should be used.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="-1"/>
- </c:constraint>
- </c:simple-property>
-
- <c:simple-property type="integer" required="false" name="maxSize" defaultValue="-1">
- <c:description>
- The maximum number of messages this queue can hold before they are dropped.
- A value of -1 means there is no maximum. The default value is -1.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="-1"/>
- </c:constraint>
- </c:simple-property>
-
- <c:simple-property type="integer" required="false" name="pageSize" defaultValue="2000">
- <c:description>
- When loading messages from a subscription, this is the maximum number of messages to
- pre-load in one operation. Must be less than Full Size and greater than or equal to Down Cache Size.
- Updates to this property will not go into effect until the queue has been restarted.
- The default value is 2000.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="1"/>
- </c:constraint>
- </c:simple-property>
-
- <c:simple-property type="long" required="false" name="redeliveryDelay" units="milliseconds" defaultValue="-1">
- <c:description>
- The delay in milliseconds before a rolled back or recovered message is redelivered.
- Set to 0 to disable redelivery. The default value is 0. A value of -1 indicates the default value should be used.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="-1"/>
- </c:constraint>
- </c:simple-property>
-
- <c:simple-property required="false" name="DLQ">
- <c:description>
- The JMX ObjectName of the dead letter queue (DLQ) for this queue (e.g.
- "jboss.messaging.destination:service=Queue,name=PrivateDLQ") - overrides the default DLQ on the
- server peer.
- </c:description>
- <c:constraint>
- <c:regex-constraint expression="[^:]+:.+"/>
- </c:constraint>
- </c:simple-property>
-
- <c:simple-property required="false" name="expiryQueue">
- <c:description>
- The JMX ObjectName of the expiry queue for this queue (e.g.
- "jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue") - overrides the default
- expiry queue on the server peer.
- </c:description>
- <c:constraint>
- <c:regex-constraint expression="[^:]+:.+"/>
- </c:constraint>
- </c:simple-property>
-
- <c:simple-property required="false" name="serverPeer">
- <c:description>
- The JMX ObjectName of the server peer this queue was deployed on (e.g.
- "jboss.messaging:service=ServerPeer"). Updates to this property will not go into effect until
- the queue has been restarted.
- </c:description>
- <c:constraint>
- <c:regex-constraint expression="[^:]+:.+"/>
- </c:constraint>
- </c:simple-property>
-
- <c:list-property name="securityConfig" max="4" min="2"
- displayName="Security Configurations"
- description="This element specifies a XML fragment which describes the access control list to be used by the SecurityManager to authorize client operations against the destination. The content model is the same as for the SecurityManager SecurityConf attribute.">
- <c:map-property name="role"
- displayName="Security Configuration Attributes"
- description="These are the attributes that define the role name, and if the role is allowed to read, write or create Messages on this Queue">
- <c:simple-property name="name"
- displayName="Name"
- description="Name of the Security Role. e.g. Guest"
- summary="true"
- required="true"/>
- <c:simple-property name="read"
- displayName="Read"
- description="Is this role allowed to read messages?"
- summary="true"
- required="false"
- type="boolean"/>
- <c:simple-property name="write"
- displayName="Write"
- description="Is this role allowed to write messages?"
- summary="true"
- required="false"
- type="boolean"/>
- <c:simple-property name="create"
- displayName="Create"
- description="Is this role allowed to create messages?"
- summary="true"
- required="false"
- type="boolean"/>
- </c:map-property>
-
- </c:list-property>
-
- </resource-configuration>
-
- <help>
- <![CDATA[
- <p>The message counter metrics will not be collected by default. In order
- for these metrics to be collected for all Topics and Queues for a given application server instance,
- go to the instance's JMX Console, and invoke the
- <tt>enableMessageCounters</tt> operation on the <tt>jboss.messaging:service=ServerPeer</tt> MBean.
- To ensure the message counters are still enabled when the application server is restarted,
- edit that instance's <tt>deploy/messaging/messaging-service.xml</tt> file and set the
- <tt>EnableMessageCounters</tt> attribute to "true".</p>
- ]]>
- </help>
-
- </service>
-
- <service name="Topic"
- class="JmsDestinationComponent"
- createDeletePolicy="both"
- subCategory="JMS Destinations"
- discovery="JmsDestinationDiscoveryComponent">
-
- <plugin-configuration>
- <c:simple-property name="componentType" default="JMSDestination" readOnly="true"/>
- <c:simple-property name="componentSubtype" default="Topic" readOnly="true"/>
- <c:simple-property name="componentName" readOnly="true"/>
- <c:simple-property name="templateName" default="TopicTemplate" readOnly="true"/>
- <c:simple-property name="componentNameProperty" default="JNDIName" readOnly="true">
- <c:description>
- The name of the Resource configuration property whose value should be used as the
- underlying ManagedComponent name when creating a new Resource of this type.
- </c:description>
- </c:simple-property>
- <c:group name="managedPropertyGroup" displayName="managedPropertyGroup" hiddenByDefault="true">
- <c:simple-property name="jms-type" default="topic"/>
- <c:map-property name="customProperties"
- description="Maps a list of custom property names to the the fully qualified class names of the org.rhq.plugins.jbossas5.adapter.api.PropertyAdapter implementations that should be used for those properties.">
- <c:simple-property name="securityConfig"
- default="org.rhq.plugins.jbossas5.adapter.impl.configuration.custom.JMSSecurityConfigAdapter"/>
- </c:map-property>
- </c:group>
- </plugin-configuration>
-
- &destinationOperations;
-
- <operation name="listAllMessages" displayName="List All Messages" description="List all messages for the specified subscription with the specified selector">
- <parameters>
- <c:simple-property required="false" name="arg#0" displayName="subscriptionID"/>
- <c:simple-property required="false" name="arg#1" displayName="selector"/>
- </parameters>
- <results>
- <c:notes>List all messages for the specified subscription with the specified selector</c:notes>
- <c:list-property name="result">
- <c:map-property required="false" name="element">
- <c:simple-property required="false" name="JMSCorrelationID"/>
- <c:simple-property required="false" name="JMSMessageID"/>
- <c:simple-property type="long" required="false" name="JMSTimestamp"/>
- </c:map-property>
- </c:list-property>
- </results>
- </operation>
-
- <operation name="listDurableMessages" displayName="List Durable Messages" description="List all durable messages for the specified subscription with the specified selector">
- <parameters>
- <c:simple-property required="false" name="arg#0" displayName="subscriptionID"/>
- <c:simple-property required="false" name="arg#1" displayName="selector"/>
- </parameters>
- <results>
- <c:notes>List all durable messages for the specified subscription with the specified selector</c:notes>
- <c:list-property name="result">
- <c:map-property required="false" name="element">
- <c:simple-property required="false" name="JMSCorrelationID"/>
- <c:simple-property required="false" name="JMSMessageID"/>
- <c:simple-property type="long" required="false" name="JMSTimestamp"/>
- </c:map-property>
- </c:list-property>
- </results>
- </operation>
-
- <operation name="listNonDurableMessages" displayName="List Non Durable Messages" description="List all non durable messages for the specified subscription with the specified selector">
- <parameters>
- <c:simple-property required="false" name="arg#0" displayName="subscriptionID"/>
- <c:simple-property required="false" name="arg#1" displayName="selector"/>
- </parameters>
- <results>
- <c:notes>List all non durable messages for the specified subscription with the specified selector</c:notes>
- <c:list-property name="result">
- <c:map-property required="false" name="element">
- <c:simple-property required="false" name="JMSCorrelationID"/>
- <c:simple-property required="false" name="JMSMessageID"/>
- <c:simple-property type="long" required="false" name="JMSTimestamp"/>
- </c:map-property>
- </c:list-property>
- </results>
- </operation>
-
- <operation name="listAllSubscriptions" displayName="List All Subscriptions"
- description="Return all subscriptions for the topic">
- <results>
- <c:notes>Return all subscriptions for the topic</c:notes>
- &subscriptionsResultProperty;
- </results>
- </operation>
-
- <operation name="listAllSubscriptionsAsHTML" displayName="List All Subscriptions As HTML"
- description="Return all subscriptions for the topic as HTML">
- <results>
- <c:notes>Return all subscriptions for the topic as HTML</c:notes>
- <c:simple-property name="result" type="longString"/>
- </results>
- </operation>
-
- <operation name="listDurableSubscriptions" displayName="List Durable Subscriptions"
- description="Return all durable subscriptions for the topic">
- <results>
- <c:notes>Return all durable subscriptions for the topic</c:notes>
- &subscriptionsResultProperty;
- </results>
- </operation>
-
- <operation name="listDurableSubscriptionsAsHTML" displayName="List Durable Subscriptions As HTML"
- description="Return all durable subscriptions for the topic as HTML">
- <results>
- <c:notes>Return all durable subscriptions for the topic as HTML</c:notes>
- <c:simple-property name="result" type="longString"/>
- </results>
- </operation>
-
- <operation name="listNonDurableSubscriptions" displayName="List Non-Durable Subscriptions"
- description="Return all non-durable subscriptions for the topic">
- <results>
- <c:notes>Return all non-durable subscriptions for the topic</c:notes>
- &subscriptionsResultProperty;
- </results>
- </operation>
-
- <operation name="listNonDurableSubscriptionsAsHTML" displayName="List Non-Durable Subscriptions As HTML"
- description="Return all non-durable subscriptions for the topic as HTML">
- <results>
- <c:notes>Return all non-durable subscriptions for the topic as HTML</c:notes>
- <c:simple-property name="result" type="longString"/>
- </results>
- </operation>
-
- &managedObjectMetrics;
-
- <!-- Traits -->
-
- <metric property="createdProgrammatically" displayType="summary"
- defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"
- description="Was this topic created programmatically? If Yes, the topic will not survive a restart of the application server. If No, the topic was created via a deployment XML file."/>
-
- <!-- NOTE: We have to make this a trait rather than a resource config prop due to a bug in JBMESSAGING
- (see https://jira.jboss.org/jira/browse/JBAS-6721). -->
- <metric property="messageCounterHistoryDayLimit"
- defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"
- description="This topic's message counter history day limit - <0: unlimited, =0: history disabled, >0: maximum day count"/>
-
- <!-- Numerics -->
-
- <metric property="allMessageCount" measurementType="dynamic" displayType="summary" displayName="All Message Count"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
- description="The count of all messages in all subscriptions to this topic"/>
-
- <metric property="allSubscriptionsCount" measurementType="dynamic" displayType="summary" displayName="All Subscriptions Count"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
- description="The count of all subscriptions to this topic"/>
-
- <metric property="durableMessageCount" measurementType="dynamic" displayType="detail" displayName="Durable Message Count"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
- description="The count of all messages for all durable subscriptions to this topic"/>
-
- <metric property="durableSubscriptionsCount" measurementType="dynamic" displayType="detail" displayName="Durable Subscriptions Count"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
- description="The count of all durable subscriptions to this topic"/>
-
- <metric property="nonDurableMessageCount" measurementType="dynamic" displayType="detail" displayName="Non Durable Message Count"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
- description="The count of all messages in all non durable subscriptions to this topic"/>
-
- <metric property="nonDurableSubscriptionsCount" measurementType="dynamic" displayType="detail" displayName="Non Durable Subscriptions Count"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
- description="The count of all non durable subscriptions to this topic"/>
-
- <resource-configuration>
-
- <!-- See: https://anonsvn.jboss.org/repos/jbossas/trunk/messaging/src/main/org/jbos... -->
-
- <c:simple-property required="true" name="name" readOnly="true"
- description="The name of this topic (e.g. 'MyTopic')."/>
-
- <c:simple-property required="true" name="JNDIName" readOnly="true"
- description="This topic's JNDI name (e.g. '/topic/MyTopic')"/>
-
- <c:simple-property type="boolean" required="false" name="clustered" readOnly="true" defaultValue="false">
- <c:description>
- Is this topic clustered? For an existing topic, this property is read-only. If not specified
- when creating a new topic, the default value is false.
- </c:description>
- </c:simple-property>
-
- <c:simple-property type="integer" required="false" name="downCacheSize" defaultValue="2000">
- <c:description>
- When paging messages to storage from a subscription, they first go into a "Down Cache" before
- being written to storage. This enables the write to occur as a single operation, thus aiding
- performance. This setting determines the maximum number of messages that the Down Cache will hold
- before they are flushed to storage.
- Updates to this property will not go into effect until the topic has been restarted.
- The default value is 2000.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="1"/>
- </c:constraint>
- </c:simple-property>
-
- <c:simple-property type="integer" required="false" name="fullSize" defaultValue="200000">
- <c:description>
- The maximum number of messages held by the topic subscriptions in memory at any one time.
- The actual subscription can hold many more messages than this, but these are paged to and from
- storage as necessary, as messages are added or consumed.
- Updates to this property will not go into effect until the topic has been restarted.
- The default value is 200000.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="1"/>
- </c:constraint>
- </c:simple-property>
-
- <c:simple-property type="integer" required="false" name="maxDeliveryAttempts" defaultValue="-1">
- <c:description>
- The number of delivery attempts before a message to a subscriber of this topic is moved to the
- DLQ. The default value is 10. A value of -1 indicates the default value should be used.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="-1"/>
- </c:constraint>
- </c:simple-property>
-
- <c:simple-property type="integer" required="false" name="maxSize" defaultValue="-1">
- <c:description>
- The maximum number of messages this topic can hold before they are dropped.
- A value of -1 means there is no maximum. The default value is -1.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="-1"/>
- </c:constraint>
- </c:simple-property>
-
- <c:simple-property type="integer" required="false" name="pageSize" defaultValue="2000">
- <c:description>
- When loading messages from a subscription, this is the maximum number of messages to
- pre-load in one operation. Must be less than Full Size and greater than or equal to Down Cache Size.
- Updates to this property will not go into effect until the topic has been restarted.
- The default value is 2000.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="1"/>
- </c:constraint>
- </c:simple-property>
-
- <c:simple-property type="long" required="false" name="redeliveryDelay" units="milliseconds" defaultValue="-1">
- <c:description>
- The delay in milliseconds before a rolled back or recovered message is redelivered.
- Set to 0 to disable redelivery. The default value is 0. A value of -1 indicates the default value should be used.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="-1"/>
- </c:constraint>
- </c:simple-property>
-
- <c:simple-property required="false" name="DLQ">
- <c:description>
- The JMX ObjectName of the dead letter queue (DLQ) for this topic (e.g.
- "jboss.messaging.destination:service=Queue,name=PrivateDLQ") - overrides the default DLQ on the
- server peer.
- </c:description>
- <c:constraint>
- <c:regex-constraint expression="[^:]+:.+"/>
- </c:constraint>
- </c:simple-property>
-
- <c:simple-property required="false" name="expiryQueue">
- <c:description>
- The JMX ObjectName of the expiry queue for this topic (e.g.
- "jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue") - overrides the default
- expiry queue on the server peer.
- </c:description>
- <c:constraint>
- <c:regex-constraint expression="[^:]+:.+"/>
- </c:constraint>
- </c:simple-property>
-
- <c:simple-property required="false" name="serverPeer">
- <c:description>
- The JMX ObjectName of the server peer this topic was deployed on (e.g.
- "jboss.messaging:service=ServerPeer"). Updates to this property will not go into effect until
- the topic has been restarted.
- </c:description>
- <c:constraint>
- <c:regex-constraint expression="[^:]+:.+"/>
- </c:constraint>
- </c:simple-property>
-
- <c:list-property name="securityConfig" max="4" min="2"
- displayName="Security Configurations"
- description="This element specifies a XML fragment which describes the access control list to be used by the SecurityManager to authorize client operations against the destination. The content model is the same as for the SecurityManager SecurityConf attribute.">
- <c:map-property name="role"
- displayName="Security Configuration Attributes"
- description="These are the attributes that define the role name, and if the role is allowed to read, write or create Messages on this Queue">
- <c:simple-property name="name"
- displayName="Name"
- description="Name of the Security Role. e.g. Guest"
- summary="true"
- required="true"/>
- <c:simple-property name="read"
- displayName="Read"
- description="Is this role allowed to read messages?"
- summary="true"
- required="false"
- type="boolean"/>
- <c:simple-property name="write"
- displayName="Write"
- description="Is this role allowed to write messages?"
- summary="true"
- required="false"
- type="boolean"/>
- <c:simple-property name="create"
- displayName="Create"
- description="Is this role allowed to create messages?"
- summary="true"
- required="false"
- type="boolean"/>
- </c:map-property>
- </c:list-property>
-
- </resource-configuration>
-
- <help>
- <![CDATA[
- <p>The message counter metrics will not be collected by default. In order
- for these metrics to be collected for all Topics and Queues for a given application server instance,
- go to the instance's JMX Console, and invoke the
- <tt>enableMessageCounters</tt> operation on the <tt>jboss.messaging:service=ServerPeer</tt> MBean.
- To ensure the message counters are still enabled when the application server is restarted,
- edit that instance's <tt>deploy/messaging/messaging-service.xml</tt> file and set the
- <tt>EnableMessageCounters</tt> attribute to "true".</p>
- ]]>
- </help>
-
- </service>
-
-
- <!-- =================================== ManagedDeployment Resource types ================================== -->
-
- <service name="Enterprise Application (EAR)"
- subCategory="Applications"
- class="StandaloneManagedDeploymentComponent"
- discovery="StandaloneManagedDeploymentDiscoveryComponent"
- description="JEE enterprise application (EAR)"
- createDeletePolicy="both"
- creationDataType="content">
-
- <plugin-configuration>
- <c:group name="general" displayName="General">
- <c:simple-property name="deploymentName" description="The name of this EAR" readOnly="true"/>
- <c:simple-property name="filename" readOnly="true"/>
- </c:group>
- <c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
- <c:simple-property name="extension" default="ear" readOnly="true"/>
- <c:simple-property name="descriptionTemplate" default="Enterprise Application" readOnly="true"/>
- <c:simple-property name="deploymentTypeName" default="JavaEEApplication" readOnly="true">
- <c:description>
- The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum
- corresponding to this deployment's type.
- </c:description>
- </c:simple-property>
- </c:group>
- </plugin-configuration>
-
- <operation name="start"
- description="starts this EAR"/>
-
- <operation name="stop"
- description="stops this EAR"/>
-
- <operation name="restart"
- description="stops and then restarts this EAR"/>
-
- <metric property="custom.path" displayName="Path"
- dataType="trait" displayType="summary"
- description="the absolute path of this EAR file or directory"/>
-
- <metric property="custom.exploded" displayName="Exploded?"
- dataType="trait" displayType="summary"
- description="whether this EAR is deployed exploded (i.e. as a directory)"/>
-
- <content name="file" displayName="EAR File" category="deployable" isCreationType="true">
- &deploymentContentConfigProps;
- </content>
-
- </service>
-
- <service name="Web Application (WAR)"
- subCategory="Applications"
- class="StandaloneManagedDeploymentComponent"
- discovery="StandaloneManagedDeploymentDiscoveryComponent"
- description="a standalone web application (WAR)"
- createDeletePolicy="both"
- creationDataType="content">
-
- <plugin-configuration>
- <c:group name="general" displayName="General">
- <c:simple-property name="deploymentName" description="the name of this WAR" readOnly="true"/>
- <c:simple-property name="filename" readOnly="true"/>
- <c:simple-property name="contextPath" description="this WAR's context path (e.g. /admin-console)" readOnly="true"/>
- </c:group>
- <c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
- <c:simple-property name="extension" default="war" readOnly="true"/>
- <c:simple-property name="descriptionTemplate" default="a standalone web application (WAR)" readOnly="true"/>
- <c:simple-property name="deploymentTypeName" default="JavaEEWebApplication" readOnly="true">
- <c:description>
- The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum
- corresponding to this deployment's type.
- </c:description>
- </c:simple-property>
- </c:group>
- </plugin-configuration>
-
- <operation name="start"
- description="starts this WAR"/>
-
- <operation name="stop"
- description="stops this WAR"/>
-
- <operation name="restart"
- description="stops and then restarts this WAR"/>
-
- <metric property="custom.path" displayName="Path"
- dataType="trait" displayType="summary"
- description="the absolute path of this WAR file or directory"/>
-
- <metric property="custom.exploded" displayName="Exploded?"
- dataType="trait" displayType="summary"
- description="whether this WAR is deployed exploded (i.e. as a directory)"/>
-
- &webApplicationMetrics;
-
- <content name="file" displayName="WAR File" category="deployable" isCreationType="true">
- &deploymentContentConfigProps;
- </content>
-
- <service name="Web Application Context"
- class="WebApplicationContextComponent"
- discovery="WebApplicationContextDiscoveryComponent"
- description="a web application context">
-
- <plugin-configuration>
- <c:simple-property name="virtualHost" description="this WAR's virtual host (e.g. localhost)" readOnly="true"/>
- <c:group name="advanced">
- <c:simple-property name="componentType" default="MBean" readOnly="true"/>
- <c:simple-property name="componentSubtype" default="WebApplicationManager" readOnly="true"/>
- <c:simple-property name="componentName" readOnly="true"/>
- </c:group>
- <c:group name="ResponseTime">
- <c:simple-property name="responseTimeLogFile" required="false"
- description="the full path to the log file containing response-time stats for this webapp"/>
- <c:simple-property name="responseTimeUrlExcludes" required="false"
- description="a space-delimited list of regular expressions specifying URLs that should be excluded from response-time stats collection"/>
- <c:simple-property name="responseTimeUrlTransforms" required="false"
- description="a space-delimited list of Perl-style substitution expressions that should be applied to all URLs for which response-time stats are collected (e.g. |^/dept/finance/.*|/dept/finance/*|)"/>
- </c:group>
- </plugin-configuration>
-
- &webApplicationContextMetrics;
- </service>
-
- </service>
-
- <service name="Embedded Web Application (WAR)"
- subCategory="Applications"
- class="EmbeddedManagedDeploymentComponent"
- discovery="EmbeddedManagedDeploymentDiscoveryComponent"
- description="an embedded web application (WAR)">
-
- <plugin-configuration>
- <c:group name="general" displayName="General">
- <c:simple-property name="deploymentName" description="the name of this WAR" readOnly="true"/>
- <c:simple-property name="contextPath" description="this WAR's context path (e.g. /admin-console" readOnly="true"/>
- </c:group>
- <c:group name="ResponseTime">
- <c:simple-property name="responseTimeLogFile" required="false"
- description="the full path to the log file containing response-time stats for this webapp"/>
- <c:simple-property name="responseTimeUrlExcludes" required="false"
- description="a space-delimited list of regular expressions specifying URLs that should be excluded from response-time stats collection"/>
- <c:simple-property name="responseTimeUrlTransforms" required="false"
- description="a space-delimited list of Perl-style substitution expressions that should be applied to all URLs for which response-time stats are collected (e.g. |^/dept/finance/.*|/dept/finance/*|)"/>
- </c:group>
- <c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
- <c:simple-property name="extension" default="war" readOnly="true"/>
- <c:simple-property name="descriptionTemplate" default="an embedded web application (WAR)" readOnly="true"/>
- <c:simple-property name="deploymentTypeName" default="JavaEEWebApplication" readOnly="true">
- <c:description>
- The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum
- corresponding to this deployment's type.
- </c:description>
- </c:simple-property>
- <c:simple-property name="embedded" default="JavaEEWebApplication" readOnly="true"/>
- </c:group>
- </plugin-configuration>
-
- <metric property="custom.parent" displayName="Parent"
- dataType="trait" displayType="summary"
- description="the name of this WAR's parent deployment"/>
-
- &webApplicationMetrics;
-
- <service name="Embedded Web Application Context"
- class="WebApplicationContextComponent"
- discovery="WebApplicationContextDiscoveryComponent"
- description="a web application context">
-
- <plugin-configuration>
- <c:simple-property name="virtualHost" description="this WAR's virtual host (e.g. localhost)" readOnly="true"/>
- <c:group name="advanced">
- <c:simple-property name="componentType" default="MBean" readOnly="true"/>
- <c:simple-property name="componentSubtype" default="WebApplicationManager" readOnly="true"/>
- <c:simple-property name="componentName" readOnly="true"/>
- </c:group>
- <c:group name="ResponseTime">
- <c:simple-property name="responseTimeLogFile" required="false"
- description="the full path to the log file containing response-time stats for this webapp"/>
- <c:simple-property name="responseTimeUrlExcludes" required="false"
- description="a space-delimited list of regular expressions specifying URLs that should be excluded from response-time stats collection"/>
- <c:simple-property name="responseTimeUrlTransforms" required="false"
- description="a space-delimited list of Perl-style substitution expressions that should be applied to all URLs for which response-time stats are collected (e.g. |^/dept/finance/.*|/dept/finance/*|)"/>
- </c:group>
- </plugin-configuration>
-
- &webApplicationContextMetrics;
- </service>
-
- </service>
-
- <service name="EJB2 JAR"
- subCategory="Applications"
- class="StandaloneManagedDeploymentComponent"
- discovery="StandaloneManagedDeploymentDiscoveryComponent"
- description="a standalone EJB 2.x application"
- createDeletePolicy="both"
- creationDataType="content">
-
- <plugin-configuration>
- <c:group name="general" displayName="General">
- <c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/>
- <c:simple-property name="filename" readOnly="true"/>
- </c:group>
- <c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
- <c:simple-property name="extension" default="jar" readOnly="true"/>
- <c:simple-property name="descriptionTemplate" default="a standalone EJB 2.x application" readOnly="true"/>
- <c:simple-property name="deploymentTypeName" default="JavaEEEnterpriseBeans2x" readOnly="true">
- <c:description>
- The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum
- corresponding to this deployment's type.
- </c:description>
- </c:simple-property>
- </c:group>
- </plugin-configuration>
-
- <operation name="start"
- description="starts this EJB JAR"/>
-
- <operation name="stop"
- description="stops this EJB JAR"/>
-
- <operation name="restart"
- description="stops and then restarts this EJB JAR"/>
-
- <metric property="custom.path" displayName="Path"
- dataType="trait" displayType="summary"
- description="the absolute path of this EJB JAR file or directory"/>
-
- <metric property="custom.exploded" displayName="Exploded?"
- dataType="trait" displayType="summary"
- description="whether this EJB JAR is deployed exploded (i.e. as a directory)"/>
-
- <content name="file" displayName="EJB JAR File" category="deployable" isCreationType="true">
- &deploymentContentConfigProps;
- </content>
-
- <service name="EJB2 Stateless Session Bean"
- class="Ejb2BeanComponent"
- discovery="Ejb2BeanDiscoveryComponent"
- description="An EJB2 Stateless Session Bean">
- &ejb2StatelessSessionBeanDefinition;
- &ejbInvocationStatsOperation;
- &ejb2CreateRemoveMetrics;
- &ejb2PoolMetrics;
- &ejb2SessionBeanMetrics;
- &ejb2StatelessSessionBeanMetrics;
-
- <metric property="methodInvocationTime" dataType="calltime" units="milliseconds"
- defaultOn="false" defaultInterval="600000" destinationType="Method Name"
- description="The minimum, maximum, and average invocation times for each of the methods exposed by this EJB"/>
- </service>
-
- <service name="EJB2 Stateful Session Bean"
- class="Ejb2BeanComponent"
- discovery="Ejb2BeanDiscoveryComponent"
- description="An EJB2 Stateful Session Bean">
- &ejb2StatefulSessionBeanDefinition;
- &ejbInvocationStatsOperation;
- &ejb2CreateRemoveMetrics;
- &ejb2PoolMetrics;
- &ejb2SessionBeanMetrics;
- &ejb2StatefulSessionBeanMetrics;
-
- <metric property="methodInvocationTime" dataType="calltime" units="milliseconds"
- defaultOn="false" defaultInterval="600000" destinationType="Method Name"
- description="The minimum, maximum, and average invocation times for each of the methods exposed by this EJB"/>
- </service>
-
- <service name="EJB2 Message-Driven Bean"
- class="Ejb2BeanComponent"
- discovery="Ejb2BeanDiscoveryComponent"
- description="An EJB2 Message Driven Bean">
- &ejb2MessageDrivenBeanDefinition;
- &ejb2PoolMetrics;
- &ejb2MessageDrivenBeanMetrics;
- </service>
-
- <service name="EJB2 Entity Bean"
- class="Ejb2BeanComponent"
- discovery="Ejb2BeanDiscoveryComponent"
- description="An EJB2 Entity Bean">
- &ejb2EntityBeanDefinition;
- &ejb2CreateRemoveMetrics;
- &ejb2PoolMetrics;
- &ejb2EntityBeanMetrics;
- </service>
- </service>
-
- <service name="Embedded EJB2 JAR"
- subCategory="Applications"
- class="EmbeddedManagedDeploymentComponent"
- discovery="EmbeddedManagedDeploymentDiscoveryComponent"
- description="an embedded EJB 2.x application">
-
- <plugin-configuration>
- <c:group name="general" displayName="General">
- <c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/>
- <c:simple-property name="filename" readOnly="true"/>
- </c:group>
- <c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
- <c:simple-property name="extension" default="jar" readOnly="true"/>
- <c:simple-property name="descriptionTemplate" default="an embedded EJB 2.x application" readOnly="true"/>
- <c:simple-property name="deploymentTypeName" default="JavaEEEnterpriseBeans2x" readOnly="true">
- <c:description>
- The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum
- corresponding to this deployment's type.
- </c:description>
- </c:simple-property>
- </c:group>
- </plugin-configuration>
-
- <metric property="custom.parent" displayName="Parent"
- dataType="trait" displayType="summary"
- description="the name of this EJB JAR's parent deployment"/>
-
- <service name="EJB2 Stateless Session Bean (Embedded)"
- class="Ejb2BeanComponent"
- discovery="Ejb2BeanDiscoveryComponent"
- description="An EJB2 Stateless Session Bean">
- &ejb2StatelessSessionBeanDefinition;
- &ejbInvocationStatsOperation;
- &ejb2CreateRemoveMetrics;
- &ejb2PoolMetrics;
- &ejb2SessionBeanMetrics;
- &ejb2StatelessSessionBeanMetrics;
- </service>
-
- <service name="EJB2 Stateful Session Bean (Embedded)"
- class="Ejb2BeanComponent"
- discovery="Ejb2BeanDiscoveryComponent"
- description="An EJB2 Stateful Session Bean">
- &ejb2StatefulSessionBeanDefinition;
- &ejbInvocationStatsOperation;
- &ejb2CreateRemoveMetrics;
- &ejb2PoolMetrics;
- &ejb2SessionBeanMetrics;
- &ejb2StatefulSessionBeanMetrics;
- </service>
-
- <service name="EJB2 Message-Driven Bean (Embedded)"
- class="Ejb2BeanComponent"
- discovery="Ejb2BeanDiscoveryComponent"
- description="An EJB2 Message Driven Bean">
- &ejb2MessageDrivenBeanDefinition;
- &ejb2PoolMetrics;
- &ejb2MessageDrivenBeanMetrics;
- </service>
-
- <service name="EJB2 Entity Bean (Embedded)"
- class="Ejb2BeanComponent"
- discovery="Ejb2BeanDiscoveryComponent"
- description="An EJB2 Entity Bean">
- &ejb2EntityBeanDefinition;
- &ejb2CreateRemoveMetrics;
- &ejb2PoolMetrics;
- &ejb2EntityBeanMetrics;
- </service>
- </service>
-
- <service name="EJB3 JAR"
- subCategory="Applications"
- class="StandaloneManagedDeploymentComponent"
- discovery="StandaloneManagedDeploymentDiscoveryComponent"
- description="a standalone EJB 3.x application"
- createDeletePolicy="both"
- creationDataType="content">
-
- <plugin-configuration>
- <c:group name="general" displayName="General">
- <c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/>
- <c:simple-property name="filename" readOnly="true"/>
- </c:group>
- <c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
- <c:simple-property name="extension" default="jar" readOnly="true"/>
- <c:simple-property name="descriptionTemplate" default="a standalone EJB 3.x application" readOnly="true"/>
- <c:simple-property name="deploymentTypeName" default="JavaEEEnterpriseBeans3x" readOnly="true">
- <c:description>
- The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum
- corresponding to this deployment's type.
- </c:description>
- </c:simple-property>
- </c:group>
- </plugin-configuration>
-
- <operation name="start"
- description="starts this EJB JAR"/>
-
- <operation name="stop"
- description="stops this EJB JAR"/>
-
- <operation name="restart"
- description="stops and then restarts this EJB JAR"/>
-
- <metric property="custom.path" displayName="Path"
- dataType="trait" displayType="summary"
- description="the absolute path of this EJB JAR file or directory"/>
-
- <metric property="custom.exploded" displayName="Exploded?"
- dataType="trait" displayType="summary"
- description="whether this EJB JAR is deployed exploded (i.e. as a directory)"/>
-
- <content name="file" displayName="EJB JAR File" category="deployable" isCreationType="true">
- &deploymentContentConfigProps;
- </content>
-
- <service name="EJB3 Stateless Session Bean"
- class="Ejb3BeanComponent"
- discovery="Ejb3BeanDiscoveryComponent"
- description="An EJB3 Stateless Session Bean (SLSB)">
- &ejb3StatelessSessionBeanDefinition;
- &ejbInvocationStatsOperation;
- &ejb3CommonMetrics;
- &ejb3SessionBeanMetrics;
- </service>
-
- <service name="EJB3 Stateful Session Bean"
- class="Ejb3BeanComponent"
- discovery="Ejb3BeanDiscoveryComponent"
- description="An EJB3 Stateful Session Bean (SFSB)">
- &ejb3StatefulSessionBeanDefinition;
- &ejbInvocationStatsOperation;
- &ejb3CommonMetrics;
- &ejb3SessionBeanMetrics;
- &ejb3StatefulSessionBeanMetrics;
- </service>
-
- <service name="EJB3 Message-Driven Bean"
- class="Ejb3BeanComponent"
- discovery="Ejb3BeanDiscoveryComponent"
- description="An EJB3 Message-Driven Bean (MDB)">
- &ejb3MessageDrivenBeanDefinition;
- &ejbInvocationStatsOperation;
- &ejb3CommonMetrics;
- &ejb3MessageDrivenBeanMetrics;
- </service>
-
- </service>
-
- <service name="Embedded EJB3 JAR"
- subCategory="Applications"
- class="EmbeddedManagedDeploymentComponent"
- discovery="EmbeddedManagedDeploymentDiscoveryComponent"
- description="an embedded EJB 3.x application">
-
- <plugin-configuration>
- <c:group name="general" displayName="General">
- <c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/>
- <c:simple-property name="filename" readOnly="true"/>
- </c:group>
- <c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
- <c:simple-property name="extension" default="jar" readOnly="true"/>
- <c:simple-property name="descriptionTemplate" default="an embedded EJB 3.x application" readOnly="true"/>
- <c:simple-property name="deploymentTypeName" default="JavaEEEnterpriseBeans3x" readOnly="true">
- <c:description>
- The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum
- corresponding to this deployment's type.
- </c:description>
- </c:simple-property>
- </c:group>
- </plugin-configuration>
-
- <metric property="custom.parent" displayName="Parent"
- dataType="trait" displayType="summary"
- description="the name of this EJB JAR's parent deployment"/>
-
- <service name="EJB3 Stateless Session Bean (Embedded)"
- class="Ejb3BeanComponent"
- discovery="Ejb3BeanDiscoveryComponent"
- description="An EJB3 Stateless Session Bean (SLSB)">
- &ejb3StatelessSessionBeanDefinition;
- &ejbInvocationStatsOperation;
- &ejb3CommonMetrics;
- &ejb3SessionBeanMetrics;
- </service>
-
- <service name="EJB3 Stateful Session Bean (Embedded)"
- class="Ejb3BeanComponent"
- discovery="Ejb3BeanDiscoveryComponent"
- description="An EJB3 Stateful Session Bean (SFSB)">
- &ejb3StatefulSessionBeanDefinition;
- &ejbInvocationStatsOperation;
- &ejb3CommonMetrics;
- &ejb3SessionBeanMetrics;
- &ejb3StatefulSessionBeanMetrics;
- </service>
-
- <service name="EJB3 Message-Driven Bean (Embedded)"
- class="Ejb3BeanComponent"
- discovery="Ejb3BeanDiscoveryComponent"
- description="An EJB3 Message-Driven Bean (MDB)">
- &ejb3MessageDrivenBeanDefinition;
- &ejbInvocationStatsOperation;
- &ejb3CommonMetrics;
- &ejb3MessageDrivenBeanMetrics;
- </service>
-
- </service>
-
- <service name="Resource Adapter Archive (RAR)"
- subCategory="Applications"
- class="StandaloneManagedDeploymentComponent"
- discovery="StandaloneManagedDeploymentDiscoveryComponent"
- description="a standalone JCA resource adapter archive (RAR)"
- createDeletePolicy="both"
- creationDataType="content">
-
- <plugin-configuration>
- <c:group name="general" displayName="General">
- <c:simple-property name="deploymentName" description="the name of this RAR" readOnly="true"/>
- <c:simple-property name="filename" readOnly="true"/>
- </c:group>
- <c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
- <c:simple-property name="extension" default="rar" readOnly="true"/>
- <c:simple-property name="descriptionTemplate" default="a standalone resource adapter" readOnly="true"/>
- <c:simple-property name="deploymentTypeName" default="JavaEEResourceAdaptor" readOnly="true">
- <c:description>
- The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum
- corresponding to this deployment's type.
- </c:description>
- </c:simple-property>
- </c:group>
- </plugin-configuration>
-
- <operation name="start"
- description="starts this RAR"/>
-
- <operation name="stop"
- description="stops this RAR"/>
-
- <operation name="restart"
- description="stops and then restarts this RAR"/>
-
- <metric property="custom.path" displayName="Path"
- dataType="trait" displayType="summary"
- description="the absolute path of this RAR file or directory"/>
-
- <metric property="custom.exploded" displayName="Exploded?"
- dataType="trait" displayType="summary"
- description="whether this RAR is deployed exploded (i.e. as a directory)"/>
-
- <content name="file" displayName="RAR File" category="deployable" isCreationType="true">
- &deploymentContentConfigProps;
- </content>
-
- </service>
-
- <service name="Embedded Resource Adapter Archive (RAR)"
- subCategory="Applications"
- class="EmbeddedManagedDeploymentComponent"
- discovery="EmbeddedManagedDeploymentDiscoveryComponent"
- description="an embedded JCA resource adapter archive (RAR)">
-
- <plugin-configuration>
- <c:group name="general" displayName="General">
- <c:simple-property name="deploymentName" description="the name of this RAR" readOnly="true"/>
- <c:simple-property name="filename" readOnly="true"/>
- </c:group>
- <c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
- <c:simple-property name="extension" default="rar" readOnly="true"/>
- <c:simple-property name="descriptionTemplate" default="an embedded resource adapter" readOnly="true"/>
- <c:simple-property name="deploymentTypeName" default="JavaEEResourceAdaptor" readOnly="true">
- <c:description>
- The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum
- corresponding to this deployment's type.
- </c:description>
- </c:simple-property>
- </c:group>
- </plugin-configuration>
-
- <metric property="custom.parent" displayName="Parent"
- dataType="trait" displayType="summary"
- description="the name of this RAR's parent deployment"/>
-
- </service>
-
- <service name="Script"
- discovery="org.rhq.plugins.jbossas5.script.ScriptDiscoveryComponent"
- class="org.rhq.plugins.jbossas5.script.ScriptComponent"
- supportsManualAdd="true"
- subCategory="Resources"
- description="provides the ability to execute a script that performs some task related to its parent JBossAS server">
-
- <plugin-configuration>
- <c:simple-property name="path" description="the absolute path to the script file"/>
- <c:simple-property name="environmentVariables" type="longString" required="false"
- description="the environment variables that will be passed to the script; each variable must
- be on a new line and have the syntax name=value; the variable's value can contain properties
- with the syntax %propertyName%; the script plugin will interpolate these with
- the current values of the corresponding properties from the
- script's parent JBossAS server's connection properties"/>
- </plugin-configuration>
-
- <operation name="execute" displayName="Execute Script"
- description="execute the script; NOTE: environment variables to be
- passed to the script can be configured via this Script
- service's connection properties (under its Inventory tab)">
- <parameters>
- <c:simple-property name="commandLineArguments" type="longString" required="false"
- description="the command-line arguments (if any) to pass to the script; each
- command-line argument must be on a new line;
- the arguments can contain properties
- with the syntax %propertyName%; the script plugin will interpolate these with
- the current values of the corresponding properties from the
- script's parent JBossAS server's connection properties"/>
- </parameters>
- <results>
- <c:simple-property name="exitCode" type="integer" description="the script's exit code (0 indicates success, any other value indicates failure)"/>
- <c:simple-property name="output" type="longString" description="the script's output (stdout and stderr interleaved)"/>
- </results>
- </operation>
-
- </service>
-
- <service name="Service Binding Manager"
- class="org.rhq.plugins.jbossas5.serviceBinding.ManagerComponent"
- discovery="org.rhq.plugins.jbossas5.serviceBinding.ManagerDiscoveryComponent"
- description="The Service Binding Manager manages the ports of the deployed services"
- singleton="true">
-
- <plugin-configuration>
- <c:simple-property name="componentType" default="MCBean" readOnly="true"/>
- <c:simple-property name="componentSubtype" default="ServiceBindingManager" readOnly="true"/>
- <c:simple-property name="componentName" readOnly="true"/>
- </plugin-configuration>
-
- <metric property="activeBindingSetName" dataType="trait" displayName="Active Binding Set"
- displayType="summary" description="The active binding set used to obtain port bindings from." />
-
- <resource-configuration>
- <c:simple-property name="activeBindingSetName"
- activationPolicy="restart">
- <c:description><![CDATA[
-The name of the binding set the Service Binding Manager should use when resolving bindings.
-Note to JBoss ON or Jopr users (does not apply to JBoss AS admin console):
-CHANGING THIS PROPERTY IS POTENTIALLY DANGEROUS because if there are any port conflicts
-on the machine the Application Server is running on, the server will not start up again and
-it will not be possible to monitor it.
-To be able to monitor the server again after the restart you have to update the "Naming Provider Url"
-in the "Connection" subtab in the "Inventory" of the Application Server to the value
-of "jboss:service=Naming:Port" binding of the active binding set.
-I.e. if the "jboss:service=Naming:Port" binding of the active binding set has the port set to 4099 and hostname to 127.0.0.1,
-you have to set the "Naming Provider Url" to jnp://127.0.0.1:4099.
- ]]></c:description>
- </c:simple-property>
- <c:list-property name="standardBindings" description="The standard port bindings inherited by the binding sets.">
- <c:map-property name="binding">
- <c:simple-property name="serviceName" description="The name of the service to which this binding applies."/>
- <c:simple-property name="bindingName" required="false" description="A qualifier identifying which particular binding within the service this is."/>
- <c:simple-property name="port" type="integer" description="The port to use for the binding.">
- <c:constraint>
- <c:integer-constraint minimum="0"/>
- <c:integer-constraint maximum="65535"/>
- </c:constraint>
- </c:simple-property>
- <c:simple-property name="hostname" required="false" description="The host name or string notation IP address to use for the binding."/>
- <c:simple-property name="description" required="false" description="Description of the binding."/>
- <c:simple-property name="fullyQualifiedName" required="false" readOnly="true" description="The fully qualified binding name. This is an informational field only consisting of the service name and the binding name."/>
- <c:simple-property name="fixedHostName" type="boolean" description="Whether the host name should remain fixed in all binding sets."/>
- <c:simple-property name="fixedPort" type="boolean" description="Whether the port should remain fixed in all binding sets."/>
- </c:map-property>
- </c:list-property>
- </resource-configuration>
-
- <service name="Service Binding Set"
- class="org.rhq.plugins.jbossas5.serviceBinding.SetComponent"
- discovery="org.rhq.plugins.jbossas5.serviceBinding.SetDiscoveryComponent"
- description="The Service Binding Set defines all bindings of a profile. It inherits the standard bindings from the Service Binding Manager and defines a port offset and overridden and additional bindings." createDeletePolicy="both">
-
- <operation name="displayBindings" displayName="Display Bindings" description="Displays the full set of bindings as they would look if this bindings set was active.">
- <results>
- <c:list-property name="resultingBindings" readOnly="true" required="false" displayName="Resulting Bindings"
- description="In this list you can review the resulting bindings of this binding set. This list includes the override bindings defined for this binding set and the standard bindings as they would look if this binding set was active (i.e. the port offset and default host name applied where appropriate).">
- <c:map-property name="binding" readOnly="true">
- <c:simple-property readOnly="true" name="serviceName" displayName="Service Name" description="The name of the service to which this binding applies."/>
- <c:simple-property readOnly="true" name="bindingName" required="false" displayName="Binding Name" description="A qualifier identifying which particular binding within the service this is."/>
- <c:simple-property readOnly="true" name="port" type="integer" displayName="Port" description="The port to use for the binding."/>
- <c:simple-property readOnly="true" name="hostName" required="false" displayName="Host Name" description="The host name or string notation IP address to use for the binding."/>
- <c:simple-property readOnly="true" name="description" required="false" displayName="Description" description="Description of the binding"/>
- <c:simple-property readOnly="true" name="fullyQualifiedName" required="false" displayName="Fully Qualified Name" description="The fully qualified binding name. This is an informational field only consisting of the service name and the binding name."/>
- </c:map-property>
- </c:list-property>
- </results>
- </operation>
-
- <metric property="name" displayName="Name" dataType="trait" displayType="summary" description="The name of this binding set."/>
- <metric property="defaultHostName" dataType="trait" displayName="Default Host Name" displayType="summary" description="The default host name of this binding set." />
- <metric property="portOffset" dataType="trait" displayName="Port Offset" displayType="summary" description="The port offset of this binding set."/>
-
- <resource-configuration>
- <c:simple-property name="name" readOnly="true" description="The name of this binding set."/>
- <c:simple-property name="defaultHostName" description='The host name that should be used for all bindings whose configuration does not specify "fixed host name".'/>
- <c:simple-property name="portOffset" type="integer" description="A value to add to the port configuration for a standard binding to derive the port to use in this binding set. This doesn't apply to standard bindings defined as 'fixed port'.">
- <c:constraint>
- <c:integer-constraint minimum="0"/>
- <c:integer-constraint maximum="65535"/>
- </c:constraint>
- </c:simple-property>
- <c:list-property name="overrideBindings" description='The binding configurations that apply only to this binding set, either non-standard bindings or ones that override standard binding configurations.
- The binding set inherits the standard bindings from the Service Binding Manager, applies the port offset to them (unless the standard binding is defined as "fixed port"), and appends the override
- bindings. These can either redefine a standard binding or define a brand new binding. The standard bindings and the override bindings then define the
- full set of the bindings that are defined by the binding set.'>
- <c:map-property name="binding">
- <c:simple-property name="serviceName" displayName="Service Name" description="The name of the service to which this binding applies."/>
- <c:simple-property name="bindingName" required="false" displayName="Binding Name" description="A qualifier identifying which particular binding within the service this is."/>
- <c:simple-property name="port" type="integer" displayName="Port" description="The port to use for the binding.">
- <c:constraint>
- <c:integer-constraint minimum="0"/>
- <c:integer-constraint maximum="65535"/>
- </c:constraint>
- </c:simple-property>
- <c:simple-property name="hostName" required="false" displayName="Host Name" description="The host name or string notation IP address to use for the binding."/>
- <c:simple-property name="description" required="false" displayName="Description" description="Description of the binding"/>
- <c:simple-property name="fullyQualifiedName" required="false" readOnly="true" displayName="Fully Qualified Name" description="The fully qualified binding name. This is an informational field only consisting of the service name and the binding name."/>
- </c:map-property>
- </c:list-property>
- </resource-configuration>
- </service>
- </service>
-
- </server>
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!DOCTYPE plugin [
+
+<!ENTITY managedObjectMetrics '
+ <metric property="runState" displayType="summary"
+ defaultOn="true" defaultInterval="30000" dataType="trait" category="performance"/>
+'>
+
+<!ENTITY datasourceAndConnectionFactoryOperations '
+ <operation name="flush" displayName="Flush"
+ description="Flush the connections in the pool"/>
+
+ <operation name="listFormattedSubPoolStatistics" displayName="List Formatted Sub Pool Statistics"
+ description="Obtain a formatted sub pool statistics report">
+ <parameters>
+ <c:simple-property required="false" name="formatClassName"
+ defaultValue="org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter">
+ <c:description>
+ The fully qualified name of the Java class to use to format the the sub pool statistics. The default
+ is "org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter".
+ </c:description>
+ </c:simple-property>
+ </parameters>
+ <results>
+ <c:simple-property name="result" type="longString">
+ <c:description>
+ A formatted sub pool statistics report.
+ </c:description>
+ </c:simple-property>
+ </results>
+ </operation>
+
+ <operation name="listStatistics" displayName="List Statistics" description="Obtain a statistics report">
+ <results>
+ <c:map-property name="result"/>
+ </results>
+ </operation>
+
+ <operation name="testConnection" displayName="Test Connection" description="Test if a connection can be obtained">
+ <results>
+ <c:notes>Test if a connection can be obtained</c:notes>
+ <c:simple-property type="boolean" name="result" description="Was a connection obtained?"/>
+ </results>
+ </operation>
+'>
+
+<!-- TODO: Use one shared XML entity for datasource and connection factory metrics. -->
+<!ENTITY datasourceMetrics '
+ <!-- Traits -->
+ <metric property="poolJndiName" displayType="summary" displayName="Pool JNDI Name"
+ defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"
+ description="the JNDI name of the connection pool for this datasource"/>
+
+ <!-- Numerics -->
+ <metric property="availableConnectionCount" measurementType="dynamic" displayType="summary"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"
+ description="the maximum number of connections that are available"/>
+
+ <metric property="connectionCount" measurementType="dynamic" displayType="summary"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"
+ description="the number of connections that are currently in the pool"/>
+
+ <metric property="connectionCreatedCount" measurementType="dynamic" displayType="detail"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"
+ description="the number of connections that have been created since the datasource was last started"/>
+
+ <metric property="connectionDestroyedCount" measurementType="dynamic" displayType="detail"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"
+ description="the number of connections that have been destroyed since the datasource was last started"/>
+
+ <metric property="inUseConnectionCount" measurementType="dynamic" displayType="detail"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"
+ description="the number of connections that are currently in use"/>
+
+ <metric property="local-transaction" displayType="summary"
+ defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+
+ <metric property="maxConnectionsInUseCount" measurementType="dynamic" displayType="detail"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"
+ description="the most connections that have been simultaneously in use since this datasource was started"/>
+
+ <metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+
+ <metric property="minSize" measurementType="dynamic" displayType="detail" displayName="Min Size"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+'>
+
+<!-- NOTE: For Datasource ManagedProperty annotations, see:
+ https://anonsvn.jboss.org/repos/jbossas/trunk/connector/src/main/org/jbos...
+ Descriptions of datasource config props can also be culled from the following locations:
+ https://anonsvn.jboss.org/repos/jbossas/trunk/connector/src/resources/dtd...
+ http://www.jboss.org/file-access/default/members/jbossas/freezone/docs/Ad...
+ http://www.jboss.org/community/wiki/ConfigDataSources
+ http://www.jboss.org/community/wiki/ConfigJCACommon
+ -->
+
+<!ENTITY datasourceAndConnectionFactoryConnectionResourceConfigProps '
+ <c:simple-property name="min-pool-size"
+ displayName="Minimum Pool Size"
+ type="integer"
+ required="false"
+ defaultValue="0">
+ <c:description>
+ The minimum number of connections the pool should hold. The default is 0.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="0"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:simple-property name="max-pool-size"
+ displayName="Maximum Pool Size"
+ type="integer"
+ required="false"
+ defaultValue="10">
+ <c:description>
+ The maximum number of connections the pool should hold. The default is 10.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="0"/>
+ </c:constraint>
+ </c:simple-property>
+'>
+
+<!ENTITY datasourceConnectionResourceConfigProps '
+ <c:simple-property name="jndi-name"
+ displayName="JNDI Name"
+ description="The global JNDI Name under which to bind the datasource"
+ type="string"/>
+
+ <c:simple-property name="user-name"
+ displayName="Username"
+ description="The default username when creating a new connection."
+ type="string"
+ activationPolicy="immediate"
+ required="false"/>
+
+ <c:simple-property name="password"
+ displayName="Password"
+ description="The default password when creating a new connection."
+ type="password"
+ activationPolicy="immediate"
+ required="false"/>
+'>
+
+<!ENTITY datasourceAndConnectionFactoryAdvancedResourceConfigProps '
+ <c:simple-property name="allocation-retry" type="integer" required="false"
+ defaultValue="0">
+ <c:description>
+ The number of times that allocating a connection should be tried before throwing an exception. The default
+ is 0.
+ </c:description>
+ </c:simple-property>
+
+ <c:simple-property name="allocation-retry-wait-millis" type="long" required="false" units="milliseconds"
+ defaultValue="5000">
+ <c:description>
+ The time in milliseconds to wait between retrying to allocate a connection. The default is 5000 (5 seconds).
+ </c:description>
+ </c:simple-property>
+
+ <c:simple-property name="background-validation" type="boolean" required="false" defaultValue="false">
+ <c:description>
+ Specify if connections should be validated on a background thread versus being validated
+ prior to use. Background validation is meant to reduce the overall load on the RDBMS system when validating
+ a connection. The default is No.
+ </c:description>
+ </c:simple-property>
+
+ <c:simple-property name="background-validation-millis" type="long" required="false" units="milliseconds"
+ defaultValue="0">
+ <c:description>
+ The interval, in milliseconds, at which the ConnectionValidator will run. Set to 0 to disable background
+ validation. The default is 0.
+ </c:description>
+ </c:simple-property>
+
+ <c:simple-property name="blocking-timeout-millis" displayName="Blocking Timeout in Milliseconds"
+ units="milliseconds" defaultValue="30000"
+ type="integer" required="false">
+ <c:description>
+ Indicates the maximum time in milliseconds to block while waiting for a connection before throwing
+ an exception. Note that this blocks only while waiting for a permit for a connection, and will never
+ throw an exception if creating a new connection takes an inordinately long time. The default is 30000
+ (30 seconds).
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="0"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:simple-property name="idle-timeout-minutes" type="integer" activationPolicy="immediate"
+ displayName="Idle Timeout" units="minutes" required="false" defaultValue="30">
+ <c:description>
+ The maximum time, in minutes, a connection may be idle before being closed. The default is 30.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="0"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:simple-property name="isSameRM-override-value" type="boolean" required="false">
+ <c:description>
+ If set, unconditionally sets the boolean return value of javax.transaction.xa.XAResource.isSameRM(XAResource).
+ </c:description>
+ </c:simple-property>
+
+ <c:simple-property name="jmx-invoker-name" required="false">
+ <c:description>
+ The ObjectName of the JMX Invoker MBean associated with this datasource.
+ </c:description>
+ </c:simple-property>
+
+ <c:map-property name="metadata" required="false" description="Metadata properties.">
+ <c:simple-property required="false" name="typeMapping">
+ <c:description>
+ The name of the corresponding type-mapping in conf/standardjbosscmp-jdbc.xml.
+ </c:description>
+ <c:property-options>
+ <c:option name="Cloudscape" value="Cloudscape"/>
+ <c:option name="DB2" value="DB2"/>
+ <c:option name="DB2/400" value="DB2/400"/>
+ <c:option name="Derby" value="Derby"/>
+ <c:option name="Firebird" value="Firebird"/>
+ <c:option name="FirstSQL/J" value="FirstSQL/J"/>
+ <c:option name="Hypersonic SQL" value="Hypersonic SQL"/>
+ <c:option name="InformixDB" value="InformixDB"/>
+ <c:option name="Ingres" value="Ingres"/>
+ <c:option name="InterBase" value="InterBase"/>
+ <c:option name="MaxDB" value="MaxDB"/>
+ <c:option name="McKoi" value="McKoi"/>
+ <c:option name="Mimer SQL" value="Mimer SQL"/>
+ <c:option name="MS SQLSERVER" value="MS SQLSERVER"/>
+ <c:option name="MS SQLSERVER2000" value="MS SQLSERVER2000"/>
+ <c:option name="Oracle7" value="Oracle7"/>
+ <c:option name="Oracle8" value="Oracle8"/>
+ <c:option name="Oracle9i" value="Oracle9i"/>
+ <c:option name="PointBase" value="PointBase"/>
+ <c:option name="PostgreSQL" value="PostgreSQL"/>
+ <c:option name="PostgreSQL 7.2" value="PostgreSQL 7.2"/>
+ <c:option name="PostgreSQL 8.0" value="PostgreSQL 8.0"/>
+ <c:option name="SapDB" value="SapDB"/>
+ <c:option name="SOLID" value="SOLID"/>
+ <c:option name="Sybase" value="Sybase"/>
+ </c:property-options>
+ </c:simple-property>
+ </c:map-property>
+
+ <c:simple-property name="no-tx-separate-pools" type="boolean"
+ displayName="No Tx Separate Pools" required="false">
+ <c:description>
+ If true, the datasource cannot reuse a connection outside a transaction once enlisted in a global transaction
+ and vice-versa. The default is Yes.
+ </c:description>
+ </c:simple-property>
+
+ <c:simple-property name="prefill" type="boolean" required="false">
+ <c:description>
+ Whether to attempt to prefill the connection pool to the minimum number of connections. NOTE: Only
+ supporting pools (OnePool) support this feature. A warning can be found in the logs if the pool does not
+ support this. The default is No.
+ </c:description>
+ </c:simple-property>
+
+ <c:map-property name="security-domain" displayName="Security Settings" required="false">
+ <c:description>
+ Security settings for connections in the pool.
+ </c:description>
+
+ <c:simple-property name="securityDeploymentType" type="string"
+ required="false" defaultValue="NONE">
+ <c:description>
+ Indicates whether Subject (from security domain), application-supplied parameters
+ (such as from getConnection(user, pw)), both Subject and app-supplied parameters,
+ or neither Subject nor app-supplied parameters are used to distinguish connections
+ in the pool. The default is "NONE".
+ </c:description>
+ <c:property-options>
+ <c:option name="None" value="NONE"/>
+ <c:option name="Application" value="APPLICATION"/>
+ <c:option name="Domain" value="DOMAIN"/>
+ <c:option name="Domain and Application" value="DOMAIN_AND_APPLICATION"/>
+ </c:property-options>
+ </c:simple-property>
+
+ <c:simple-property name="domain" type="string"
+ required="false">
+ <c:description>
+ The name of the JAAS security manager that will handle authentication (only required if security
+ deployment type is DOMAIN or DOMAIN_AND_APPLICATION). This name correlates to the JAAS login-config.xml
+ descriptor application-policy/name attribute.
+ </c:description>
+ </c:simple-property>
+ </c:map-property>
+
+ <c:simple-property name="statistics-formatter" required="false">
+ <c:description>
+ The fully qualified class name of the class to use for formatting managed connection pool statistics for
+ this datasource. The class must implement the org.jboss.resource.statistic.formatter.StatisticsFormatter.
+ interface. The default is "org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter".
+ </c:description>
+ </c:simple-property>
+
+ <c:simple-property name="type-mapping" displayName="Type Mapping" required="false">
+ <c:description>
+ The name of the corresponding type-mapping in conf/standardjbosscmp-jdbc.xml.
+ </c:description>
+ <c:property-options>
+ <c:option name="Cloudscape" value="Cloudscape"/>
+ <c:option name="DB2" value="DB2"/>
+ <c:option name="DB2/400" value="DB2/400"/>
+ <c:option name="Derby" value="Derby"/>
+ <c:option name="Firebird" value="Firebird"/>
+ <c:option name="FirstSQL/J" value="FirstSQL/J"/>
+ <c:option name="Hypersonic SQL" value="Hypersonic SQL"/>
+ <c:option name="InformixDB" value="InformixDB"/>
+ <c:option name="Ingres" value="Ingres"/>
+ <c:option name="InterBase" value="InterBase"/>
+ <c:option name="MaxDB" value="MaxDB"/>
+ <c:option name="McKoi" value="McKoi"/>
+ <c:option name="Mimer SQL" value="Mimer SQL"/>
+ <c:option name="MS SQLSERVER" value="MS SQLSERVER"/>
+ <c:option name="MS SQLSERVER2000" value="MS SQLSERVER2000"/>
+ <c:option name="Oracle7" value="Oracle7"/>
+ <c:option name="Oracle8" value="Oracle8"/>
+ <c:option name="Oracle9i" value="Oracle9i"/>
+ <c:option name="PointBase" value="PointBase"/>
+ <c:option name="PostgreSQL" value="PostgreSQL"/>
+ <c:option name="PostgreSQL 7.2" value="PostgreSQL 7.2"/>
+ <c:option name="PostgreSQL 8.0" value="PostgreSQL 8.0"/>
+ <c:option name="SapDB" value="SapDB"/>
+ <c:option name="SOLID" value="SOLID"/>
+ <c:option name="Sybase" value="Sybase"/>
+ </c:property-options>
+ </c:simple-property>
+
+ <c:simple-property name="use-java-context"
+ displayName="Use Java Context"
+ type="boolean" defaultValue="true"
+ required="false">
+ <c:description>
+ Indicates whether the JNDI name should be bound under the "java" context,
+ which causes the DataSource to only be accessible from within the JBossAS VM.
+ The default is Yes.
+ </c:description>
+ </c:simple-property>
+
+ <c:simple-property name="use-strict-min" type="boolean" required="false">
+ <c:description>
+ Whether idle connections below the min-pool-size should be closed. The default is No.
+ </c:description>
+ </c:simple-property>
+
+ <c:simple-property name="validate-on-match" type="boolean" required="false" defaultValue="true">
+ <c:description>
+ The validate-on-match element indicates whether or not connection level validation should be done when a
+ connection factory attempts to match a managed connection for a given set. This is typically exclusive to
+ the use of background validation. The default is Yes.
+ </c:description>
+ </c:simple-property>
+'>
+
+<!ENTITY datasourceAdvancedResourceConfigProps '
+ <c:simple-property name="check-valid-connection-sql" type="longString"
+ displayName="Check Valid Connection SQL" required="false">
+ <c:description>The SQL statement to use to check the validity of a pool connection.</c:description>
+ </c:simple-property>
+
+ <c:simple-property required="false" name="connection-definition">
+ <c:description>
+ The connection definition inside the RAR deployment uniquely identified by the connection factory interface,
+ e.g. "javax.sql.DataSource".
+ </c:description>
+ </c:simple-property>
+
+ <c:simple-property name="exception-sorter-class-name" type="string" activationPolicy="immediate"
+ displayName="Exception Sorter Class Name" required="false">
+ <c:description>
+ The fully qualified name of a Java class implementing the org.jboss.resource.adapter.jdbc.ExceptionSorter
+ interface that should be used to check if a JDBC exception should be broadcast.
+ </c:description>
+ </c:simple-property>
+
+ <c:simple-property name="new-connection-sql" type="longString" activationPolicy="immediate"
+ displayName="New Connection SQL" required="false">
+ <c:description>
+ An SQL statement to execute whenever a new connection is added to the pool; this can be used to set the
+ connection schema, etc.
+ </c:description>
+ </c:simple-property>
+
+ <c:simple-property name="prepared-statement-cache-size" type="integer"
+ displayName="Prepared Statement Cache Size" required="false" defaultValue="0">
+ <c:description>
+ The number of prepared statements per connection to be kept open and reused in subsequent requests. They are
+ stored in an LRU cache. Set to 0 to disable the cache. The default is 0.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="0"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:simple-property name="query-timeout"
+ displayName="Query Timeout"
+ type="integer"
+ units="seconds"
+ required="false">
+ <c:description>
+ Any configured query timeout in seconds. A value of 0 means no timeout. The default is 0.
+ </c:description>
+ </c:simple-property>
+
+ <c:simple-property name="rar-name" required="false">
+ <c:description>
+ The RAR deployment to associate with the connection manager MBean. e.g. jms-ra.rar or
+ myapplication.ear#my.rar for nested rars.
+ </c:description>
+ </c:simple-property>
+
+ <c:simple-property name="set-tx-query-timeout"
+ displayName="Set Tx Query Timeout"
+ type="boolean"
+ required="false"
+ defaultValue="false">
+ <c:description>
+ Whether to set the query timeout based on the time remaining until transaction timeout;
+ any configured query timeout will be used if there is no transaction. The default is No.
+ </c:description>
+ </c:simple-property>
+
+ <c:simple-property name="share-prepared-statements" displayName="Share Prepared Statements"
+ type="boolean"
+ required="false" defaultValue="false">
+ <c:description>
+ Should prepared statements be shared? The default is No.
+ </c:description>
+ </c:simple-property>
+
+ <c:simple-property name="stale-connection-checker-class-name"
+ displayName="Stale Connection Checker Class Name"
+ type="string"
+ required="false">
+ <c:description>
+ Fully qualified name of the Java class used to check if a connection has become stale.
+ </c:description>
+ </c:simple-property>
+
+ <c:simple-property name="track-statements" type="string"
+ displayName="Track Statements" required="false">
+ <c:description>
+ Whether to check for unclosed Statements and ResultSets when connections are returned to the pool. The
+ default is "yes-no-warnings".
+ </c:description>
+ <c:property-options>
+ <c:option name="No" value="no"/>
+ <c:option name="Yes" value="yes"/>
+ <c:option name="Yes, but no warnings" value="yes-no-warnings" default="true"/>
+ </c:property-options>
+ </c:simple-property>
+
+ <c:simple-property name="transaction-isolation" required="false"
+ description="The Transaction Isolation level. The default setting is to use whichever isolation level is provided by default by the database.">
+ <c:property-options>
+ <c:option value="TRANSACTION_READ_UNCOMMITTED" name="Read Uncommitted"/>
+ <c:option value="TRANSACTION_READ_COMMITTED" default="true" name="Read Committed"/>
+ <c:option value="TRANSACTION_REPEATABLE_READ" name="Repeatable Read"/>
+ <c:option value="TRANSACTION_SERIALIZABLE" name="Serializable"/>
+ <c:option value="TRANSACTION_NONE" name="None"/>
+ </c:property-options>
+ </c:simple-property>
+
+ <c:simple-property name="url-delimiter" required="false" default="|">
+ <c:description>
+ Specifies the delimiter for URLs in the value of the connection-url property for HA datasources.
+ The default is "|".
+ </c:description>
+ </c:simple-property>
+
+ <c:simple-property name="url-selector-strategy-class-name" required="false">
+ <c:description>
+ The fully qualified class name of a Java class implementing the
+ org.jboss.resource.adapter.jdbc.URLSelectorStrategy interface.
+ </c:description>
+ </c:simple-property>
+
+ <c:simple-property name="use-try-lock" type="long" required="false" defaultValue="0">
+ <c:description>
+ Any configured timeout, in milliseconds, for internal locks on the resource adapter objects. A value of 0
+ means no timeout. The default is 0.
+ </c:description>
+ </c:simple-property>
+
+ <c:simple-property name="valid-connection-checker-class-name" type="string"
+ displayName="Valid Connection Checker Class Name" required="false">
+ <c:description>
+ The fully qualified name of a Java class implementing the
+ org.jboss.resource.adapter.jdbc.ValidConnectionChecker whose pingDatabase method should be used to check if
+ a connection is still valid before handing it out from the pool.
+ </c:description>
+ </c:simple-property>
+'>
+
+<!ENTITY nonXaDatasourceConnectionResourceConfigProps '
+ <c:simple-property name="driver-class"
+ displayName="JDBC Driver Class"
+ type="string">
+ <c:description>
+ The fully qualified name of the JDBC driver class (e.g. "oracle.jdbc.driver.OracleDriver").
+ </c:description>
+ </c:simple-property>
+
+ <c:simple-property name="connection-url"
+ displayName="Connection URL"
+ type="string">
+ <c:description>
+ The JDBC URL for the database (e.g. "jdbc:oracle:thin:@host.example.com:1521:db"). To define a high
+ availablity (HA) datasource, specify a list of URLs separated by URL delimiters
+ (e.g. "jdbc:oracle:thin:@host1.example.com:1521:db1|jdbc:oracle:thin:@host2.example.com:1521:db2").
+ </c:description>
+ </c:simple-property>
+
+ <c:map-property name="connection-properties" required="false"
+ description="Arbitrary connection properties that should be passed to the java.sql.Driver.connect(url, props) method."/>
+'>
+
+<!ENTITY nonXaDatasourceOracleTemplateProps '
+ <c:simple-property name="driver-class" default="oracle.jdbc.driver.OracleDriver"/>
+ <c:simple-property name="connection-url" default="jdbc:oracle:oci:@youroracle-tns-name"/>
+ <c:simple-property name="exception-sorter-class-name"
+ default="org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter"/>
+ <c:simple-property name="check-valid-connection-sql" default="SELECT * FROM DUAL"/>
+ <c:simple-property name="type-mapping" default="oracle.jdbc.driver.OracleDriver"/>
+ <c:simple-property name="use-try-lock" default="60000"/>
+ <c:map-property name="metadata">
+ <c:simple-property name="typeMapping" default="Oracle9i"/>
+ </c:map-property>
+ <c:simple-property name="type-mapping" default="Oracle9i"/>
+'>
+
+<!--
+ See:
+ https://anonsvn.jboss.org/repos/jbossas/trunk/connector/src/main/org/jbos...
+ http://www.jboss.org/community/wiki/ConfigJCACommon
+ -->
+
+<!ENTITY connectionFactoryConnectionResourceConfigProps '
+ <c:simple-property required="true" name="jndi-name" displayName="JNDI Name"
+ description="The global JNDI name to bind the connection factory under."/>
+
+ <c:simple-property required="true" name="rar-name" displayName="RAR Name">
+ <c:description>
+ The name of the RAR file that contains the definition for the resource we want to provide. For nested RAR
+ files, the name would look like myapplication.ear#my.rar.
+ </c:description>
+ </c:simple-property>
+
+ <c:simple-property required="true" name="connection-definition">
+ <c:description>
+ The connection factory interface class. It should match the connectionfactory-interface in the ra.xml file.
+ </c:description>
+ </c:simple-property>
+
+'>
+
+
+<!ENTITY connectionFactoryAdvancedResourceConfigProps '
+ <c:list-property required="false" name="config-property">
+ <c:description>
+ Properties to supply to the ManagedConnectionFactory (MCF) MBean service configuration.
+ </c:description>
+ <c:map-property name="config-property">
+ <c:simple-property name="name" description="The name of the configuration property." />
+ <c:simple-property name="type" description="The type of the configuration property.">
+ <c:property-options>
+ <c:option value="java.lang.String" default="true"/>
+ <c:option value="java.lang.Boolean"/>
+ <c:option value="java.lang.Integer"/>
+ <c:option value="java.lang.Double"/>
+ <c:option value="java.lang.Byte"/>
+ <c:option value="java.lang.Short"/>
+ <c:option value="java.lang.Long"/>
+ <c:option value="java.lang.Float"/>
+ <c:option value="java.lang.Character"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="value" required="false" description="The value of the configuration property." />
+ </c:map-property>
+ </c:list-property>
+'>
+
+<!ENTITY connectionFactoryMetrics '
+ <!-- Traits -->
+ <metric property="poolJndiName" displayType="summary" displayName="Pool JNDI Name" defaultOn="true"
+ defaultInterval="600000" dataType="trait" category="performance"/>
+
+ <!-- Numerics -->
+ <metric property="availableConnectionCount" measurementType="dynamic" displayType="summary"
+ displayName="Available Connection Count" description="Number of available connections."
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+
+ <metric property="connectionCount" measurementType="dynamic" displayType="summary"
+ displayName="Connection Count" defaultOn="true" defaultInterval="60000" dataType="measurement"
+ category="performance"/>
+
+ <metric property="connectionCreatedCount" measurementType="dynamic" displayType="detail"
+ displayName="Connection Created Count" defaultOn="true" defaultInterval="60000"
+ dataType="measurement" category="performance"/>
+
+ <metric property="connectionDestroyedCount" measurementType="dynamic" displayType="detail"
+ displayName="Connection Destroyed Count" defaultOn="true" defaultInterval="60000"
+ dataType="measurement" category="performance"/>
+
+ <metric property="inUseConnectionCount" measurementType="dynamic" displayType="detail"
+ displayName="In Use Connection Count" description="Mumber of connections currently in use."
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+
+ <metric property="maxConnectionsInUseCount" measurementType="dynamic" displayType="detail"
+ displayName="Max Connections In Use Count" description="Maximum number of maximum connections that have been in use."
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+
+ <metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+
+ <metric property="minSize" measurementType="dynamic" displayType="detail" displayName="Min Size"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+'>
+
+<!-- These are the operations that both Topics and Queues have. -->
+<!ENTITY destinationOperations '
+ <operation name="removeAllMessages" displayName="Remove All Messages" description="Remove all messages from the destination."/>
+
+ <operation name="start" displayName="Start" description="Start the destination."/>
+
+ <operation name="stop" displayName="Stop" description="Stop the destination."/>
+'>
+
+<!ENTITY deploymentContentConfigProps '
+ <configuration>
+ <c:group name="deployment" displayName="Deployment Options">
+ <c:simple-property name="deployExploded" displayName="Deploy Exploded?" type="boolean" required="true"
+ default="false">
+ <c:description>
+ Should the archive be deployed in exploded form (i.e. as a directory)?
+ </c:description>
+ </c:simple-property>
+ <c:simple-property name="deployFarmed" type="boolean" required="true" default="false">
+ <c:description>
+ Should the application be deployed as a farmed deployment (i.e. to the farm directory, rather than
+ the deploy directory)? This option should only be set to Yes if this application server instance is
+ a node in a cluster, otherwise the application creation will fail. If set to Yes, the Deploy
+ Exploded property must be set to No, since exploded deployments to farm via the Profile Service are
+ currently not supported.
+ </c:description>
+ </c:simple-property>
+ </c:group>
+ </configuration>
+'>
+
+<!ENTITY webApplicationMetrics '
+ <metric property="contextRoot"
+ dataType="trait" displayType="summary"
+ description="this context root of this WAR (e.g. jmx-console) - used as a unique path prefix for URLs
+ corresponding to this WAR"/>
+
+ <metric property="virtualHosts"
+ dataType="trait" displayType="summary"
+ description="the virtual host(s) to which this WAR is deployed"/>
+'>
+
+<!ENTITY webApplicationContextMetrics '
+ <metric property="virtualHost"
+ dataType="trait" displayType="summary"
+ description="the virtual host with which this context is associated"/>
+
+ <metric property="responseTime"
+ dataType="calltime" defaultOn="false" defaultInterval="600000" units="milliseconds" destinationType="URL"
+ description="the minimum, maximum, and average response times for requests serviced by this webapp"/>
+
+ <metric property="activeSessions"
+ displayName="Currently Active Sessions"
+ units="none" description="the number of sessions that are currently active for this WAR" />
+
+ <metric property="maxActive" displayName="Maximum Active Sessions"
+ units="none" description="the maximum number of sessions that have been active for this WAR" />
+
+ <metric property="sessionCounter" displayName="Created Sessions"
+ units="none" description="the number of sessions created for this WAR"
+ measurementType="trendsup" />
+
+ <metric property="expiredSessions" displayName="Expired Sessions"
+ units="none" description="the number of expired sessions for this WAR"
+ measurementType="trendsup" />
+
+ <metric property="rejectedSessions" displayName="Rejected Sessions"
+ units="none" description="the number of sessions rejected for this WAR"
+ measurementType="trendsup" />
+
+ <metric property="sessionAverageAliveTime" displayName="Average Session Alive Time"
+ units="seconds" description="the average alive time of sessions for this WAR" />
+
+ <metric property="sessionMaxAliveTime" displayName="Max Session Alive Time"
+ units="seconds" description="the maximum alive time of sessions for this WAR" />
+
+ <metric property="Servlet.minimumResponseTime" displayName="Minimum Response Time"
+ units="milliseconds"
+ description="the minimum response time for requests serviced by this WAR"/>
+
+ <metric property="Servlet.averageResponseTime" displayName="Average Response Time"
+ units="milliseconds"
+ description="the average response time for requests serviced by this WAR"/>
+
+ <metric property="Servlet.maximumResponseTime" displayName="Maximum Response Time"
+ units="milliseconds"
+ description="the maximum response time for requests serviced by this WAR"/>
+
+ <metric property="Servlet.totalResponseTime" displayName="Total Response Time"
+ units="milliseconds" measurementType="trendsup"
+ description="the total response time for requests serviced by this WAR"/>
+
+ <metric property="Servlet.requestCount" displayName="Number of Requests Serviced"
+ units="none" description="the number of requests serviced by this WAR"
+ measurementType="trendsup" displayType="summary"/>
+
+ <metric property="Servlet.errorCount" displayName="Number of Error Responses"
+ units="none" description="the number of error responses sent by this WAR"
+ measurementType="trendsup" displayType="summary"/>
+'>
+
+<!ENTITY ejb3StatelessSessionBeanDefinition '
+ <plugin-configuration>
+ <c:simple-property name="componentType" default="EJB3" readOnly="true"/>
+ <c:simple-property name="componentSubtype" default="StatelessSession" readOnly="true"/>
+ <c:simple-property name="componentName" readOnly="true"/>
+ <c:simple-property name="invocationStatsPropertyName" default="invocationStats" readOnly="true"/>
+ </plugin-configuration>
+'>
+
+<!ENTITY ejb3StatefulSessionBeanDefinition '
+ <plugin-configuration>
+ <c:simple-property name="componentType" default="EJB3" readOnly="true"/>
+ <c:simple-property name="componentSubtype" default="StatefulSession" readOnly="true"/>
+ <c:simple-property name="componentName" readOnly="true"/>
+ <c:simple-property name="invocationStatsPropertyName" default="invocationStats" readOnly="true"/>
+ </plugin-configuration>
+'>
+
+<!ENTITY ejb3MessageDrivenBeanDefinition '
+ <plugin-configuration>
+ <c:simple-property name="componentType" default="EJB3" readOnly="true"/>
+ <c:simple-property name="componentSubtype" default="MessageDriven" readOnly="true"/>
+ <c:simple-property name="componentName" readOnly="true"/>
+ <c:simple-property name="invocationStatsPropertyName" default="invocationStats" readOnly="true"/>
+ </plugin-configuration>
+'>
+
+<!ENTITY ejb3CommonMetrics '
+ <metric property="name" displayName="EJB Name" dataType="trait" displayType="summary"
+ description="the name of this EJB"/>
+'>
+
+<!ENTITY ejb3SessionBeanMetrics '
+ <metric property="availableCount"
+ description="The number of pooled instances of this EJB3 Session Bean in the method-ready state"/>
+
+ <metric property="createCount" displayType="summary" measurementType="trendsup"
+ description="The number of instances of this EJB3 Session Bean that have been created since server start"/>
+
+ <metric property="currentSize" displayName="Current Count"
+ description="The total number of currently pooled instances of this EJB3 Session Bean"/>
+
+ <metric property="maxSize"
+ description="The maximum number of instances that are allowed to be pooled"/>
+
+ <metric property="removeCount" displayType="summary" measurementType="trendsup"
+ description="The number of instances of this EJB3 Session Bean that have been removed since server start"/>
+
+ <!-- default interval == 600000 ms == 10 min -->
+ <metric property="methodInvocationTime" dataType="calltime" units="milliseconds"
+ defaultOn="false" defaultInterval="600000" destinationType="Method Name"
+ description="The minimum, maximum, and average invocation times for each of the methods exposed by this EJB"/>
+'>
+
+<!ENTITY ejb3StatefulSessionBeanMetrics '
+ <metric property="cacheSize" measurementType="dynamic" displayType="detail" displayName="Cache Size"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+
+ <metric property="passivatedCount" measurementType="dynamic" displayType="detail" displayName="Passivated Count"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+
+ <metric property="totalSize" measurementType="dynamic" displayType="detail" displayName="Total Size"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+'>
+
+<!ENTITY ejb3MessageDrivenBeanMetrics '
+ <metric property="minPoolSize" measurementType="dynamic" displayType="detail" displayName="Minimum Pool Size"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+
+ <metric property="maxPoolSize" measurementType="dynamic" displayType="detail" displayName="Maximum Pool Size"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+
+ <metric property="maxMessages" measurementType="dynamic" displayType="detail" displayName="Maximum number of Messages"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+'>
+
+<!ENTITY ejb2PoolMetrics '
+ <metric property="CurrentPoolSize" displayName="Current Pool Size" displayType="summary" measurementType="dynamic"
+ description="The number of beans in the pool."/>
+
+ <metric property="MaxPoolSize" displayName="Max Pool Size" displayType="summary" measurementType="dynamic"
+ description="The maximum pool size."/>
+'>
+
+<!ENTITY ejb2CreateRemoveMetrics '
+ <metric property="CreateCount" displayName="Create Count" displayType="summary" measurementType="trendsup"
+ description="The number of instances of this EJB2 Session Bean that have been created. since server start."/>
+
+ <metric property="RemoveCount" displayName="Remove Count" displayType="summary" measurementType="trendsup"
+ description="The number of instances of this EJB2 Session Bean that have been removed since server start."/>
+'>
+
+<!ENTITY ejb2SessionBeanMetrics '
+ <!-- default interval == 600000 ms == 10 min -->
+ <metric property="methodInvocationTime" dataType="calltime" units="milliseconds"
+ defaultOn="false" defaultInterval="600000" destinationType="Method Name"
+ description="The minimum, maximum, and average invocation times for each of the methods exposed by this EJB"/>
+'>
+
+<!ENTITY ejbInvocationStatsOperation '
+ <operation name="viewInvocationStats" displayName="View Method Statistics" description="Display detailed method invocation statistics.">
+ <results>
+ <c:list-property name="methods">
+ <c:map-property name="method">
+ <c:simple-property name="methodName" displayName="Method Name" />
+ <c:simple-property name="count" displayName="Count" description="The number of times this method has been called."/>
+ <c:simple-property name="totalTime" displayName="Total Time" description="The total time spent executing this method."/>
+ <c:simple-property name="minTime" displayName="Min Invocation Time" description="The fastest execution of this method."/>
+ <c:simple-property name="maxTime" displayName="Max Invocation Time" description="The slowest execution of this method."/>
+ </c:map-property>
+ </c:list-property>
+ </results>
+ </operation>
+'>
+
+<!ENTITY ejb2StatelessSessionBeanDefinition '
+ <plugin-configuration>
+ <c:simple-property name="componentType" default="EJB" readOnly="true"/>
+ <c:simple-property name="componentSubtype" default="StatelessSession" readOnly="true"/>
+ <c:simple-property name="componentName" readOnly="true"/>
+ <c:simple-property name="invocationStatsPropertyName" default="DetypedInvocationStatistics" readOnly="true"/>
+ </plugin-configuration>
+'>
+
+<!ENTITY ejb2StatelessSessionBeanMetrics '
+ <!-- no additional metrics apart from the common ones are defined for the SLSBs -->
+'>
+
+<!ENTITY ejb2StatefulSessionBeanDefinition '
+ <plugin-configuration>
+ <c:simple-property name="componentType" default="EJB" readOnly="true"/>
+ <c:simple-property name="componentSubtype" default="StatefulSession" readOnly="true"/>
+ <c:simple-property name="componentName" readOnly="true"/>
+ <c:simple-property name="invocationStatsPropertyName" default="DetypedInvocationStatistics" readOnly="true"/>
+ </plugin-configuration>
+'>
+
+<!ENTITY ejb2StatefulSessionBeanMetrics '
+ <metric displayName="Passive Beans"
+ description="The count of beans in the passivated state"
+ property="PassivatedCount"
+ displayType="summary"/>
+'>
+
+<!ENTITY ejb2MessageDrivenBeanDefinition '
+ <plugin-configuration>
+ <c:simple-property name="componentType" default="EJB" readOnly="true"/>
+ <c:simple-property name="componentSubtype" default="MDB" readOnly="true"/>
+ <c:simple-property name="componentName" readOnly="true"/>
+ </plugin-configuration>
+'>
+
+<!ENTITY ejb2MessageDrivenBeanMetrics '
+ <metric property="MessageCount" displayName="Message Count"
+ description="The number of messages sent/received"
+ displayType="summary"
+ measurementType="trendsup" />
+'>
+
+<!ENTITY ejb2EntityBeanDefinition '
+ <plugin-configuration>
+ <c:simple-property name="componentType" default="EJB" readOnly="true"/>
+ <c:simple-property name="componentSubtype" default="Entity" readOnly="true"/>
+ <c:simple-property name="componentName" readOnly="true"/>
+ </plugin-configuration>
+'>
+
+<!ENTITY ejb2EntityBeanMetrics '
+ <metric property="CacheSize"
+ displayName="Cache Size"
+ displayType="summary"
+ defaultOn="true"/>
+'>
+
+<!ENTITY subscriptionsResultProperty '
+ <c:list-property name="result">
+ <c:map-property name="subscription">
+ <c:simple-property name="id" summary="true"
+ description="the unique ID of the subscription"/>
+ <c:simple-property name="clientID"
+ description="the subscriber-specified client ID"/>
+ <c:simple-property name="name"
+ description="the topic name"/>
+ <c:simple-property name="selector" required="false"
+ description="the selector, if the subscriber specified one"/>
+ <c:simple-property name="durable" type="boolean" summary="true"
+ description="is the subscription durable?"/>
+ <c:simple-property name="maxSize" type="integer"/>
+ <c:simple-property name="messageCount" type="integer" summary="true"
+ description="the number of messages the subscription has received"/>
+ </c:map-property>
+ </c:list-property>
+'>
+
+]>
+
+<!--############################################# END OF XML ENTITIES ###############################################-->
+
+
+
+<plugin name="JBossAS5" displayName="JBoss Application Server 5.x" package="org.rhq.plugins.jbossas5"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ description="Supports management and monitoring of JBoss AS from version EAP 5"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+
+ <depends plugin="JMX" useClasses="true"/>
+
+ <server name="JBossAS Server"
+ classLoader="instance"
+ class="ApplicationServerComponent"
+ discovery="ApplicationServerDiscoveryComponent"
+ description="JBoss Application Server (AS) or Enterprise Application Platform (EAP) 5.x">
+
+ <subcategories>
+ <subcategory name="Resources"
+ description="Different types of Resources">
+ <subcategory name="Datasources"
+ description="Different types of Datasources"/>
+ <subcategory name="Connection Factories"
+ description="Different types of Connection Factories"/>
+ <subcategory name="JMS Destinations"
+ description="Different types of JMS Destinations"/>
+ </subcategory>
+ <subcategory name="Applications"
+ description="Different types of Applications (WARs, EARs, etc.)">
+ </subcategory>
+ </subcategories>
+
+ <plugin-configuration>
+ <c:group name="connectionInfo">
+ <c:simple-property name="namingURL" displayName="Naming Provider URL"
+ description="The JBoss Naming Provider (JNP) URL with which to connect to the JBoss AS or EAP instance (e.g. jnp://127.0.0.1:1099)."/>
+ <c:simple-property name="principal" required="false" description="The name of the principal (i.e. user) to authenticate."/>
+ <c:simple-property name="credentials" type="password" required="false"
+ description="The credentials (i.e. password) that should be used to authenticate the principal."/>
+ <c:simple-property name="homeDir" displayName="JBoss Home Directory" type="directory" readOnly="true"
+ description="The absolute path to the directory where JBoss AS or EAP is installed (e.g. /opt/jboss-5.1.0.GA)."/>
+ <c:simple-property name="serverHomeDir" type="directory" readOnly="true"
+ description="The path to the configuration directory under which this instance
+ operates (e.g. /opt/jboss-5.2.0.GA/server/default); if the path is not absolute,
+ then it will be resolved relative to {homeDir}."/>
+ <c:simple-property name="serverName" required="false"
+ description="The name of the server configuration (e.g. minimal, default, or all);
+ if not specified, it will default to the last path component of {serverHomeDir}."
+ default="default"/>
+ </c:group>
+ <c:group name="control" displayName="Operations">
+ <c:simple-property name="scriptPrefix" displayName="Script Prefix" type="string" required="false"
+ description="A prefix applied to script execution commands. Typically a sudo
+ for applicable platforms. The prefix is applied verbatim. As such, a
+ sudo user must be configured appropriately. Ignored if not set."/>
+ <c:simple-property name="startScript" displayName="Start Script" type="file" required="false"
+ description="The path to the script used by the 'Start' operation
+ to start this JBossAS server
+ (e.g. /opt/jboss-5.2.0.GA/bin/run.sh); if the path is not absolute,
+ then it will be resolved relative to {jbossHomeDir};
+ defaults to 'bin/run.sh' on UNIX or 'bin\run.bat' on Windows."/>
+ <c:simple-property name="shutdownScript" displayName="Shutdown Script" type="file" required="false"
+ description="The path to the script used by the Shut Down operation
+ to shut down this JBossAS server
+ (e.g. /opt/jboss-5.2.0.GA/bin/shutdown.sh); if the path is not absolute,
+ then it will be resolved relative to {jbossHomeDir};
+ defaults to 'bin/shutdown.sh' on UNIX or 'bin\shutdown.bat' on Windows."/>
+ <c:simple-property name="shutdownMethod" displayName="Shutdown Method" type="string" required="false" default="JMX"
+ description="The method used to execute the Shut Down operation;
+ defaults to 'JMX MBean'.">
+ <c:property-options>
+ <c:option value="JMX" name="JMX MBean" default="true"/>
+ <c:option value="SCRIPT" name="shutdown script"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="bindAddress" displayName="Bind Address" required="false" default="127.0.0.1"
+ description="The host or IP address that all application server services should listen on
+ (e.g. 10.11.14.233 or foo.example.com); specify 0.0.0.0 to tell the
+ application server to bind to all available network interfaces; defaults to
+ '127.0.0.1'."/>
+ </c:group>
+
+ <c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
+ <c:simple-property name="shutdownMBeanName" displayName="Shutdown MBean Name"
+ default="jboss.system:type=Server"
+ description="Name of the MBean to use when shutting down this server through JMX."/>
+ <c:simple-property name="shutdownMBeanOperation" displayName="Shutdown MBean Operation" default="shutdown"
+ description="Name of the operation to invoke when shutting down this server through JMX.
+ Note that only operations with no parameter or with one int parameter are supported. If the
+ operation requires an int parameter, '0' will be supplied."/>
+ <c:simple-property name="availabilityCheckPeriod" description="The amount of time, in seconds, that must elapse between availability checks to see if the server is up. If set, the availability checks will be performed asynchronously thus allowing slow-responding servers to avoid being falsely reported as down."
+ units="seconds" required="false" type="integer">
+ <c:constraint>
+ <c:integer-constraint minimum="60"/>
+ </c:constraint>
+ </c:simple-property>
+ </c:group>
+
+ <c:group name="events">
+ <c:list-property name="logEventSources">
+ <c:map-property name="logEventSource">
+ <c:simple-property name="logFilePath" type="file" summary="true"
+ description="The absolute path to the source log file."/>
+ <c:simple-property name="enabled" type="boolean" summary="true"
+ description="A flag indicating whether of not this log Event source is currently
+ enabled (i.e. whether the associated log file should be tailed for
+ new entries)."/>
+ <c:simple-property name="dateFormat" required="false"
+ description="The date format to use when parsing the dates in log entries. The
+ format must be in the syntax defined by the Java SimpleDateFormat
+ class. If not specified, the three date formats that are predefined
+ by Log4J (ISO8601, DATE, and ABSOLUTE) will be tried."/>
+ <c:simple-property name="includesPattern" required="false"
+ description="A regular expression against which a log entry's detail is matched
+ to determine if an Event should be fired for that entry. If not
+ specified, no filtering of log entries will be done based on their
+ detail."/>
+ <c:simple-property name="minimumSeverity" required="false" default="error"
+ description="The minimum severity of Events that should be collected for this
+ source. If not specified, there is no minimum severity (i.e. all
+ events will be collected).">
+ <c:property-options>
+ <c:option name="debug" value="debug"/>
+ <c:option name="info" value="info"/>
+ <c:option name="warn" value="warn"/>
+ <c:option name="error" value="error" default="true"/>
+ <c:option name="fatal" value="fatal"/>
+ </c:property-options>
+ </c:simple-property>
+ </c:map-property>
+ </c:list-property>
+ </c:group>
+ </plugin-configuration>
+
+ <process-scan name="jbossas" query="process|basename|match=^java.*,arg|org.jboss.Main|match=.*"/>
+
+ <operation name="start" displayName="Start"
+ description="Start this application server. The script used is specified in the Operations group of connection properties. This operation will fail if the server is already started.">
+ <results><c:simple-property name="operationResult" description="Outcome of starting the server."/></results>
+ </operation>
+
+ <operation name="shutdown" displayName="Shut Down"
+ description="Shut down this application server via script or JMX, depending on the settings in the Operations and Advanced groups of connection properties. This operation will fail if the server is already shut down.">
+ <results><c:simple-property name="operationResult" description="Outcome of shutting down the server."/></results>
+ </operation>
+
+ <operation name="restart" displayName="Restart"
+ description="Shut down (if started) and then start this application server.">
+ <results><c:simple-property name="operationResult" description="Outcome of restarting the server."/></results>
+ </operation>
+
+ <metric displayName="Partition Name" property="MCBean|ServerConfig|*|partitionName"
+ dataType="trait" displayType="summary"
+ description="the name of the cluster partition this server belongs to"/>
+
+ <metric displayName="Server Name" property="MCBean|ServerConfig|*|serverName"
+ dataType="trait" displayType="summary"
+ description="the name of the active profile (i.e. configuration set) this server is using"/>
+
+ <metric displayName="Server Home Dir" property="MCBean|ServerConfig|*|serverHomeDir"
+ dataType="trait" displayType="summary"
+ description="the full path of the configuration set directory this server is using (e.g. /opt/jboss-5.1.0.CR1/server/default)"/>
+
+ <metric displayName="Home Dir" property="MCBean|ServerConfig|*|serverHomeDir"
+ dataType="trait" displayType="summary"
+ description="the full path of the JBoss AS installation directory this server is using (e.g. /opt/jboss-5.1.0.CR1)"/>
+
+ <metric displayName="Version Name" property="MCBean|MCServer|*|versionName"
+ dataType="trait" displayType="summary"
+ description="the code name for the this app server instance's major version (AS 5.0 = Morpheus, AS 5.1 = The Oracle, AS 6.0 = Neo)"/>
+
+ <metric displayName="Build Date" property="MCBean|MCServer|*|buildDate"
+ dataType="trait" displayType="summary"
+ description="the date this app server was built"/>
+
+ <metric displayName="Start Date" property="MCBean|MCServer|*|startDate"
+ dataType="trait" displayType="summary"
+ description="the date and time this app server instance was started"/>
+
+ <metric displayName="Active Thread Count" property="MCBean|ServerInfo|*|activeThreadCount"
+ description="The current number of active threads for this app server instance"
+ defaultInterval="300000" displayType="summary" category="throughput"/>
+
+ <metric displayName="Active Thread Group Count" property="MCBean|ServerInfo|*|activeThreadGroupCount"
+ description="The current number of active thread groups for this app server instance"
+ defaultInterval="300000" defaultOn="true" category="throughput"/>
+
+ <metric displayName="JVM Free Memory" property="MCBean|ServerInfo|*|freeMemory" displayType="summary"
+ description="The amount of free memory for the JVM this app server instance is running on"
+ defaultInterval="300000" defaultOn="true" category="utilization" units="bytes"/>
+
+ <metric displayName="JVM Max Memory" property="MCBean|ServerInfo|*|maxMemory"
+ description="The amount of max memory for the JVM this app server instance is running on"
+ defaultInterval="1800000" defaultOn="true" category="utilization" units="bytes"/>
+
+ <metric displayName="JVM Total Memory" property="MCBean|ServerInfo|*|totalMemory" displayType="summary"
+ description="The amount of total memory for the JVM this app server instance is running on"
+ defaultInterval="300000" defaultOn="true" category="utilization" units="bytes"/>
+
+ <metric displayName="Total Transactions" property="MCBean|JTA|*|transactionCount" measurementType="trendsup"
+ defaultInterval="300000" defaultOn="true" category="utilization"
+ description="Total number of transactions since last restart"/>
+
+ <metric displayName="Transactions Committed" property="MCBean|JTA|*|commitCount" displayType="summary" measurementType="trendsup"
+ defaultInterval="600000" defaultOn="true" category="utilization"
+ description="Number of transactions committed since last restart"/>
+
+ <metric displayName="Transactions Rolled Back" property="MCBean|JTA|*|rollbackCount" measurementType="trendsup"
+ defaultInterval="600000" defaultOn="true" category="utilization"
+ description="Number of transactions committed since last restart"/>
+
+ <event name="logEntry" description="an entry was appended to a log file"/>
+
+ <content name="library" displayName="JAR Library" category="deployable"
+ description="Library Jar files deployed in JBoss AS">
+ <configuration>
+ <c:simple-property name="version" readOnly="true" description="The version declared by the JAR's manifest."/>
+ <c:simple-property name="title" readOnly="true" description="The title declared by the JAR's manifest."/>
+ <c:simple-property name="url" readOnly="true" description="The url declared by the JAR's manifest."/>
+ <c:simple-property name="vendor" readOnly="true" description="The vendor declared by the JAR's manifest."/>
+ <c:simple-property name="classpath" readOnly="true"
+ description="The classpath declared by the JAR's manifest."/>
+ <c:simple-property name="sealed" readOnly="true" type="boolean" description="True if the JAR is sealed."/>
+ </configuration>
+ </content>
+
+ <content name="cumulativePatch" displayName="Cumulative Patch" category="deployable"
+ description="Automatically installable application server patches">
+ <configuration>
+ <c:simple-property name="jiraId"/>
+ <c:simple-property name="distributionStatus"/>
+ <c:simple-property name="downloadUrl"/>
+ <c:simple-property name="instructionCompatibilityVersion"/>
+ </configuration>
+ </content>
+
+ <server name="JBoss AS JVM"
+ description="JVM of the JBossAS"
+ sourcePlugin="JMX"
+ sourceType="JMX Server"
+ discovery="org.rhq.plugins.jmx.EmbeddedJMXServerDiscoveryComponent"
+ class="org.rhq.plugins.jmx.JMXServerComponent"
+ singleton="true"/>
+
+ <service name="JBoss Web"
+ description="JBoss Web Servlet Container"
+ subCategory="Resources"
+ discovery="JBossWebDiscoveryComponent"
+ class="JBossWebComponent"
+ singleton="true">
+
+ <service name="Connector"
+ description="a JBoss Web Connector"
+ discovery="ConnectorDiscoveryComponent"
+ class="ConnectorComponent">
+
+ <plugin-configuration>
+ <c:simple-property name="protocol" type="string" description="this connector's protocol (e.g. jk, ajp, http)" default="http"/>
+ <c:simple-property name="address" type="string" description="the IP address this connector listens on" readOnly="true"/>
+ <c:simple-property name="port" type="integer" description="the port this connector listens on" readOnly="true"/>
+ <c:group name="advanced">
+ <c:simple-property name="componentType" default="MBean" readOnly="true"/>
+ <c:simple-property name="componentSubtype" default="WebRequestProcessor" readOnly="true"/>
+ <c:simple-property name="componentName" readOnly="true"/>
+ </c:group>
+ </plugin-configuration>
+
+ <metric property="maxTime"
+ displayName="Maximum Request Time"
+ description="the maximum time it took to process a request since the last restart"
+ units="milliseconds"
+ defaultOn="true" category="performance"/>
+
+ <metric property="requestCount"
+ displayName="Request Count" description="the total number of requests processed since the last restart"
+ defaultOn="false" category="utilization" measurementType="trendsup"/>
+
+ <metric property="errorCount"
+ displayName="Error Count" description="the number of errors while processing requests since the last restart"
+ defaultOn="true" category="utilization" measurementType="trendsup"/>
+
+ <metric property="ThreadPool|currentThreadsBusy"
+ displayName="Current Active Threads"
+ defaultOn="true" category="utilization" displayType="summary"
+ description="the number of threads for this connector that are currently active"/>
+
+ <metric property="ThreadPool|currentThreadCount"
+ displayName="Current Thread Count"
+ defaultOn="true" category="utilization" displayType="summary"
+ description="the number of threads for this connector that currently exist"/>
+
+ </service>
+
+ <service name="Virtual Host"
+ discovery="VirtualHostDiscoveryComponent"
+ class="VirtualHostComponent"
+ description="a JBoss Web virtual host">
+
+ <plugin-configuration>
+ <c:simple-property name="name" type="string" description="the virtual host's name (e.g. localhost)"/>
+ <c:group name="advanced">
+ <c:simple-property name="componentType" default="MBean" readOnly="true"/>
+ <c:simple-property name="componentSubtype" default="WebHost" readOnly="true"/>
+ <c:simple-property name="componentName" readOnly="true"/>
+ </c:group>
+ </plugin-configuration>
+
+ <metric property="aliases"
+ description="the aliases for this virtual host, if any"
+ dataType="trait" displayType="summary"/>
+ </service>
+
+ </service>
+
+
+ <!-- =================================== ManagedComponent Resource types =================================== -->
+
+ <service name="No Tx Datasource"
+ class="ManagedComponentComponent"
+ discovery="ManagedComponentDiscoveryComponent"
+ createDeletePolicy="both"
+ subCategory="Datasources"
+ description="No Transaction Datasources deployed in the instance of JBoss AS">
+
+ <plugin-configuration>
+ <c:simple-property name="componentType" default="DataSource" readOnly="true"/>
+ <c:simple-property name="componentSubtype" default="NoTx" readOnly="true"/>
+ <c:simple-property name="componentName" readOnly="true"/>
+ <c:simple-property name="templateName" default="NoTxDataSourceTemplate" readOnly="true"/>
+ <c:simple-property name="componentNameProperty" default="jndi-name" readOnly="true">
+ <c:description>
+ The name of the Resource configuration property whose value should be used as the
+ ManagedComponent name when creating a new Resource of this type.
+ </c:description>
+ </c:simple-property>
+ </plugin-configuration>
+
+ &datasourceAndConnectionFactoryOperations;
+
+ &managedObjectMetrics;
+ &datasourceMetrics;
+
+ <resource-configuration>
+
+ <!-- For ManagedProperty annotations, see:
+ https://anonsvn.jboss.org/repos/jbossas/trunk/connector/src/main/org/jbos... -->
+
+ <c:group name="connection" displayName="Connection Information">
+ &datasourceConnectionResourceConfigProps;
+ &datasourceAndConnectionFactoryConnectionResourceConfigProps;
+ &nonXaDatasourceConnectionResourceConfigProps;
+ </c:group>
+
+ <c:group name="advanced" displayName="Advanced">
+ &datasourceAndConnectionFactoryAdvancedResourceConfigProps;
+ &datasourceAdvancedResourceConfigProps;
+ </c:group>
+
+ <c:template name="Oracle No TX" description="No Transaction Datasource for Oracle">
+ &nonXaDatasourceOracleTemplateProps;
+ </c:template>
+
+ </resource-configuration>
+
+ </service>
+
+ <service name="Local Tx Datasource"
+ class="ManagedComponentComponent"
+ discovery="ManagedComponentDiscoveryComponent"
+ createDeletePolicy="both"
+ subCategory="Datasources"
+ description="Local Transaction Datasources deployed in the instance of JBoss AS">
+
+ <plugin-configuration>
+ <c:simple-property name="componentType" default="DataSource" readOnly="true"/>
+ <c:simple-property name="componentSubtype" default="LocalTx" readOnly="true"/>
+ <c:simple-property name="componentName" readOnly="true"/>
+ <c:simple-property name="templateName" default="LocalTxDataSourceTemplate" readOnly="true"/>
+ <c:simple-property name="componentNameProperty" default="jndi-name" readOnly="true">
+ <c:description>
+ The name of the Resource configuration property whose value should be used as the
+ underlying ManagedComponent name when creating a new Resource of this type.
+ </c:description>
+ </c:simple-property>
+ </plugin-configuration>
+
+ &datasourceAndConnectionFactoryOperations;
+
+ &managedObjectMetrics;
+ &datasourceMetrics;
+
+ <resource-configuration>
+
+ <!-- For ManagedProperty annotations, see:
+ https://anonsvn.jboss.org/repos/jbossas/trunk/connector/src/main/org/jbos... -->
+
+ <c:group name="connection" displayName="Connection Information">
+ &datasourceConnectionResourceConfigProps;
+ &datasourceAndConnectionFactoryConnectionResourceConfigProps;
+ &nonXaDatasourceConnectionResourceConfigProps;
+ </c:group>
+
+ <c:group name="advanced" displayName="Advanced">
+ &datasourceAndConnectionFactoryAdvancedResourceConfigProps;
+ &datasourceAdvancedResourceConfigProps;
+ </c:group>
+
+ <c:template name="Oracle Local TX" description="Local Transaction Datasource for Oracle">
+ &nonXaDatasourceOracleTemplateProps;
+ <c:simple-property name="track-connection-by-tx" default="true"/>
+ </c:template>
+
+ </resource-configuration>
+
+ </service>
+
+ <service name="XA Datasource"
+ class="ManagedComponentComponent"
+ discovery="ManagedComponentDiscoveryComponent"
+ createDeletePolicy="both"
+ subCategory="Datasources"
+ description="XA Datasources deployed in the instance of JBoss AS">
+
+ <plugin-configuration>
+ <c:simple-property name="componentType" default="DataSource" readOnly="true"/>
+ <c:simple-property name="componentSubtype" default="XA" readOnly="true"/>
+ <c:simple-property name="componentName" readOnly="true"/>
+ <c:simple-property name="templateName" default="XADataSourceTemplate" readOnly="true"/>
+ <c:simple-property name="componentNameProperty" default="jndi-name" readOnly="true">
+ <c:description>
+ The name of the Resource configuration property whose value should be used as the
+ underlying ManagedComponent name when creating a new Resource of this type.
+ </c:description>
+ </c:simple-property>
+ </plugin-configuration>
+
+ &datasourceAndConnectionFactoryOperations;
+
+ &managedObjectMetrics;
+ &datasourceMetrics;
+
+ <resource-configuration>
+
+ <!-- For ManagedProperty annotations, see:
+ https://anonsvn.jboss.org/repos/jbossas/trunk/connector/src/main/org/jbos... -->
+ <c:group name="connection" displayName="Connection Information">
+
+ &datasourceConnectionResourceConfigProps;
+ &datasourceAndConnectionFactoryConnectionResourceConfigProps;
+
+ <c:simple-property name="xa-datasource-class"
+ displayName="XA DataSource Class"
+ description="The fully qualified name of the javax.sql.XADataSource implementation class."
+ activationPolicy="immediate"/>
+
+ <c:map-property name="xa-datasource-properties" displayName="XA Datasource Properties" required="true">
+ <c:description>
+ The properties to assign to the XADataSource implementation class.
+ Each property is mapped
+ onto the XADataSource implementation by looking for a JavaBeans style
+ getter method for the property name. If found, the value of the property is
+ set using the JavaBeans setter with the element text translated to the true
+ property type using the java.beans.PropertyEditor for the type.
+ </c:description>
+ </c:map-property>
+
+ <c:simple-property name="xa-resource-timeout"
+ displayName="XA Resource Timeout"
+ required="false"
+ type="integer"
+ activationPolicy="immediate">
+ <c:description>
+ XA transaction timeout, in seconds (passed to XAResource.setTransactionTimeout()) -
+ default is zero which does not invoke the setter.
+ </c:description>
+ </c:simple-property>
+
+ <c:simple-property name="url-property"
+ displayName="URL Property"
+ required="false"
+ description="For HA XA datasources, specifies the name of an XADataSource property that contains a list of URLs."
+ activationPolicy="immediate"/>
+ </c:group>
+
+ <c:group name="advanced" displayName="Advanced">
+ &datasourceAndConnectionFactoryAdvancedResourceConfigProps;
+ &datasourceAdvancedResourceConfigProps;
+
+ <c:simple-property name="interleaving" type="boolean" required="false" defaultValue="false">
+ <c:description>
+ If true, enable transaction interleaving if the DB vendor supports it (most do not).
+ This property supersedes the "track-connection-by-tx" property from earlier versions of
+ JBoss AS. The default is false.
+ </c:description>
+ </c:simple-property>
+ </c:group>
+
+ <c:template name="Oracle XA" description="XA Transaction Datasource for Oracle">
+ <c:simple-property name="track-connection-by-tx" default="true"/>
+ <c:simple-property name="isSameRM-override-value" default="false"/>
+ <c:simple-property name="xa-datasource-class" default="oracle.jdbc.xa.client.OracleXADataSource"/>
+ <c:simple-property name="exception-sorter-class-name"
+ default="org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter"/>
+ <!-- Oracle's XA datasource cannot reuse a connection outside a transaction once enlisted in a
+ global transaction and vice-versa. -->
+ <c:simple-property name="no-tx-separate-pools" default="true"/>
+ <c:simple-property name="use-try-lock" default="60000"/>
+ <c:map-property name="metadata">
+ <c:simple-property name="typeMapping" default="Oracle9i"/>
+ </c:map-property>
+ <c:simple-property name="type-mapping" default="Oracle9i"/>
+ </c:template>
+
+ </resource-configuration>
+
+ </service>
+
+ <service name="No Tx ConnectionFactory"
+ description="A ConnectionFactory that does not take part in JTA transactions."
+ class="ManagedComponentComponent"
+ createDeletePolicy="both"
+ subCategory="Connection Factories"
+ discovery="ManagedComponentDiscoveryComponent">
+
+ <plugin-configuration>
+ <c:simple-property name="componentType" default="ConnectionFactory" readOnly="true"/>
+ <c:simple-property name="componentSubtype" default="NoTx" readOnly="true"/>
+ <c:simple-property name="componentName" readOnly="true"/>
+ <c:simple-property name="templateName" default="NoTxConnectionFactoryTemplate" readOnly="true"/>
+ <c:simple-property name="componentNameProperty" default="jndi-name" readOnly="true">
+ <c:description>
+ The name of the Resource configuration property whose value should be used as the
+ underlying ManagedComponent name when creating a new Resource of this type.
+ </c:description>
+ </c:simple-property>
+ <c:group name="managedPropertyGroup"
+ displayName="managedPropertyGroup"
+ hiddenByDefault="true">
+ <c:map-property name="customProperties"
+ description="Maps a list of custom property names to the the fully qualified class names of the org.rhq.plugins.jbossas5.adapter.api.PropertyAdapter implementations that should be used for those properties.">
+ <c:simple-property name="config-property"
+ default="org.rhq.plugins.jbossas5.adapter.impl.configuration.custom.ConnectionFactoryConfigPropertyAdapter" />
+ </c:map-property>
+ </c:group>
+ </plugin-configuration>
+
+ &datasourceAndConnectionFactoryOperations;
+
+ &managedObjectMetrics;
+ &connectionFactoryMetrics;
+
+ <resource-configuration>
+
+ <c:group name="connection" displayName="Connection Information">
+ &connectionFactoryConnectionResourceConfigProps;
+ &datasourceAndConnectionFactoryConnectionResourceConfigProps;
+ </c:group>
+
+ <c:group name="advanced" displayName="Advanced">
+ &datasourceAndConnectionFactoryAdvancedResourceConfigProps;
+ &connectionFactoryAdvancedResourceConfigProps;
+ </c:group>
+ </resource-configuration>
+
+ </service>
+
+ <service name="Tx ConnectionFactory"
+ description="A ConnectionFactory that takes part in JTA transactions."
+ class="TxConnectionFactoryComponent"
+ createDeletePolicy="both"
+ subCategory="Connection Factories"
+ discovery="ManagedComponentDiscoveryComponent">
+
+ <plugin-configuration>
+ <c:simple-property name="componentType" default="ConnectionFactory" readOnly="true"/>
+ <c:simple-property name="componentSubtype" default="Tx" readOnly="true"/>
+ <c:simple-property name="componentName" readOnly="true"/>
+ <c:simple-property name="templateName" default="TxConnectionFactoryTemplate" readOnly="true"/>
+ <c:simple-property name="componentNameProperty" default="jndi-name" readOnly="true">
+ <c:description>
+ The name of the Resource configuration property whose value should be used as the
+ underlying ManagedComponent name when creating a new Resource of this type.
+ </c:description>
+ </c:simple-property>
+ <c:group name="managedPropertyGroup"
+ displayName="managedPropertyGroup"
+ hiddenByDefault="true">
+ <c:map-property name="customProperties"
+ description="Maps a list of custom property names to the the fully qualified class names of the org.rhq.plugins.jbossas5.adapter.api.PropertyAdapter implementations that should be used for those properties.">
+ <c:simple-property name="config-property"
+ default="org.rhq.plugins.jbossas5.adapter.impl.configuration.custom.ConnectionFactoryConfigPropertyAdapter" />
+ </c:map-property>
+ </c:group>
+ </plugin-configuration>
+
+ &datasourceAndConnectionFactoryOperations;
+
+ <metric property="custom.transactionType" displayName="Transaction Type" displayType="summary"
+ description="The type of transactions used by this connection factory - Local or XA"
+ defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+
+ &managedObjectMetrics;
+ &connectionFactoryMetrics;
+
+ <resource-configuration>
+
+ <c:group name="connection" displayName="Connection Information">
+
+ &connectionFactoryConnectionResourceConfigProps;
+ &datasourceAndConnectionFactoryConnectionResourceConfigProps;
+
+ <c:simple-property name="xa-transaction"
+ type="boolean"
+ displayName="XA Transaction"
+ required="false" readOnly="true">
+ <c:description>
+ Whether on not to use XA transactions. The default is No.
+ </c:description>
+ </c:simple-property>
+
+ </c:group>
+
+ <c:group name="advanced" displayName="Advanced">
+
+ &datasourceAndConnectionFactoryAdvancedResourceConfigProps;
+ &connectionFactoryAdvancedResourceConfigProps;
+
+ <c:simple-property name="interleaving" type="boolean" required="false" defaultValue="false">
+ <c:description>
+ If true, enable transaction interleaving if the DB vendor supports it (most do not).
+ Can only be set to true if XA transactions are enabled.
+ This property supersedes the "track-connection-by-tx" property from earlier versions of
+ JBoss AS. The default is false.
+ </c:description>
+ </c:simple-property>
+
+ <c:simple-property name="xa-resource-timeout"
+ type="integer"
+ displayName="XA Resource Timeout"
+ units="minutes"
+ defaultValue="0"
+ required="false">
+ <c:description>
+ The maximum time, in minutes, an XA Resource can be idle before it is removed. 0 means no
+ timeout. The default is 0.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="0"/>
+ </c:constraint>
+ </c:simple-property>
+
+ </c:group>
+
+ <c:template name="Local Transaction" description="a connection factory that uses local transactions">
+ <c:simple-property name="xa-transaction" default="false"/>
+ </c:template>
+
+ <c:template name="XA Transaction" description="a connection factory that uses XA transactions">
+ <c:simple-property name="xa-transaction" default="true"/>
+ </c:template>
+ </resource-configuration>
+
+ </service>
+
+ <service name="Queue"
+ class="JmsDestinationComponent"
+ createDeletePolicy="both"
+ subCategory="JMS Destinations"
+ discovery="JmsDestinationDiscoveryComponent">
+
+ <plugin-configuration>
+ <c:simple-property name="componentType" default="JMSDestination" readOnly="true"/>
+ <c:simple-property name="componentSubtype" default="Queue" readOnly="true"/>
+ <c:simple-property name="componentName" readOnly="true"/>
+ <c:simple-property name="templateName" default="QueueTemplate" readOnly="true"/>
+ <c:simple-property name="componentNameProperty" default="JNDIName" readOnly="true">
+ <c:description>
+ The name of the Resource configuration property whose value should be used as the
+ underlying ManagedComponent name when creating a new Resource of this type.
+ </c:description>
+ </c:simple-property>
+ <c:group name="managedPropertyGroup" displayName="managedPropertyGroup" hiddenByDefault="true">
+ <c:simple-property name="jms-type" default="queue"/>
+ <c:map-property name="customProperties"
+ description="Maps a list of custom property names to the the fully qualified class names of the org.rhq.plugins.jbossas5.adapter.api.PropertyAdapter implementations that should be used for those properties.">
+ <c:simple-property name="securityConfig"
+ default="org.rhq.plugins.jbossas5.adapter.impl.configuration.custom.JMSSecurityConfigAdapter"/>
+ </c:map-property>
+ </c:group>
+ </plugin-configuration>
+
+ &destinationOperations;
+
+ <operation name="listAllMessages" displayName="List All Messages" description="List all messages for the specified selector">
+ <parameters>
+ <c:simple-property required="false" name="arg#0" displayName="selector"/>
+ </parameters>
+ <results>
+ <c:notes>List all messages with selector</c:notes>
+ <c:list-property name="result">
+ <c:map-property required="false" name="element">
+ <c:simple-property required="false" name="JMSCorrelationID"/>
+ <c:simple-property required="false" name="JMSMessageID"/>
+ <c:simple-property type="long" required="false" name="JMSTimestamp"/>
+ </c:map-property>
+ </c:list-property>
+ </results>
+ </operation>
+
+ <operation name="listDurableMessages" displayName="List Durable Messages" description="List all durable messages for the specified selector">
+ <parameters>
+ <c:simple-property required="false" name="arg#0" displayName="selector"/>
+ </parameters>
+ <results>
+ <c:notes>List all durable messages using a selector</c:notes>
+ <c:list-property name="result">
+ <c:map-property required="false" name="element">
+ <c:simple-property required="false" name="JMSCorrelationID"/>
+ <c:simple-property required="false" name="JMSMessageID"/>
+ <c:simple-property type="long" required="false" name="JMSTimestamp"/>
+ </c:map-property>
+ </c:list-property>
+ </results>
+ </operation>
+
+ <operation name="listNonDurableMessages" displayName="List Non Durable Messages" description="List all non durable messages for the specified selector">
+ <parameters>
+ <c:simple-property required="false" name="arg#0" displayName="selector"/>
+ </parameters>
+ <results>
+ <c:notes>List all non durable messages using a selector</c:notes>
+ <c:list-property name="result">
+ <c:map-property required="false" name="element">
+ <c:simple-property required="false" name="JMSCorrelationID"/>
+ <c:simple-property required="false" name="JMSMessageID"/>
+ <c:simple-property type="long" required="false" name="JMSTimestamp"/>
+ </c:map-property>
+ </c:list-property>
+ </results>
+ </operation>
+
+ <operation name="listMessageCounterAsHTML" displayName="List Message Counter As HTML" description="Get the message counter as HTML">
+ <results>
+ <c:notes>Get the message counter as HTML</c:notes>
+ <c:simple-property name="result" type="longString"/>
+ </results>
+ </operation>
+
+ <operation name="listMessageCounterHistoryAsHTML" displayName="List Message Counter History As HTML" description="Get the message counter history as HTML">
+ <results>
+ <c:notes>Get the message counter history as HTML</c:notes>
+ <c:simple-property name="result" type="longString"/>
+ </results>
+ </operation>
+
+ <operation name="resetMessageCounter" displayName="Reset Message Counter" description="Reset the message counter"/>
+
+ <operation name="resetMessageCounterHistory" displayName="Reset Message Counter History" description="Reset the message counter history"/>
+
+ &managedObjectMetrics;
+
+ <!-- Traits -->
+
+ <metric property="createdProgrammatically" displayType="summary"
+ defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"
+ description="Was this queue created programmatically? If Yes, the queue will not survive a restart of the application server. If No, the queue was created via a deployment XML file."/>
+
+ <!-- NOTE: We have to make this a trait rather than a resource config prop due to a bug in JBMESSAGING
+ (see https://jira.jboss.org/jira/browse/JBAS-6721). -->
+ <metric property="messageCounterHistoryDayLimit"
+ defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"
+ description="This queue's message counter history day limit - <0: unlimited, =0: history disabled, >0: maximum day count"/>
+
+ <!-- Numerics -->
+
+ <metric property="consumerCount" measurementType="dynamic" displayType="summary" displayName="Consumer Count"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
+ description="The number of consumers on the queue"/>
+
+ <metric property="deliveringCount" measurementType="dynamic" displayType="detail" displayName="Delivering Count"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
+ description="The number of messages currently being delivered"/>
+
+ <metric property="messageCount" measurementType="dynamic" displayType="summary" displayName="Message Count"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
+ description="The number of messages in the queue"/>
+
+ <metric property="scheduledMessageCount" measurementType="dynamic" displayType="detail" displayName="Scheduled Message Count"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
+ description="The number of scheduled messages in the queue"/>
+
+ <metric property="messageStatistics.count" measurementType="dynamic" displayType="detail" displayName="Count"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization"
+ description="The total message count since startup or last counter reset"/>
+
+ <metric property="messageStatistics.countDelta" measurementType="dynamic" displayType="detail" displayName="Count Delta"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization"
+ description="The message count delta since last method call"/>
+
+ <metric property="messageStatistics.depth" measurementType="dynamic" displayType="detail" displayName="Depth"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization"
+ description="The current message count of pending messages within the queue waiting for dispatch"/>
+
+ <metric property="messageStatistics.depthDelta" measurementType="dynamic" displayType="detail" displayName="Depth Delta"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization"
+ description="The message count delta of pending messages since last method call"/>
+
+ <metric property="messageStatistics.timeLastUpdate" measurementType="dynamic" displayType="detail" displayName="Time Last Update"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization"
+ description="The timestamp of the last message add"/>
+
+ <resource-configuration>
+
+ <!-- See: https://anonsvn.jboss.org/repos/jbossas/trunk/messaging/src/main/org/jbos... -->
+
+ <c:simple-property required="true" name="name" readOnly="true"
+ description="The name of this queue (e.g. 'MyQueue')."/>
+
+ <c:simple-property required="true" name="JNDIName" readOnly="true"
+ description="This queue's JNDI name (e.g. '/queue/MyQueue')."/>
+
+ <c:simple-property type="boolean" required="false" name="clustered" readOnly="true" defaultValue="false">
+ <c:description>
+ Is this queue clustered? For an existing queue, this property is read-only. If not specified
+ when creating a new queue, the default value is false.
+ </c:description>
+ </c:simple-property>
+
+ <c:simple-property type="integer" required="false" name="downCacheSize" defaultValue="2000">
+ <c:description>
+ When paging messages to storage from a subscription, they first go into a "Down Cache" before
+ being written to storage. This enables the write to occur as a single operation, thus aiding
+ performance. This setting determines the maximum number of messages that the Down Cache will hold
+ before they are flushed to storage.
+ Updates to this property will not go into effect until the queue has been restarted.
+ The default value is 2000.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="1"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:simple-property type="integer" required="false" name="fullSize" defaultValue="200000">
+ <c:description>
+ The maximum number of messages for the queue held in memory at any one time.
+ The actual queue can hold many more messages than this, but these are paged to and from
+ storage as necessary, as messages are added or consumed.
+ Updates to this property will not go into effect until the queue has been restarted.
+ The default value is 200000.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="1"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:simple-property type="integer" required="false" name="maxDeliveryAttempts" defaultValue="-1">
+ <c:description>
+ The number of delivery attempts before a message to a subscriber of this queue is moved to the
+ DLQ. The default value is 10. A value of -1 indicates the default value should be used.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="-1"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:simple-property type="integer" required="false" name="maxSize" defaultValue="-1">
+ <c:description>
+ The maximum number of messages this queue can hold before they are dropped.
+ A value of -1 means there is no maximum. The default value is -1.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="-1"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:simple-property type="integer" required="false" name="pageSize" defaultValue="2000">
+ <c:description>
+ When loading messages from a subscription, this is the maximum number of messages to
+ pre-load in one operation. Must be less than Full Size and greater than or equal to Down Cache Size.
+ Updates to this property will not go into effect until the queue has been restarted.
+ The default value is 2000.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="1"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:simple-property type="long" required="false" name="redeliveryDelay" units="milliseconds" defaultValue="-1">
+ <c:description>
+ The delay in milliseconds before a rolled back or recovered message is redelivered.
+ Set to 0 to disable redelivery. The default value is 0. A value of -1 indicates the default value should be used.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="-1"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:simple-property required="false" name="DLQ">
+ <c:description>
+ The JMX ObjectName of the dead letter queue (DLQ) for this queue (e.g.
+ "jboss.messaging.destination:service=Queue,name=PrivateDLQ") - overrides the default DLQ on the
+ server peer.
+ </c:description>
+ <c:constraint>
+ <c:regex-constraint expression="[^:]+:.+"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:simple-property required="false" name="expiryQueue">
+ <c:description>
+ The JMX ObjectName of the expiry queue for this queue (e.g.
+ "jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue") - overrides the default
+ expiry queue on the server peer.
+ </c:description>
+ <c:constraint>
+ <c:regex-constraint expression="[^:]+:.+"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:simple-property required="false" name="serverPeer">
+ <c:description>
+ The JMX ObjectName of the server peer this queue was deployed on (e.g.
+ "jboss.messaging:service=ServerPeer"). Updates to this property will not go into effect until
+ the queue has been restarted.
+ </c:description>
+ <c:constraint>
+ <c:regex-constraint expression="[^:]+:.+"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:list-property name="securityConfig" max="4" min="2"
+ displayName="Security Configurations"
+ description="This element specifies a XML fragment which describes the access control list to be used by the SecurityManager to authorize client operations against the destination. The content model is the same as for the SecurityManager SecurityConf attribute.">
+ <c:map-property name="role"
+ displayName="Security Configuration Attributes"
+ description="These are the attributes that define the role name, and if the role is allowed to read, write or create Messages on this Queue">
+ <c:simple-property name="name"
+ displayName="Name"
+ description="Name of the Security Role. e.g. Guest"
+ summary="true"
+ required="true"/>
+ <c:simple-property name="read"
+ displayName="Read"
+ description="Is this role allowed to read messages?"
+ summary="true"
+ required="false"
+ type="boolean"/>
+ <c:simple-property name="write"
+ displayName="Write"
+ description="Is this role allowed to write messages?"
+ summary="true"
+ required="false"
+ type="boolean"/>
+ <c:simple-property name="create"
+ displayName="Create"
+ description="Is this role allowed to create messages?"
+ summary="true"
+ required="false"
+ type="boolean"/>
+ </c:map-property>
+
+ </c:list-property>
+
+ </resource-configuration>
+
+ <help>
+ <![CDATA[
+ <p>The message counter metrics will not be collected by default. In order
+ for these metrics to be collected for all Topics and Queues for a given application server instance,
+ go to the instance's JMX Console, and invoke the
+ <tt>enableMessageCounters</tt> operation on the <tt>jboss.messaging:service=ServerPeer</tt> MBean.
+ To ensure the message counters are still enabled when the application server is restarted,
+ edit that instance's <tt>deploy/messaging/messaging-service.xml</tt> file and set the
+ <tt>EnableMessageCounters</tt> attribute to "true".</p>
+ ]]>
+ </help>
+
+ </service>
+
+ <service name="Topic"
+ class="JmsDestinationComponent"
+ createDeletePolicy="both"
+ subCategory="JMS Destinations"
+ discovery="JmsDestinationDiscoveryComponent">
+
+ <plugin-configuration>
+ <c:simple-property name="componentType" default="JMSDestination" readOnly="true"/>
+ <c:simple-property name="componentSubtype" default="Topic" readOnly="true"/>
+ <c:simple-property name="componentName" readOnly="true"/>
+ <c:simple-property name="templateName" default="TopicTemplate" readOnly="true"/>
+ <c:simple-property name="componentNameProperty" default="JNDIName" readOnly="true">
+ <c:description>
+ The name of the Resource configuration property whose value should be used as the
+ underlying ManagedComponent name when creating a new Resource of this type.
+ </c:description>
+ </c:simple-property>
+ <c:group name="managedPropertyGroup" displayName="managedPropertyGroup" hiddenByDefault="true">
+ <c:simple-property name="jms-type" default="topic"/>
+ <c:map-property name="customProperties"
+ description="Maps a list of custom property names to the the fully qualified class names of the org.rhq.plugins.jbossas5.adapter.api.PropertyAdapter implementations that should be used for those properties.">
+ <c:simple-property name="securityConfig"
+ default="org.rhq.plugins.jbossas5.adapter.impl.configuration.custom.JMSSecurityConfigAdapter"/>
+ </c:map-property>
+ </c:group>
+ </plugin-configuration>
+
+ &destinationOperations;
+
+ <operation name="listAllMessages" displayName="List All Messages" description="List all messages for the specified subscription with the specified selector">
+ <parameters>
+ <c:simple-property required="false" name="arg#0" displayName="subscriptionID"/>
+ <c:simple-property required="false" name="arg#1" displayName="selector"/>
+ </parameters>
+ <results>
+ <c:notes>List all messages for the specified subscription with the specified selector</c:notes>
+ <c:list-property name="result">
+ <c:map-property required="false" name="element">
+ <c:simple-property required="false" name="JMSCorrelationID"/>
+ <c:simple-property required="false" name="JMSMessageID"/>
+ <c:simple-property type="long" required="false" name="JMSTimestamp"/>
+ </c:map-property>
+ </c:list-property>
+ </results>
+ </operation>
+
+ <operation name="listDurableMessages" displayName="List Durable Messages" description="List all durable messages for the specified subscription with the specified selector">
+ <parameters>
+ <c:simple-property required="false" name="arg#0" displayName="subscriptionID"/>
+ <c:simple-property required="false" name="arg#1" displayName="selector"/>
+ </parameters>
+ <results>
+ <c:notes>List all durable messages for the specified subscription with the specified selector</c:notes>
+ <c:list-property name="result">
+ <c:map-property required="false" name="element">
+ <c:simple-property required="false" name="JMSCorrelationID"/>
+ <c:simple-property required="false" name="JMSMessageID"/>
+ <c:simple-property type="long" required="false" name="JMSTimestamp"/>
+ </c:map-property>
+ </c:list-property>
+ </results>
+ </operation>
+
+ <operation name="listNonDurableMessages" displayName="List Non Durable Messages" description="List all non durable messages for the specified subscription with the specified selector">
+ <parameters>
+ <c:simple-property required="false" name="arg#0" displayName="subscriptionID"/>
+ <c:simple-property required="false" name="arg#1" displayName="selector"/>
+ </parameters>
+ <results>
+ <c:notes>List all non durable messages for the specified subscription with the specified selector</c:notes>
+ <c:list-property name="result">
+ <c:map-property required="false" name="element">
+ <c:simple-property required="false" name="JMSCorrelationID"/>
+ <c:simple-property required="false" name="JMSMessageID"/>
+ <c:simple-property type="long" required="false" name="JMSTimestamp"/>
+ </c:map-property>
+ </c:list-property>
+ </results>
+ </operation>
+
+ <operation name="listAllSubscriptions" displayName="List All Subscriptions"
+ description="Return all subscriptions for the topic">
+ <results>
+ <c:notes>Return all subscriptions for the topic</c:notes>
+ &subscriptionsResultProperty;
+ </results>
+ </operation>
+
+ <operation name="listAllSubscriptionsAsHTML" displayName="List All Subscriptions As HTML"
+ description="Return all subscriptions for the topic as HTML">
+ <results>
+ <c:notes>Return all subscriptions for the topic as HTML</c:notes>
+ <c:simple-property name="result" type="longString"/>
+ </results>
+ </operation>
+
+ <operation name="listDurableSubscriptions" displayName="List Durable Subscriptions"
+ description="Return all durable subscriptions for the topic">
+ <results>
+ <c:notes>Return all durable subscriptions for the topic</c:notes>
+ &subscriptionsResultProperty;
+ </results>
+ </operation>
+
+ <operation name="listDurableSubscriptionsAsHTML" displayName="List Durable Subscriptions As HTML"
+ description="Return all durable subscriptions for the topic as HTML">
+ <results>
+ <c:notes>Return all durable subscriptions for the topic as HTML</c:notes>
+ <c:simple-property name="result" type="longString"/>
+ </results>
+ </operation>
+
+ <operation name="listNonDurableSubscriptions" displayName="List Non-Durable Subscriptions"
+ description="Return all non-durable subscriptions for the topic">
+ <results>
+ <c:notes>Return all non-durable subscriptions for the topic</c:notes>
+ &subscriptionsResultProperty;
+ </results>
+ </operation>
+
+ <operation name="listNonDurableSubscriptionsAsHTML" displayName="List Non-Durable Subscriptions As HTML"
+ description="Return all non-durable subscriptions for the topic as HTML">
+ <results>
+ <c:notes>Return all non-durable subscriptions for the topic as HTML</c:notes>
+ <c:simple-property name="result" type="longString"/>
+ </results>
+ </operation>
+
+ &managedObjectMetrics;
+
+ <!-- Traits -->
+
+ <metric property="createdProgrammatically" displayType="summary"
+ defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"
+ description="Was this topic created programmatically? If Yes, the topic will not survive a restart of the application server. If No, the topic was created via a deployment XML file."/>
+
+ <!-- NOTE: We have to make this a trait rather than a resource config prop due to a bug in JBMESSAGING
+ (see https://jira.jboss.org/jira/browse/JBAS-6721). -->
+ <metric property="messageCounterHistoryDayLimit"
+ defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"
+ description="This topic's message counter history day limit - <0: unlimited, =0: history disabled, >0: maximum day count"/>
+
+ <!-- Numerics -->
+
+ <metric property="allMessageCount" measurementType="dynamic" displayType="summary" displayName="All Message Count"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
+ description="The count of all messages in all subscriptions to this topic"/>
+
+ <metric property="allSubscriptionsCount" measurementType="dynamic" displayType="summary" displayName="All Subscriptions Count"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
+ description="The count of all subscriptions to this topic"/>
+
+ <metric property="durableMessageCount" measurementType="dynamic" displayType="detail" displayName="Durable Message Count"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
+ description="The count of all messages for all durable subscriptions to this topic"/>
+
+ <metric property="durableSubscriptionsCount" measurementType="dynamic" displayType="detail" displayName="Durable Subscriptions Count"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
+ description="The count of all durable subscriptions to this topic"/>
+
+ <metric property="nonDurableMessageCount" measurementType="dynamic" displayType="detail" displayName="Non Durable Message Count"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
+ description="The count of all messages in all non durable subscriptions to this topic"/>
+
+ <metric property="nonDurableSubscriptionsCount" measurementType="dynamic" displayType="detail" displayName="Non Durable Subscriptions Count"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
+ description="The count of all non durable subscriptions to this topic"/>
+
+ <resource-configuration>
+
+ <!-- See: https://anonsvn.jboss.org/repos/jbossas/trunk/messaging/src/main/org/jbos... -->
+
+ <c:simple-property required="true" name="name" readOnly="true"
+ description="The name of this topic (e.g. 'MyTopic')."/>
+
+ <c:simple-property required="true" name="JNDIName" readOnly="true"
+ description="This topic's JNDI name (e.g. '/topic/MyTopic')"/>
+
+ <c:simple-property type="boolean" required="false" name="clustered" readOnly="true" defaultValue="false">
+ <c:description>
+ Is this topic clustered? For an existing topic, this property is read-only. If not specified
+ when creating a new topic, the default value is false.
+ </c:description>
+ </c:simple-property>
+
+ <c:simple-property type="integer" required="false" name="downCacheSize" defaultValue="2000">
+ <c:description>
+ When paging messages to storage from a subscription, they first go into a "Down Cache" before
+ being written to storage. This enables the write to occur as a single operation, thus aiding
+ performance. This setting determines the maximum number of messages that the Down Cache will hold
+ before they are flushed to storage.
+ Updates to this property will not go into effect until the topic has been restarted.
+ The default value is 2000.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="1"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:simple-property type="integer" required="false" name="fullSize" defaultValue="200000">
+ <c:description>
+ The maximum number of messages held by the topic subscriptions in memory at any one time.
+ The actual subscription can hold many more messages than this, but these are paged to and from
+ storage as necessary, as messages are added or consumed.
+ Updates to this property will not go into effect until the topic has been restarted.
+ The default value is 200000.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="1"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:simple-property type="integer" required="false" name="maxDeliveryAttempts" defaultValue="-1">
+ <c:description>
+ The number of delivery attempts before a message to a subscriber of this topic is moved to the
+ DLQ. The default value is 10. A value of -1 indicates the default value should be used.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="-1"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:simple-property type="integer" required="false" name="maxSize" defaultValue="-1">
+ <c:description>
+ The maximum number of messages this topic can hold before they are dropped.
+ A value of -1 means there is no maximum. The default value is -1.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="-1"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:simple-property type="integer" required="false" name="pageSize" defaultValue="2000">
+ <c:description>
+ When loading messages from a subscription, this is the maximum number of messages to
+ pre-load in one operation. Must be less than Full Size and greater than or equal to Down Cache Size.
+ Updates to this property will not go into effect until the topic has been restarted.
+ The default value is 2000.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="1"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:simple-property type="long" required="false" name="redeliveryDelay" units="milliseconds" defaultValue="-1">
+ <c:description>
+ The delay in milliseconds before a rolled back or recovered message is redelivered.
+ Set to 0 to disable redelivery. The default value is 0. A value of -1 indicates the default value should be used.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="-1"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:simple-property required="false" name="DLQ">
+ <c:description>
+ The JMX ObjectName of the dead letter queue (DLQ) for this topic (e.g.
+ "jboss.messaging.destination:service=Queue,name=PrivateDLQ") - overrides the default DLQ on the
+ server peer.
+ </c:description>
+ <c:constraint>
+ <c:regex-constraint expression="[^:]+:.+"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:simple-property required="false" name="expiryQueue">
+ <c:description>
+ The JMX ObjectName of the expiry queue for this topic (e.g.
+ "jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue") - overrides the default
+ expiry queue on the server peer.
+ </c:description>
+ <c:constraint>
+ <c:regex-constraint expression="[^:]+:.+"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:simple-property required="false" name="serverPeer">
+ <c:description>
+ The JMX ObjectName of the server peer this topic was deployed on (e.g.
+ "jboss.messaging:service=ServerPeer"). Updates to this property will not go into effect until
+ the topic has been restarted.
+ </c:description>
+ <c:constraint>
+ <c:regex-constraint expression="[^:]+:.+"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:list-property name="securityConfig" max="4" min="2"
+ displayName="Security Configurations"
+ description="This element specifies a XML fragment which describes the access control list to be used by the SecurityManager to authorize client operations against the destination. The content model is the same as for the SecurityManager SecurityConf attribute.">
+ <c:map-property name="role"
+ displayName="Security Configuration Attributes"
+ description="These are the attributes that define the role name, and if the role is allowed to read, write or create Messages on this Queue">
+ <c:simple-property name="name"
+ displayName="Name"
+ description="Name of the Security Role. e.g. Guest"
+ summary="true"
+ required="true"/>
+ <c:simple-property name="read"
+ displayName="Read"
+ description="Is this role allowed to read messages?"
+ summary="true"
+ required="false"
+ type="boolean"/>
+ <c:simple-property name="write"
+ displayName="Write"
+ description="Is this role allowed to write messages?"
+ summary="true"
+ required="false"
+ type="boolean"/>
+ <c:simple-property name="create"
+ displayName="Create"
+ description="Is this role allowed to create messages?"
+ summary="true"
+ required="false"
+ type="boolean"/>
+ </c:map-property>
+ </c:list-property>
+
+ </resource-configuration>
+
+ <help>
+ <![CDATA[
+ <p>The message counter metrics will not be collected by default. In order
+ for these metrics to be collected for all Topics and Queues for a given application server instance,
+ go to the instance's JMX Console, and invoke the
+ <tt>enableMessageCounters</tt> operation on the <tt>jboss.messaging:service=ServerPeer</tt> MBean.
+ To ensure the message counters are still enabled when the application server is restarted,
+ edit that instance's <tt>deploy/messaging/messaging-service.xml</tt> file and set the
+ <tt>EnableMessageCounters</tt> attribute to "true".</p>
+ ]]>
+ </help>
+
+ </service>
+
+
+ <!-- =================================== ManagedDeployment Resource types ================================== -->
+
+ <service name="Enterprise Application (EAR)"
+ subCategory="Applications"
+ class="StandaloneManagedDeploymentComponent"
+ discovery="StandaloneManagedDeploymentDiscoveryComponent"
+ description="JEE enterprise application (EAR)"
+ createDeletePolicy="both"
+ creationDataType="content">
+
+ <plugin-configuration>
+ <c:group name="general" displayName="General">
+ <c:simple-property name="deploymentName" description="The name of this EAR" readOnly="true"/>
+ <c:simple-property name="filename" readOnly="true"/>
+ </c:group>
+ <c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
+ <c:simple-property name="extension" default="ear" readOnly="true"/>
+ <c:simple-property name="descriptionTemplate" default="Enterprise Application" readOnly="true"/>
+ <c:simple-property name="deploymentTypeName" default="JavaEEApplication" readOnly="true">
+ <c:description>
+ The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum
+ corresponding to this deployment's type.
+ </c:description>
+ </c:simple-property>
+ </c:group>
+ </plugin-configuration>
+
+ <operation name="start"
+ description="starts this EAR"/>
+
+ <operation name="stop"
+ description="stops this EAR"/>
+
+ <operation name="restart"
+ description="stops and then restarts this EAR"/>
+
+ <metric property="custom.path" displayName="Path"
+ dataType="trait" displayType="summary"
+ description="the absolute path of this EAR file or directory"/>
+
+ <metric property="custom.exploded" displayName="Exploded?"
+ dataType="trait" displayType="summary"
+ description="whether this EAR is deployed exploded (i.e. as a directory)"/>
+
+ <content name="file" displayName="EAR File" category="deployable" isCreationType="true">
+ &deploymentContentConfigProps;
+ </content>
+
+ </service>
+
+ <service name="Web Application (WAR)"
+ subCategory="Applications"
+ class="StandaloneManagedDeploymentComponent"
+ discovery="StandaloneManagedDeploymentDiscoveryComponent"
+ description="a standalone web application (WAR)"
+ createDeletePolicy="both"
+ creationDataType="content">
+
+ <plugin-configuration>
+ <c:group name="general" displayName="General">
+ <c:simple-property name="deploymentName" description="the name of this WAR" readOnly="true"/>
+ <c:simple-property name="filename" readOnly="true"/>
+ <c:simple-property name="contextPath" description="this WAR's context path (e.g. /admin-console)" readOnly="true"/>
+ </c:group>
+ <c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
+ <c:simple-property name="extension" default="war" readOnly="true"/>
+ <c:simple-property name="descriptionTemplate" default="a standalone web application (WAR)" readOnly="true"/>
+ <c:simple-property name="deploymentTypeName" default="JavaEEWebApplication" readOnly="true">
+ <c:description>
+ The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum
+ corresponding to this deployment's type.
+ </c:description>
+ </c:simple-property>
+ </c:group>
+ </plugin-configuration>
+
+ <operation name="start"
+ description="starts this WAR"/>
+
+ <operation name="stop"
+ description="stops this WAR"/>
+
+ <operation name="restart"
+ description="stops and then restarts this WAR"/>
+
+ <metric property="custom.path" displayName="Path"
+ dataType="trait" displayType="summary"
+ description="the absolute path of this WAR file or directory"/>
+
+ <metric property="custom.exploded" displayName="Exploded?"
+ dataType="trait" displayType="summary"
+ description="whether this WAR is deployed exploded (i.e. as a directory)"/>
+
+ &webApplicationMetrics;
+
+ <content name="file" displayName="WAR File" category="deployable" isCreationType="true">
+ &deploymentContentConfigProps;
+ </content>
+
+ <service name="Web Application Context"
+ class="WebApplicationContextComponent"
+ discovery="WebApplicationContextDiscoveryComponent"
+ description="a web application context">
+
+ <plugin-configuration>
+ <c:simple-property name="virtualHost" description="this WAR's virtual host (e.g. localhost)" readOnly="true"/>
+ <c:group name="advanced">
+ <c:simple-property name="componentType" default="MBean" readOnly="true"/>
+ <c:simple-property name="componentSubtype" default="WebApplicationManager" readOnly="true"/>
+ <c:simple-property name="componentName" readOnly="true"/>
+ </c:group>
+ <c:group name="ResponseTime">
+ <c:simple-property name="responseTimeLogFile" required="false"
+ description="the full path to the log file containing response-time stats for this webapp"/>
+ <c:simple-property name="responseTimeUrlExcludes" required="false"
+ description="a space-delimited list of regular expressions specifying URLs that should be excluded from response-time stats collection"/>
+ <c:simple-property name="responseTimeUrlTransforms" required="false"
+ description="a space-delimited list of Perl-style substitution expressions that should be applied to all URLs for which response-time stats are collected (e.g. |^/dept/finance/.*|/dept/finance/*|)"/>
+ </c:group>
+ </plugin-configuration>
+
+ &webApplicationContextMetrics;
+ </service>
+
+ </service>
+
+ <service name="Embedded Web Application (WAR)"
+ subCategory="Applications"
+ class="EmbeddedManagedDeploymentComponent"
+ discovery="EmbeddedManagedDeploymentDiscoveryComponent"
+ description="an embedded web application (WAR)">
+
+ <plugin-configuration>
+ <c:group name="general" displayName="General">
+ <c:simple-property name="deploymentName" description="the name of this WAR" readOnly="true"/>
+ <c:simple-property name="contextPath" description="this WAR's context path (e.g. /admin-console" readOnly="true"/>
+ </c:group>
+ <c:group name="ResponseTime">
+ <c:simple-property name="responseTimeLogFile" required="false"
+ description="the full path to the log file containing response-time stats for this webapp"/>
+ <c:simple-property name="responseTimeUrlExcludes" required="false"
+ description="a space-delimited list of regular expressions specifying URLs that should be excluded from response-time stats collection"/>
+ <c:simple-property name="responseTimeUrlTransforms" required="false"
+ description="a space-delimited list of Perl-style substitution expressions that should be applied to all URLs for which response-time stats are collected (e.g. |^/dept/finance/.*|/dept/finance/*|)"/>
+ </c:group>
+ <c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
+ <c:simple-property name="extension" default="war" readOnly="true"/>
+ <c:simple-property name="descriptionTemplate" default="an embedded web application (WAR)" readOnly="true"/>
+ <c:simple-property name="deploymentTypeName" default="JavaEEWebApplication" readOnly="true">
+ <c:description>
+ The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum
+ corresponding to this deployment's type.
+ </c:description>
+ </c:simple-property>
+ <c:simple-property name="embedded" default="JavaEEWebApplication" readOnly="true"/>
+ </c:group>
+ </plugin-configuration>
+
+ <metric property="custom.parent" displayName="Parent"
+ dataType="trait" displayType="summary"
+ description="the name of this WAR's parent deployment"/>
+
+ &webApplicationMetrics;
+
+ <service name="Embedded Web Application Context"
+ class="WebApplicationContextComponent"
+ discovery="WebApplicationContextDiscoveryComponent"
+ description="a web application context">
+
+ <plugin-configuration>
+ <c:simple-property name="virtualHost" description="this WAR's virtual host (e.g. localhost)" readOnly="true"/>
+ <c:group name="advanced">
+ <c:simple-property name="componentType" default="MBean" readOnly="true"/>
+ <c:simple-property name="componentSubtype" default="WebApplicationManager" readOnly="true"/>
+ <c:simple-property name="componentName" readOnly="true"/>
+ </c:group>
+ <c:group name="ResponseTime">
+ <c:simple-property name="responseTimeLogFile" required="false"
+ description="the full path to the log file containing response-time stats for this webapp"/>
+ <c:simple-property name="responseTimeUrlExcludes" required="false"
+ description="a space-delimited list of regular expressions specifying URLs that should be excluded from response-time stats collection"/>
+ <c:simple-property name="responseTimeUrlTransforms" required="false"
+ description="a space-delimited list of Perl-style substitution expressions that should be applied to all URLs for which response-time stats are collected (e.g. |^/dept/finance/.*|/dept/finance/*|)"/>
+ </c:group>
+ </plugin-configuration>
+
+ &webApplicationContextMetrics;
+ </service>
+
+ </service>
+
+ <service name="EJB2 JAR"
+ subCategory="Applications"
+ class="StandaloneManagedDeploymentComponent"
+ discovery="StandaloneManagedDeploymentDiscoveryComponent"
+ description="a standalone EJB 2.x application"
+ createDeletePolicy="both"
+ creationDataType="content">
+
+ <plugin-configuration>
+ <c:group name="general" displayName="General">
+ <c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/>
+ <c:simple-property name="filename" readOnly="true"/>
+ </c:group>
+ <c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
+ <c:simple-property name="extension" default="jar" readOnly="true"/>
+ <c:simple-property name="descriptionTemplate" default="a standalone EJB 2.x application" readOnly="true"/>
+ <c:simple-property name="deploymentTypeName" default="JavaEEEnterpriseBeans2x" readOnly="true">
+ <c:description>
+ The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum
+ corresponding to this deployment's type.
+ </c:description>
+ </c:simple-property>
+ </c:group>
+ </plugin-configuration>
+
+ <operation name="start"
+ description="starts this EJB JAR"/>
+
+ <operation name="stop"
+ description="stops this EJB JAR"/>
+
+ <operation name="restart"
+ description="stops and then restarts this EJB JAR"/>
+
+ <metric property="custom.path" displayName="Path"
+ dataType="trait" displayType="summary"
+ description="the absolute path of this EJB JAR file or directory"/>
+
+ <metric property="custom.exploded" displayName="Exploded?"
+ dataType="trait" displayType="summary"
+ description="whether this EJB JAR is deployed exploded (i.e. as a directory)"/>
+
+ <content name="file" displayName="EJB JAR File" category="deployable" isCreationType="true">
+ &deploymentContentConfigProps;
+ </content>
+
+ <service name="EJB2 Stateless Session Bean"
+ class="Ejb2BeanComponent"
+ discovery="Ejb2BeanDiscoveryComponent"
+ description="An EJB2 Stateless Session Bean">
+ &ejb2StatelessSessionBeanDefinition;
+ &ejbInvocationStatsOperation;
+ &ejb2CreateRemoveMetrics;
+ &ejb2PoolMetrics;
+ &ejb2SessionBeanMetrics;
+ &ejb2StatelessSessionBeanMetrics;
+
+ <metric property="methodInvocationTime" dataType="calltime" units="milliseconds"
+ defaultOn="false" defaultInterval="600000" destinationType="Method Name"
+ description="The minimum, maximum, and average invocation times for each of the methods exposed by this EJB"/>
+ </service>
+
+ <service name="EJB2 Stateful Session Bean"
+ class="Ejb2BeanComponent"
+ discovery="Ejb2BeanDiscoveryComponent"
+ description="An EJB2 Stateful Session Bean">
+ &ejb2StatefulSessionBeanDefinition;
+ &ejbInvocationStatsOperation;
+ &ejb2CreateRemoveMetrics;
+ &ejb2PoolMetrics;
+ &ejb2SessionBeanMetrics;
+ &ejb2StatefulSessionBeanMetrics;
+
+ <metric property="methodInvocationTime" dataType="calltime" units="milliseconds"
+ defaultOn="false" defaultInterval="600000" destinationType="Method Name"
+ description="The minimum, maximum, and average invocation times for each of the methods exposed by this EJB"/>
+ </service>
+
+ <service name="EJB2 Message-Driven Bean"
+ class="Ejb2BeanComponent"
+ discovery="Ejb2BeanDiscoveryComponent"
+ description="An EJB2 Message Driven Bean">
+ &ejb2MessageDrivenBeanDefinition;
+ &ejb2PoolMetrics;
+ &ejb2MessageDrivenBeanMetrics;
+ </service>
+
+ <service name="EJB2 Entity Bean"
+ class="Ejb2BeanComponent"
+ discovery="Ejb2BeanDiscoveryComponent"
+ description="An EJB2 Entity Bean">
+ &ejb2EntityBeanDefinition;
+ &ejb2CreateRemoveMetrics;
+ &ejb2PoolMetrics;
+ &ejb2EntityBeanMetrics;
+ </service>
+ </service>
+
+ <service name="Embedded EJB2 JAR"
+ subCategory="Applications"
+ class="EmbeddedManagedDeploymentComponent"
+ discovery="EmbeddedManagedDeploymentDiscoveryComponent"
+ description="an embedded EJB 2.x application">
+
+ <plugin-configuration>
+ <c:group name="general" displayName="General">
+ <c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/>
+ <c:simple-property name="filename" readOnly="true"/>
+ </c:group>
+ <c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
+ <c:simple-property name="extension" default="jar" readOnly="true"/>
+ <c:simple-property name="descriptionTemplate" default="an embedded EJB 2.x application" readOnly="true"/>
+ <c:simple-property name="deploymentTypeName" default="JavaEEEnterpriseBeans2x" readOnly="true">
+ <c:description>
+ The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum
+ corresponding to this deployment's type.
+ </c:description>
+ </c:simple-property>
+ </c:group>
+ </plugin-configuration>
+
+ <metric property="custom.parent" displayName="Parent"
+ dataType="trait" displayType="summary"
+ description="the name of this EJB JAR's parent deployment"/>
+
+ <service name="EJB2 Stateless Session Bean (Embedded)"
+ class="Ejb2BeanComponent"
+ discovery="Ejb2BeanDiscoveryComponent"
+ description="An EJB2 Stateless Session Bean">
+ &ejb2StatelessSessionBeanDefinition;
+ &ejbInvocationStatsOperation;
+ &ejb2CreateRemoveMetrics;
+ &ejb2PoolMetrics;
+ &ejb2SessionBeanMetrics;
+ &ejb2StatelessSessionBeanMetrics;
+ </service>
+
+ <service name="EJB2 Stateful Session Bean (Embedded)"
+ class="Ejb2BeanComponent"
+ discovery="Ejb2BeanDiscoveryComponent"
+ description="An EJB2 Stateful Session Bean">
+ &ejb2StatefulSessionBeanDefinition;
+ &ejbInvocationStatsOperation;
+ &ejb2CreateRemoveMetrics;
+ &ejb2PoolMetrics;
+ &ejb2SessionBeanMetrics;
+ &ejb2StatefulSessionBeanMetrics;
+ </service>
+
+ <service name="EJB2 Message-Driven Bean (Embedded)"
+ class="Ejb2BeanComponent"
+ discovery="Ejb2BeanDiscoveryComponent"
+ description="An EJB2 Message Driven Bean">
+ &ejb2MessageDrivenBeanDefinition;
+ &ejb2PoolMetrics;
+ &ejb2MessageDrivenBeanMetrics;
+ </service>
+
+ <service name="EJB2 Entity Bean (Embedded)"
+ class="Ejb2BeanComponent"
+ discovery="Ejb2BeanDiscoveryComponent"
+ description="An EJB2 Entity Bean">
+ &ejb2EntityBeanDefinition;
+ &ejb2CreateRemoveMetrics;
+ &ejb2PoolMetrics;
+ &ejb2EntityBeanMetrics;
+ </service>
+ </service>
+
+ <service name="EJB3 JAR"
+ subCategory="Applications"
+ class="StandaloneManagedDeploymentComponent"
+ discovery="StandaloneManagedDeploymentDiscoveryComponent"
+ description="a standalone EJB 3.x application"
+ createDeletePolicy="both"
+ creationDataType="content">
+
+ <plugin-configuration>
+ <c:group name="general" displayName="General">
+ <c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/>
+ <c:simple-property name="filename" readOnly="true"/>
+ </c:group>
+ <c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
+ <c:simple-property name="extension" default="jar" readOnly="true"/>
+ <c:simple-property name="descriptionTemplate" default="a standalone EJB 3.x application" readOnly="true"/>
+ <c:simple-property name="deploymentTypeName" default="JavaEEEnterpriseBeans3x" readOnly="true">
+ <c:description>
+ The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum
+ corresponding to this deployment's type.
+ </c:description>
+ </c:simple-property>
+ </c:group>
+ </plugin-configuration>
+
+ <operation name="start"
+ description="starts this EJB JAR"/>
+
+ <operation name="stop"
+ description="stops this EJB JAR"/>
+
+ <operation name="restart"
+ description="stops and then restarts this EJB JAR"/>
+
+ <metric property="custom.path" displayName="Path"
+ dataType="trait" displayType="summary"
+ description="the absolute path of this EJB JAR file or directory"/>
+
+ <metric property="custom.exploded" displayName="Exploded?"
+ dataType="trait" displayType="summary"
+ description="whether this EJB JAR is deployed exploded (i.e. as a directory)"/>
+
+ <content name="file" displayName="EJB JAR File" category="deployable" isCreationType="true">
+ &deploymentContentConfigProps;
+ </content>
+
+ <service name="EJB3 Stateless Session Bean"
+ class="Ejb3BeanComponent"
+ discovery="Ejb3BeanDiscoveryComponent"
+ description="An EJB3 Stateless Session Bean (SLSB)">
+ &ejb3StatelessSessionBeanDefinition;
+ &ejbInvocationStatsOperation;
+ &ejb3CommonMetrics;
+ &ejb3SessionBeanMetrics;
+ </service>
+
+ <service name="EJB3 Stateful Session Bean"
+ class="Ejb3BeanComponent"
+ discovery="Ejb3BeanDiscoveryComponent"
+ description="An EJB3 Stateful Session Bean (SFSB)">
+ &ejb3StatefulSessionBeanDefinition;
+ &ejbInvocationStatsOperation;
+ &ejb3CommonMetrics;
+ &ejb3SessionBeanMetrics;
+ &ejb3StatefulSessionBeanMetrics;
+ </service>
+
+ <service name="EJB3 Message-Driven Bean"
+ class="Ejb3BeanComponent"
+ discovery="Ejb3BeanDiscoveryComponent"
+ description="An EJB3 Message-Driven Bean (MDB)">
+ &ejb3MessageDrivenBeanDefinition;
+ &ejbInvocationStatsOperation;
+ &ejb3CommonMetrics;
+ &ejb3MessageDrivenBeanMetrics;
+ </service>
+
+ </service>
+
+ <service name="Embedded EJB3 JAR"
+ subCategory="Applications"
+ class="EmbeddedManagedDeploymentComponent"
+ discovery="EmbeddedManagedDeploymentDiscoveryComponent"
+ description="an embedded EJB 3.x application">
+
+ <plugin-configuration>
+ <c:group name="general" displayName="General">
+ <c:simple-property name="deploymentName" description="the name of this EJB JAR" readOnly="true"/>
+ <c:simple-property name="filename" readOnly="true"/>
+ </c:group>
+ <c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
+ <c:simple-property name="extension" default="jar" readOnly="true"/>
+ <c:simple-property name="descriptionTemplate" default="an embedded EJB 3.x application" readOnly="true"/>
+ <c:simple-property name="deploymentTypeName" default="JavaEEEnterpriseBeans3x" readOnly="true">
+ <c:description>
+ The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum
+ corresponding to this deployment's type.
+ </c:description>
+ </c:simple-property>
+ </c:group>
+ </plugin-configuration>
+
+ <metric property="custom.parent" displayName="Parent"
+ dataType="trait" displayType="summary"
+ description="the name of this EJB JAR's parent deployment"/>
+
+ <service name="EJB3 Stateless Session Bean (Embedded)"
+ class="Ejb3BeanComponent"
+ discovery="Ejb3BeanDiscoveryComponent"
+ description="An EJB3 Stateless Session Bean (SLSB)">
+ &ejb3StatelessSessionBeanDefinition;
+ &ejbInvocationStatsOperation;
+ &ejb3CommonMetrics;
+ &ejb3SessionBeanMetrics;
+ </service>
+
+ <service name="EJB3 Stateful Session Bean (Embedded)"
+ class="Ejb3BeanComponent"
+ discovery="Ejb3BeanDiscoveryComponent"
+ description="An EJB3 Stateful Session Bean (SFSB)">
+ &ejb3StatefulSessionBeanDefinition;
+ &ejbInvocationStatsOperation;
+ &ejb3CommonMetrics;
+ &ejb3SessionBeanMetrics;
+ &ejb3StatefulSessionBeanMetrics;
+ </service>
+
+ <service name="EJB3 Message-Driven Bean (Embedded)"
+ class="Ejb3BeanComponent"
+ discovery="Ejb3BeanDiscoveryComponent"
+ description="An EJB3 Message-Driven Bean (MDB)">
+ &ejb3MessageDrivenBeanDefinition;
+ &ejbInvocationStatsOperation;
+ &ejb3CommonMetrics;
+ &ejb3MessageDrivenBeanMetrics;
+ </service>
+
+ </service>
+
+ <service name="Resource Adapter Archive (RAR)"
+ subCategory="Applications"
+ class="StandaloneManagedDeploymentComponent"
+ discovery="StandaloneManagedDeploymentDiscoveryComponent"
+ description="a standalone JCA resource adapter archive (RAR)"
+ createDeletePolicy="both"
+ creationDataType="content">
+
+ <plugin-configuration>
+ <c:group name="general" displayName="General">
+ <c:simple-property name="deploymentName" description="the name of this RAR" readOnly="true"/>
+ <c:simple-property name="filename" readOnly="true"/>
+ </c:group>
+ <c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
+ <c:simple-property name="extension" default="rar" readOnly="true"/>
+ <c:simple-property name="descriptionTemplate" default="a standalone resource adapter" readOnly="true"/>
+ <c:simple-property name="deploymentTypeName" default="JavaEEResourceAdaptor" readOnly="true">
+ <c:description>
+ The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum
+ corresponding to this deployment's type.
+ </c:description>
+ </c:simple-property>
+ </c:group>
+ </plugin-configuration>
+
+ <operation name="start"
+ description="starts this RAR"/>
+
+ <operation name="stop"
+ description="stops this RAR"/>
+
+ <operation name="restart"
+ description="stops and then restarts this RAR"/>
+
+ <metric property="custom.path" displayName="Path"
+ dataType="trait" displayType="summary"
+ description="the absolute path of this RAR file or directory"/>
+
+ <metric property="custom.exploded" displayName="Exploded?"
+ dataType="trait" displayType="summary"
+ description="whether this RAR is deployed exploded (i.e. as a directory)"/>
+
+ <content name="file" displayName="RAR File" category="deployable" isCreationType="true">
+ &deploymentContentConfigProps;
+ </content>
+
+ </service>
+
+ <service name="Embedded Resource Adapter Archive (RAR)"
+ subCategory="Applications"
+ class="EmbeddedManagedDeploymentComponent"
+ discovery="EmbeddedManagedDeploymentDiscoveryComponent"
+ description="an embedded JCA resource adapter archive (RAR)">
+
+ <plugin-configuration>
+ <c:group name="general" displayName="General">
+ <c:simple-property name="deploymentName" description="the name of this RAR" readOnly="true"/>
+ <c:simple-property name="filename" readOnly="true"/>
+ </c:group>
+ <c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
+ <c:simple-property name="extension" default="rar" readOnly="true"/>
+ <c:simple-property name="descriptionTemplate" default="an embedded resource adapter" readOnly="true"/>
+ <c:simple-property name="deploymentTypeName" default="JavaEEResourceAdaptor" readOnly="true">
+ <c:description>
+ The name of the item from the org.jboss.deployers.spi.management.KnownDeploymentTypes enum
+ corresponding to this deployment's type.
+ </c:description>
+ </c:simple-property>
+ </c:group>
+ </plugin-configuration>
+
+ <metric property="custom.parent" displayName="Parent"
+ dataType="trait" displayType="summary"
+ description="the name of this RAR's parent deployment"/>
+
+ </service>
+
+ <service name="Script"
+ discovery="org.rhq.plugins.jbossas5.script.ScriptDiscoveryComponent"
+ class="org.rhq.plugins.jbossas5.script.ScriptComponent"
+ supportsManualAdd="true"
+ subCategory="Resources"
+ description="provides the ability to execute a script that performs some task related to its parent JBossAS server">
+
+ <plugin-configuration>
+ <c:simple-property name="path" description="the absolute path to the script file"/>
+ <c:simple-property name="environmentVariables" type="longString" required="false"
+ description="the environment variables that will be passed to the script; each variable must
+ be on a new line and have the syntax name=value; the variable's value can contain properties
+ with the syntax %propertyName%; the script plugin will interpolate these with
+ the current values of the corresponding properties from the
+ script's parent JBossAS server's connection properties"/>
+ </plugin-configuration>
+
+ <operation name="execute" displayName="Execute Script"
+ description="execute the script; NOTE: environment variables to be
+ passed to the script can be configured via this Script
+ service's connection properties (under its Inventory tab)">
+ <parameters>
+ <c:simple-property name="commandLineArguments" type="longString" required="false"
+ description="the command-line arguments (if any) to pass to the script; each
+ command-line argument must be on a new line;
+ the arguments can contain properties
+ with the syntax %propertyName%; the script plugin will interpolate these with
+ the current values of the corresponding properties from the
+ script's parent JBossAS server's connection properties"/>
+ </parameters>
+ <results>
+ <c:simple-property name="exitCode" type="integer" description="the script's exit code (0 indicates success, any other value indicates failure)"/>
+ <c:simple-property name="output" type="longString" description="the script's output (stdout and stderr interleaved)"/>
+ </results>
+ </operation>
+
+ </service>
+
+ <service name="Service Binding Manager"
+ class="org.rhq.plugins.jbossas5.serviceBinding.ManagerComponent"
+ discovery="org.rhq.plugins.jbossas5.serviceBinding.ManagerDiscoveryComponent"
+ description="The Service Binding Manager manages the ports of the deployed services"
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="componentType" default="MCBean" readOnly="true"/>
+ <c:simple-property name="componentSubtype" default="ServiceBindingManager" readOnly="true"/>
+ <c:simple-property name="componentName" readOnly="true"/>
+ </plugin-configuration>
+
+ <metric property="activeBindingSetName" dataType="trait" displayName="Active Binding Set"
+ displayType="summary" description="The active binding set used to obtain port bindings from." />
+
+ <resource-configuration>
+ <c:simple-property name="activeBindingSetName"
+ activationPolicy="restart">
+ <c:description><![CDATA[
+The name of the binding set the Service Binding Manager should use when resolving bindings.
+Note to JBoss ON or Jopr users (does not apply to JBoss AS admin console):
+CHANGING THIS PROPERTY IS POTENTIALLY DANGEROUS because if there are any port conflicts
+on the machine the Application Server is running on, the server will not start up again and
+it will not be possible to monitor it.
+To be able to monitor the server again after the restart you have to update the "Naming Provider Url"
+in the "Connection" subtab in the "Inventory" of the Application Server to the value
+of "jboss:service=Naming:Port" binding of the active binding set.
+I.e. if the "jboss:service=Naming:Port" binding of the active binding set has the port set to 4099 and hostname to 127.0.0.1,
+you have to set the "Naming Provider Url" to jnp://127.0.0.1:4099.
+ ]]></c:description>
+ </c:simple-property>
+ <c:list-property name="standardBindings" description="The standard port bindings inherited by the binding sets.">
+ <c:map-property name="binding">
+ <c:simple-property name="serviceName" description="The name of the service to which this binding applies."/>
+ <c:simple-property name="bindingName" required="false" description="A qualifier identifying which particular binding within the service this is."/>
+ <c:simple-property name="port" type="integer" description="The port to use for the binding.">
+ <c:constraint>
+ <c:integer-constraint minimum="0"/>
+ <c:integer-constraint maximum="65535"/>
+ </c:constraint>
+ </c:simple-property>
+ <c:simple-property name="hostName" required="false" description="The host name or string notation IP address to use for the binding."/>
+ <c:simple-property name="description" required="false" description="Description of the binding."/>
+ <c:simple-property name="fullyQualifiedName" required="false" readOnly="true" description="The fully qualified binding name. This is an informational field only consisting of the service name and the binding name."/>
+ <c:simple-property name="fixedHostName" type="boolean" description="Whether the host name should remain fixed in all binding sets."/>
+ <c:simple-property name="fixedPort" type="boolean" description="Whether the port should remain fixed in all binding sets."/>
+ </c:map-property>
+ </c:list-property>
+ </resource-configuration>
+
+ <service name="Service Binding Set"
+ class="org.rhq.plugins.jbossas5.serviceBinding.SetComponent"
+ discovery="org.rhq.plugins.jbossas5.serviceBinding.SetDiscoveryComponent"
+ description="The Service Binding Set defines all bindings of a profile. It inherits the standard bindings from the Service Binding Manager and defines a port offset and overridden and additional bindings." createDeletePolicy="both">
+
+ <operation name="displayBindings" displayName="Display Bindings" description="Displays the full set of bindings as they would look if this bindings set was active.">
+ <results>
+ <c:list-property name="resultingBindings" readOnly="true" required="false" displayName="Resulting Bindings"
+ description="In this list you can review the resulting bindings of this binding set. This list includes the override bindings defined for this binding set and the standard bindings as they would look if this binding set was active (i.e. the port offset and default host name applied where appropriate).">
+ <c:map-property name="binding" readOnly="true">
+ <c:simple-property readOnly="true" name="serviceName" displayName="Service Name" description="The name of the service to which this binding applies."/>
+ <c:simple-property readOnly="true" name="bindingName" required="false" displayName="Binding Name" description="A qualifier identifying which particular binding within the service this is."/>
+ <c:simple-property readOnly="true" name="port" type="integer" displayName="Port" description="The port to use for the binding."/>
+ <c:simple-property readOnly="true" name="hostName" required="false" displayName="Host Name" description="The host name or string notation IP address to use for the binding."/>
+ <c:simple-property readOnly="true" name="description" required="false" displayName="Description" description="Description of the binding"/>
+ <c:simple-property readOnly="true" name="fullyQualifiedName" required="false" displayName="Fully Qualified Name" description="The fully qualified binding name. This is an informational field only consisting of the service name and the binding name."/>
+ </c:map-property>
+ </c:list-property>
+ </results>
+ </operation>
+
+ <metric property="name" displayName="Name" dataType="trait" displayType="summary" description="The name of this binding set."/>
+ <metric property="defaultHostName" dataType="trait" displayName="Default Host Name" displayType="summary" description="The default host name of this binding set." />
+ <metric property="portOffset" dataType="trait" displayName="Port Offset" displayType="summary" description="The port offset of this binding set."/>
+
+ <resource-configuration>
+ <c:simple-property name="name" readOnly="true" description="The name of this binding set."/>
+ <c:simple-property name="defaultHostName" description='The host name that should be used for all bindings whose configuration does not specify "fixed host name".'/>
+ <c:simple-property name="portOffset" type="integer" description="A value to add to the port configuration for a standard binding to derive the port to use in this binding set. This doesn't apply to standard bindings defined as 'fixed port'.">
+ <c:constraint>
+ <c:integer-constraint minimum="0"/>
+ <c:integer-constraint maximum="65535"/>
+ </c:constraint>
+ </c:simple-property>
+ <c:list-property name="overrideBindings" description='The binding configurations that apply only to this binding set, either non-standard bindings or ones that override standard binding configurations.
+ The binding set inherits the standard bindings from the Service Binding Manager, applies the port offset to them (unless the standard binding is defined as "fixed port"), and appends the override
+ bindings. These can either redefine a standard binding or define a brand new binding. The standard bindings and the override bindings then define the
+ full set of the bindings that are defined by the binding set.'>
+ <c:map-property name="binding">
+ <c:simple-property name="serviceName" displayName="Service Name" description="The name of the service to which this binding applies."/>
+ <c:simple-property name="bindingName" required="false" displayName="Binding Name" description="A qualifier identifying which particular binding within the service this is."/>
+ <c:simple-property name="port" type="integer" displayName="Port" description="The port to use for the binding.">
+ <c:constraint>
+ <c:integer-constraint minimum="0"/>
+ <c:integer-constraint maximum="65535"/>
+ </c:constraint>
+ </c:simple-property>
+ <c:simple-property name="hostName" required="false" displayName="Host Name" description="The host name or string notation IP address to use for the binding."/>
+ <c:simple-property name="description" required="false" displayName="Description" description="Description of the binding"/>
+ <c:simple-property name="fullyQualifiedName" required="false" readOnly="true" displayName="Fully Qualified Name" description="The fully qualified binding name. This is an informational field only consisting of the service name and the binding name."/>
+ </c:map-property>
+ </c:list-property>
+ </resource-configuration>
+ </service>
+ </service>
+
+ </server>
+
+</plugin>
14 years, 4 months
[rhq] Branch 'alertPlugin' - modules/core modules/enterprise
by jharris
modules/core/dbutils/pom.xml | 2
modules/core/dbutils/src/main/scripts/dbsetup/alert-schema.xml | 2
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 5 +
modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java | 2
modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotification.java | 23 ++++-
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/AlertNotificationsUIBean.java | 28 ++++++
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/notif/listAlertSender.xhtml | 45 +++++++---
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java | 9 --
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerLocal.java | 3
9 files changed, 98 insertions(+), 21 deletions(-)
New commits:
commit 97694dbe0007249b3e6c7e23fc68d77748ff39ef
Author: Justin Harris <jharris(a)redhat.com>
Date: Tue Jan 5 11:05:53 2010 -0500
Adding in ordering to alert notifications, as well as the ability to name each new notification when it is created.
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index c754814..a371f96 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -22,7 +22,7 @@
<properties>
<scm.module.path>modules/core/dbutils/</scm.module.path>
- <db.schema.version>2.70.2</db.schema.version>
+ <db.schema.version>2.70.3</db.schema.version>
</properties>
<dependencies>
diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/alert-schema.xml b/modules/core/dbutils/src/main/scripts/dbsetup/alert-schema.xml
index a13e2c6..5430cf0 100644
--- a/modules/core/dbutils/src/main/scripts/dbsetup/alert-schema.xml
+++ b/modules/core/dbutils/src/main/scripts/dbsetup/alert-schema.xml
@@ -131,6 +131,8 @@
<column name="SNMP_OID" size="250" type="VARCHAR2"/>
<column name="ALERT_CONFIG_ID" required="false" type="INTEGER" references="RHQ_CONFIG(ID)"/>
<column name="ALERT_SENDER_NAME" required="false" size="100" type="VARCHAR2" /> <!-- TODO make required = true -->
+ <column name="ALERT_ORDER" type="INTEGER" />
+ <column name="NAME" type="VARCHAR2" size="100" />
</table>
<table name="RHQ_ALERT_NOTIF_TEMPL" tablespace="@@@LARGE_TABLESPACE_FOR_DATA@@@"
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index 064dab9..2073231 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -2301,6 +2301,11 @@
</schema-directSQL>
</schemaSpec>
+ <schemaSpec version="2.70.3">
+ <schema-addColumn table="RHQ_ALERT_NOTIFICATION" column="ALERT_ORDER" columnType="INTEGER"/>
+ <schema-addColumn table="RHQ_ALERT_NOTIFICATION" column="NAME" columnType="VARCHAR2"/>
+ </schemaSpec>
+
</dbupgrade>
</target>
</project>
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java
index abda6bc..a7a5361 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java
@@ -352,7 +352,7 @@ public class AlertDefinition implements Serializable {
private Set<AlertCondition> conditions = new LinkedHashSet<AlertCondition>(1); // Most alerts will only have one condition.
@OneToMany(mappedBy = "alertDefinition", cascade = CascadeType.ALL)
- @OrderBy
+ @OrderBy("order asc")
@org.hibernate.annotations.Cascade(org.hibernate.annotations.CascadeType.DELETE_ORPHAN)
private List<AlertNotification> alertNotifications = new ArrayList<AlertNotification>();
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotification.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotification.java
index 7efa51b..87e5888 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotification.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotification.java
@@ -81,6 +81,12 @@ public class AlertNotification implements Serializable {
@Column(name = "ALERT_SENDER_NAME")
private String senderName;
+ @Column(name = "ALERT_ORDER")
+ private int order;
+
+ @Column(name = "NAME")
+ private String name;
+
protected AlertNotification() {
} // JPA spec
@@ -102,7 +108,6 @@ public class AlertNotification implements Serializable {
}
-
public int getId() {
return id;
}
@@ -147,4 +152,20 @@ public class AlertNotification implements Serializable {
public void setConfiguration(Configuration configuration) {
this.configuration = configuration;
}
+
+ public int getOrder() {
+ return order;
+ }
+
+ public void setOrder(int order) {
+ this.order = order;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
}
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/AlertNotificationsUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/AlertNotificationsUIBean.java
index ebaea47..747fbab 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/AlertNotificationsUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/AlertNotificationsUIBean.java
@@ -57,6 +57,7 @@ public class AlertNotificationsUIBean {
private Integer notificationId;
private List<AlertNotification> alertNotifications;
private Set<AlertNotification> selectedNotifications;
+ private String newAlertName;
private String selectedNewSender;
private AlertNotification activeNotification;
private ConfigurationDefinition activeConfigDefinition;
@@ -67,6 +68,10 @@ public class AlertNotificationsUIBean {
return alertNotifications;
}
+ public void setAlertNotifications(List<AlertNotification> alertNotifications) {
+ this.alertNotifications = alertNotifications;
+ }
+
public Set<AlertNotification> getSelectedNotifications() {
return selectedNotifications;
}
@@ -75,6 +80,14 @@ public class AlertNotificationsUIBean {
this.selectedNotifications = selectedNotifications;
}
+ public String getNewAlertName() {
+ return newAlertName;
+ }
+
+ public void setNewAlertName(String newAlertName) {
+ this.newAlertName = newAlertName;
+ }
+
public String getSelectedNewSender() {
return selectedNewSender;
}
@@ -164,7 +177,7 @@ public class AlertNotificationsUIBean {
newSenderConfig = new Configuration();
}
- this.activeNotification = this.alertNotificationManager.addAlertNotification(subject, alertDefinitionId, selectedNewSender, newSenderConfig);
+ this.activeNotification = this.alertNotificationManager.addAlertNotification(subject, alertDefinitionId, selectedNewSender, newAlertName, newSenderConfig);
return SUCCESS_OUTCOME;
}
@@ -186,6 +199,19 @@ public class AlertNotificationsUIBean {
return SUCCESS_OUTCOME;
}
+ public String saveOrder() {
+ int orderIndex = 0;
+
+ for (AlertNotification notification : this.alertNotifications) {
+ notification.setOrder(orderIndex++);
+
+ // TODO: Wait and persist these all in a single operation?
+ this.alertNotificationManager.updateAlertNotification(notification);
+ }
+
+ return SUCCESS_OUTCOME;
+ }
+
private List<Integer> getSelectedIds(Collection<AlertNotification> notifications) {
List<Integer> ids = new ArrayList<Integer>(notifications.size());
for (AlertNotification notification : notifications) {
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/notif/listAlertSender.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/notif/listAlertSender.xhtml
index e9a6e3c..b3288e3 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/notif/listAlertSender.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/notif/listAlertSender.xhtml
@@ -39,19 +39,18 @@
</h:outputLink>
<h:outputText> > </h:outputText>
<h:outputLink value="listAlertSender.xhtml">
- Alert Sender Definitions
+ Alert Notification Definitions
</h:outputLink>
</ui:define>
<ui:define name="body">
<br/>
- <h:messages showSummary="true"
- showDetail="true"
+ <h:messages showDetail="true"
+ globalOnly="true"
infoClass="InfoBlock"
warnClass="WarnBlock"
errorClass="ErrorBlock"
fatalClass="FatalBlock"
- globalOnly="true"
layout="table"
width="100%"/>
@@ -66,16 +65,16 @@
<input type="hidden" name="ad" value="${param.ad}"/>
<rich:orderingList value="#{alertNotificationsUIBean.alertNotifications}"
- var="alertSender"
+ var="alertNotification"
selection="#{alertNotificationsUIBean.selectedNotifications}"
activeItem="#{alertNotificationsUIBean.activeNotification}"
converter="#{alertNotificationsUIBean.notificationConverter}"
listWidth="250">
<rich:column>
<f:facet name="header">
- <h:outputText value="Alert Sender (Select to Edit)" />
+ <h:outputText value="Alert Notifications (Select to Edit)" />
</f:facet>
- <h:outputText value="#{alertSender.senderName}" />
+ <h:outputText value="#{alertNotification.name} (#{alertNotification.senderName})" />
</rich:column>
<a4j:support event="onclick"
@@ -88,6 +87,10 @@
requestDelay="150"
reRender="alertConfig,senderName"
oncomplete="updateCustomContent();" />
+ <a4j:support event="onorderchanged"
+ ignoreDupResponses="true"
+ requestDelay="250"
+ reRender="senderName" />
</rich:orderingList>
</h:form>
@@ -95,8 +98,13 @@
<input type="hidden" name="id" value="${param.id}"/>
<input type="hidden" name="ad" value="${param.ad}"/>
+ <h:commandButton id="saveAlertOrderButton"
+ value="Save Order"
+ action="#{alertNotificationsUIBean.saveOrder}"
+ styleClass="buttonmed"/>
+
<h:commandButton id="removeAlertButton"
- value="Remove Selected Alerts"
+ value="Remove Selected"
action="#{alertNotificationsUIBean.removeSelected}"
styleClass="buttonmed"/>
</h:form>
@@ -129,19 +137,36 @@
<rich:panel id="addAlertPanel">
<f:facet name="header">
- <h:outputText value="Add Alert Sender" />
+ <h:outputText value="Add Alert Notification" />
</f:facet>
<h:form id="newNotificationForm">
<input type="hidden" name="id" value="${param.id}"/>
<input type="hidden" name="ad" value="${param.ad}"/>
+ <h:outputLabel for="alertNameInput" value="Alert Notification Name:" />
+ <br />
+ <h:inputText id="alertNameInput"
+ value="#{alertNotificationsUIBean.newAlertName}"
+ maxlength="100"
+ required="true" />
+
+ <h:message for="alertNameInput"
+ infoClass="InfoBlock"
+ warnClass="WarnBlock"
+ errorClass="ErrorBlock"
+ fatalClass="FatalBlock" />
+ <br /><br />
+
+ <h:outputLabel for="senderList" value="Alert Sender Type:" />
+ <br />
<h:selectOneMenu id="senderList" value="#{alertNotificationsUIBean.selectedNewSender}">
<f:selectItems value="#{alertNotificationsUIBean.allAlertSenders}" />
</h:selectOneMenu>
+ <br /><br />
<h:commandButton id="addAlertButton"
- value="Add Alert Sender"
+ value="Add Alert Notification"
action="#{alertNotificationsUIBean.addAlertSender}"
styleClass="buttonmed">
</h:commandButton>
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java
index 9f4eb22..e769fc1 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java
@@ -499,13 +499,9 @@ public class AlertNotificationManagerBean implements AlertNotificationManagerLoc
}
/**
- * Add a new AlertNotification to the passed definition
- * @param user subject of the caller
- * @param alertDefinitionId Id of the alert definition
- * @param senderName shortName of the {@link AlertSender}
- * @param configuration Properties for this alert sender.
+ * {@inheritDoc}
*/
- public AlertNotification addAlertNotification(Subject user, int alertDefinitionId, String senderName, Configuration configuration) {
+ public AlertNotification addAlertNotification(Subject user, int alertDefinitionId, String senderName, String alertName, Configuration configuration) {
AlertDefinition definition = alertDefinitionManager.getAlertDefinition(user,alertDefinitionId);
if (definition==null) {
@@ -516,6 +512,7 @@ public class AlertNotificationManagerBean implements AlertNotificationManagerLoc
entityManager.persist(configuration);
AlertNotification notif = new AlertNotification(definition);
notif.setSenderName(senderName);
+ notif.setName(alertName);
notif.setConfiguration(configuration);
entityManager.persist(notif);
definition.getAlertNotifications().add(notif);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerLocal.java
index 20afccd..b4d8ae7 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerLocal.java
@@ -94,9 +94,10 @@ public interface AlertNotificationManagerLocal {
* @param user subject of the caller
* @param alertDefinitionId Id of the alert definition
* @param senderName shortName of the {@link AlertSender}
+ * @param alertName name of the new {@link AlertNotification}
* @param configuration Properties for this alert sender.
*/
- AlertNotification addAlertNotification(Subject user, int alertDefinitionId, String senderName, Configuration configuration);
+ AlertNotification addAlertNotification(Subject user, int alertDefinitionId, String senderName, String alertName, Configuration configuration);
/**
* Return notifications for a certain alertDefinitionId
14 years, 4 months
[rhq] Branch 'linux-config' - 5 commits - modules/plugins
by fdrabek
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java | 27 +-
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMap.java | 2
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMapIndex.java | 103 +++++++---
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectiveToSimple.java | 2
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasParamPerMap.java | 17 +
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/ApacheDirectiveRegExpression.java | 36 ++-
modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml | 80 ++++---
modules/plugins/augeas/src/main/java/org/rhq/augeas/AugeasProxy.java | 17 +
modules/plugins/augeas/src/main/java/org/rhq/augeas/util/LensFilter.java | 23 ++
modules/plugins/augeas/src/main/java/org/rhq/augeas/util/LensHelper.java | 66 ++++++
10 files changed, 277 insertions(+), 96 deletions(-)
New commits:
commit dc48b49ff75a9ed9d8db285351e1f2a04b42ae38
Merge: 2af4dd7... 8a7181e...
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Tue Jan 5 15:20:53 2010 +0100
Merge branch 'linux-config' of ssh://git.fedorahosted.org/git/rhq/rhq into linux-config
commit 2af4dd7d00b949b83125d00f3bcf85bfab284484
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Tue Jan 5 15:18:09 2010 +0100
use old lens loading, till LensHelper is finished
diff --git a/modules/plugins/augeas/src/main/java/org/rhq/augeas/AugeasProxy.java b/modules/plugins/augeas/src/main/java/org/rhq/augeas/AugeasProxy.java
index 1e37161..b713105 100644
--- a/modules/plugins/augeas/src/main/java/org/rhq/augeas/AugeasProxy.java
+++ b/modules/plugins/augeas/src/main/java/org/rhq/augeas/AugeasProxy.java
@@ -103,7 +103,7 @@ public class AugeasProxy {
modules.add(module.getModuletName());
- augeas.set("/augeas/load/" + module.getModuletName() + "/lens", LensHelper.getLensPath(module.getLensPath()));
+ augeas.set("/augeas/load/" + module.getModuletName() + "/lens", module.getLensPath());
int idx = 1;
for (String incl : module.getConfigFiles()) {
commit d1a226072fc8c8f037fa0b6675904c5406faa376
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Tue Jan 5 10:28:53 2010 +0100
regex fix
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java
index efcd382..7de23ac 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java
@@ -307,7 +307,7 @@ public class ApacheVirtualHostServiceComponent implements ResourceComponent<Apac
boolean updated = false;
for (AugeasNode node : nodes) {
- updated = false;
+ updated = false;
List<AugeasNode> serverNameNodes = tree.matchRelative(node, "ServerName/param");
String tempServerName = null;
@@ -315,11 +315,11 @@ public class ApacheVirtualHostServiceComponent implements ResourceComponent<Apac
tempServerName = serverNameNodes.get(0).getValue();
}
if (tempServerName == null & serverName == null)
- updated = true;
+ updated = true;
if (tempServerName != null & serverName != null)
- if (tempServerName.equals(serverName)){
- updated = true;
- }
+ if (tempServerName.equals(serverName)){
+ updated = true;
+ }
if (updated){
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMapIndex.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMapIndex.java
index 096a4f7..b6a3b35 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMapIndex.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMapIndex.java
@@ -34,6 +34,8 @@ import org.rhq.core.domain.configuration.definition.PropertyDefinition;
import org.rhq.core.domain.configuration.definition.PropertyDefinitionList;
import org.rhq.core.domain.configuration.definition.PropertyDefinitionMap;
import org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple;
+import org.rhq.core.domain.configuration.definition.PropertySimpleType;
+import org.rhq.plugins.apache.mapping.ApacheDirectiveRegExpression;
import org.rhq.plugins.apache.mapping.ConfigurationToAugeasApacheBase;
import org.rhq.rhqtransform.AugeasRhqException;
/**
@@ -90,32 +92,46 @@ public class MappingToAugeasDirectivePerMapIndex extends ConfigurationToAugeasAp
public void updateMap(PropertyDefinitionMap propDefMap, Property prop,
AugeasNode mapNode, int seq) throws AugeasRhqException {
- List<AugeasNode> nodes = mapNode.getChildByLabel("param");
PropertyMap propMap = (PropertyMap) prop;
- int nr = propMap.getMap().size()-1;
- int i=0;
+ String propertyName = prop.getName();
+ StringBuffer param= new StringBuffer();
- //THERE IS MORE NODES THAN CONFIGURATIONS
- if (nodes.size()>nr){
- for (i=0;i<nodes.size()-nr;i++){
- nodes.get(nr+i).remove(false);
+ for (PropertyDefinition propVal : propDefMap.getPropertyDefinitions().values()){
+
+ PropertySimple property = propMap.getSimple(propVal.getName());
+ if (property!=null){
+ if (!property.getName().equals("_index")){
+ String value = property.getStringValue();
+ if (value!=null)
+ param.append(" "+ value);
}
+ }
+ }
+
+ List<String> params = ApacheDirectiveRegExpression.createParams(param.toString(), propertyName);
+
+ List<AugeasNode> nodes = mapNode.getChildByLabel("param");
+
+ //THERE IS MORE CONFIGURATIONS THAN NODES, NEW NODES WILL BE CREATED
+ if (params.size()>nodes.size()){
+ for (int i=0;i<params.size()-nodes.size();i++){
+ tree.createNode(mapNode,"param",null,nodes.size()+i+1);
+ }
}
- //THERE IS LESS NODES THAN CONFIGURATIONS
- if (nodes.size()<nr){
- for (i=0;i<nr-nodes.size();i++){
- tree.createNode(mapNode,"param",null,nodes.size()+i+1);
- }
+
+ //THERE IS LESS CONFIGURATIONS THAN NODES, REDUDANT NODES WILL BE DELETED
+ if (params.size() < nodes.size()){
+ for (int i=0;i<nodes.size()-params.size();i++){
+ nodes.get(params.size()+i).remove(false);
+ }
}
-
- nodes = mapNode.getChildByLabel("param");
- i=0;
- for (Property property : propMap.getMap().values()){
- if (!property.getName().equals("_index"))
- {
- nodes.get(i).setValue(((PropertySimple)property).getStringValue());
- i=i+1;
- }
+
+ nodes = tree.matchRelative(mapNode, "param");
+
+ int i=0;
+ for (String value : params){
+ nodes.get(i).setValue(value);
+ i=i+1;
}
}
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasParamPerMap.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasParamPerMap.java
index 9bdbba4..4d77ae8 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasParamPerMap.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasParamPerMap.java
@@ -100,7 +100,7 @@ public class MappingToAugeasParamPerMap extends ConfigurationToAugeasApacheBase{
}
List<String> params = ApacheDirectiveRegExpression.createParams(param.toString(), propertyName);
updateNodeParams(nodes.get(i), params);
- param.delete(0, param.length()-1);
+ param = new StringBuffer();
i++;
}
}
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/ApacheDirectiveRegExpression.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/ApacheDirectiveRegExpression.java
index 44df2a7..3b09b54 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/ApacheDirectiveRegExpression.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/ApacheDirectiveRegExpression.java
@@ -61,7 +61,7 @@ public class ApacheDirectiveRegExpression {
MAPPING_TYPE.put("Allow", DirectiveMapping.PARAM_PER_MAP);
MAPPING_TYPE.put("Deny", DirectiveMapping.PARAM_PER_MAP);
MAPPING_TYPE.put("CustomLog", DirectiveMapping.DIRECTIVE_PER_MAP_INDEX);
- MAPPING_TYPE.put("AllowOverride", DirectiveMapping.DIRECTIVE_PER_MAP_INDEX);
+ MAPPING_TYPE.put("AllowOverride", DirectiveMapping.PARAM_PER_MAP);
MAPPING_TYPE.put("DirectoryIndex", DirectiveMapping.PARAM_PER_MAP);
MAPPING_TYPE.put("NameVirtualHost", DirectiveMapping.DIRECTIVE_PER_MAP_INDEX);
}
@@ -85,7 +85,7 @@ public class ApacheDirectiveRegExpression {
+ WORD + ")" + ")?" + WS) });
DIRECTIVE_REGEX.put("ErrorDocument", new Pattern[] { Pattern.compile(WS + "(" + NUM + ")" + WS_MAN + "(" + WORD
+ ")" + WS) });
- DIRECTIVE_REGEX.put("Options", new Pattern[] { Pattern.compile("([+-])?" + "(" + WORD + ")" + WS) });
+ DIRECTIVE_REGEX.put("Options", new Pattern[] {Pattern.compile(WS+"([+-]?)([a-zA-Z]+)") });
DIRECTIVE_REGEX.put("Allow", new Pattern[] { Pattern.compile("from"),
Pattern.compile("(?:" + WS_MAN + "(" + WORD + "))") });
DIRECTIVE_REGEX.put("Deny", new Pattern[] { Pattern.compile("from"),
@@ -94,15 +94,16 @@ public class ApacheDirectiveRegExpression {
.compile("(?:((?:\\[[a-zA-Z0-9:]+\\])|(?:[0-9\\.]+)):)?([0-9]+)(?:" + WS_MAN + "(" + WORD + "))?") });
DIRECTIVE_REGEX.put("ServerAlias", new Pattern[] { Pattern.compile(WS + "(" + WORD + ")") });
DIRECTIVE_REGEX.put("AllowOverride", new Pattern[] { Pattern
- .compile("(All)|(None)|(AuthConfig)|(FileInfo)|(Indexes)|(Limit)|(Options)") });
+ .compile(WS+"(All)|(None)|(AuthConfig)|(FileInfo)|(Indexes)|(Limit)|(Options)") });
DIRECTIVE_REGEX.put("DirectoryIndex", new Pattern[] { Pattern.compile(WS+ "(" + WORD + ")" + WS) });
+ DIRECTIVE_REGEX.put("NameVirtualHost", new Pattern[] { Pattern.compile(WS+ "(" + WORD + ")"+ WS) });
}
private static final Map<String, Pattern[]> DIRECTIVEREGEX_TO_AUGEAS;
static {
DIRECTIVEREGEX_TO_AUGEAS = new HashMap<String, Pattern[]>();
- DIRECTIVEREGEX_TO_AUGEAS.put("Options", new Pattern[] { Pattern.compile("([+-]?" + WORD + ")" + WS) });
+ DIRECTIVEREGEX_TO_AUGEAS.put("Options", new Pattern[] { Pattern.compile(WS+"([+-]?"+WS+"[a-zA-Z]+)"+WS) });
DIRECTIVEREGEX_TO_AUGEAS.put("Allow", new Pattern[] { Pattern.compile("(?:" + WS_MAN + "(" + WORD + "))") });
DIRECTIVEREGEX_TO_AUGEAS.put("Deny", new Pattern[] { Pattern.compile("(?:" + WS_MAN + "(" + WORD + "))") });
DIRECTIVEREGEX_TO_AUGEAS.put("ServerAlias", new Pattern[] { Pattern.compile(WS_MAN + "(" + WORD + ")") });
@@ -110,12 +111,13 @@ public class ApacheDirectiveRegExpression {
DIRECTIVEREGEX_TO_AUGEAS.put("Alias",
new Pattern[] { Pattern.compile(WS_MAN + "(" + WORD + ")" + WS_MAN + "(" + WORD + ")" + WS) });
DIRECTIVEREGEX_TO_AUGEAS.put("CustomLog", new Pattern[] { Pattern.compile(WS_MAN + "(" + WORD + ")" + "(?:" + WS_MAN + "("
- + WORD + ")" + ")?" + WS) });
+ + WORD + ")" + ")?") });
DIRECTIVEREGEX_TO_AUGEAS.put("AllowOverride", new Pattern[] { Pattern
.compile(WS+"(All)|(None)|(AuthConfig)|(FileInfo)|(Indexes)|(Limit)|(Options)") });
- DIRECTIVEREGEX_TO_AUGEAS.put("Listen", new Pattern[] { Pattern.compile(WS_MAN+ "(" + WORD + ")" + WS)});
+ DIRECTIVEREGEX_TO_AUGEAS.put("Listen", new Pattern[] { Pattern.compile(WS_MAN+ "(" + WORD + ")")});
+ DIRECTIVEREGEX_TO_AUGEAS.put("NameVirtualHost", new Pattern[] { Pattern.compile(WS+ "(" + WORD +")" + WS) });
DIRECTIVEREGEX_TO_AUGEAS.put("ErrorDocument", new Pattern[] { Pattern.compile(WS_MAN + "(" + NUM + ")" + WS_MAN + "(" + WORD
- + ")" + WS) });
+ + ")") });
}
/**
@@ -208,6 +210,15 @@ public class ApacheDirectiveRegExpression {
nodeParams.remove(1);
}
+ if (name.equals("Options")){
+ int i=0;
+ for (String param : nodeParams){
+ param = param.replaceAll(" ", "");
+ nodeParams.set(i, param);
+ i++;
+ }
+ }
+
return nodeParams;
}
diff --git a/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml
index 027a968..aaefeb0 100644
--- a/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml
@@ -274,23 +274,24 @@
default="/usr/share/augeas/lenses"/>
</c:group>
+
<c:group name="Virtual Hosts">
- <c:simple-property name="vhostCreationPolicy" displayName="Virtual Hosts Configuration Placement"
- description="How should the new virtual host definitions be put in the configuration"
- default="vhost-per-file">
- <c:property-options>
- <c:option value="single-file" name="In the main configuration file"/>
- <c:option value="vhost-per-file" name="Each Virtual Host in a standalone file" default="true"/>
- </c:property-options>
- </c:simple-property>
- <c:simple-property name="vhostFilesMask" displayName="Path To Contain Virtual Hosts Files">
- <c:description>
+ <c:simple-property name="vhostCreationPolicy" displayName="Virtual Hosts Configuration Placement" description="How should the new virtual host definitions be put in the configuration" default="vhost-per-file">
+ <c:property-options>
+ <c:option value="single-file" name="In the main configuration file"/>
+ <c:option value="vhost-per-file" name="Each Virtual Host in a standalone file" default="true"/>
+ </c:property-options>
+ </c:simple-property>
+
+ <c:simple-property name="vhostFilesMask" displayName="Path To Contain Virtual Hosts Files">
+ <c:description>
If the new virtual hosts should be created in standalone files, this mask determines where
to create those files. The '*' in the path is replaced by the name of the virtual host.
If the path is relative, it is considered relative to server root.
- </c:description>
- </c:simple-property>
+ </c:description>
+ </c:simple-property>
</c:group>
+
<c:group name="errorLog">
<!-- TODO this is now part of the resource configuration... -->
<c:simple-property name="errorLogFilePath" type="file" required="false"
@@ -437,21 +438,31 @@
<c:simple-property name="scheme" required="false"/>
</c:map-property>
</c:list-property>
- <c:list-property name="NameVirtualHost" required="false">
- <c:description>
- A required directive if you want to configure name-based virtual hosts.
- Although the value can be hostname it is recommended that you always use an IP address.
- IPv6 addresses must be enclosed in square brackets.
- To receive requests on all interfaces, you can set the value to *.
- Note that the IP address of a name-based virtual host must exactly match the value of this property.
- The address may be optionally followed by the port specification to further limit the directive effect.
- </c:description>
+ &DocumentRoot;
+ &DirectoryIndex;
+ &DefaultType;
+ &AddDefaultCharset;
+ &Aliases;
+ &ErrorDocuments;
+ &ServerAdmin;
+ &Timeout;
+ <c:list-property name="NameVirtualHost" required="false">
+ <c:description>
+ A required directive if you want to configure name-based virtual hosts.
+ Although the value can be hostname it is recommended that you always use an IP address.
+ IPv6 addresses must be enclosed in square brackets.
+ To receive requests on all interfaces, you can set the value to *.
+ Note that the IP address of a name-based virtual host must exactly match the value of this property.
+ The address may be optionally followed by the port specification to further limit the directive effect.
+ </c:description>
<c:map-property name="NameVirtualHost">
<c:simple-property name="address" description="A hostname, an IP address (recommended), or a * optionally followed by the port specification."/>
<c:simple-property name="_index" readOnly="true" required="false" description="Helper property to retain the consistent ordering inside Apache configuration files."/>
</c:map-property>
</c:list-property>
- &Timeout;
+ &Options;
+ &UseCanonicalName;
+ &UseCanonicalPhysicalPort;
<c:group name="Logging">
&ErrorLog;
&CustomLogs;
@@ -675,13 +686,7 @@
<c:description>
When the server finds an .htaccess file (as specified by AccessFileName) it needs to know which directives declared in that file can override earlier configuration directives.
</c:description>
- <c:simple-property name="All" type="boolean" default="true" description="Any directive which has the .htaccess Context is allowed in .htaccess files" />
- <c:simple-property name="None" type="boolean" description=".htaccess files are completely ignored. In this case, the server will not even attempt to read .htaccess files in the filesystem."/>
- <c:simple-property name="AuthConfig" type="boolean" description="Allow use of the authorization directives (AuthDBMGroupFile, AuthDBMUserFile, AuthGroupFile, AuthName, AuthType, AuthUserFile, Require, etc.)."/>
- <c:simple-property name="FileInfo" type="boolean" description="Allow use of the directives controlling document types (DefaultType, ErrorDocument, ForceType, LanguagePriority, SetHandler, SetInputFilter, SetOutputFilter, and mod_mime Add* and Remove* directives, etc.), document meta data (Header, RequestHeader, SetEnvIf, SetEnvIfNoCase, BrowserMatch, CookieExpires, CookieDomain, CookieStyle, CookieTracking, CookieName), mod_rewrite directives RewriteEngine, RewriteOptions, RewriteBase, RewriteCond, RewriteRule) and Action from mod_actions."/>
- <c:simple-property name="Indexes" type="boolean" description="Allow use of the directives controlling directory indexing (AddDescription, AddIcon, AddIconByEncoding, AddIconByType, DefaultIcon, DirectoryIndex, FancyIndexing, HeaderName, IndexIgnore, IndexOptions, ReadmeName, etc.)."/>
- <c:simple-property name="Limit" type="boolean" description="Allow use of the directives controlling host access (Allow, Deny and Order)."/>
- <c:simple-property name="Options" type="boolean" description="Allow use of the directives controlling specific directory features (Options and XBitHack)."/>
+ <c:simple-property name="param" required="false" description="Any directive which has the .htaccess Context is allowed in .htaccess files" />
<c:simple-property name="_index" required="false" description="Helper property to retain the consistent ordering inside Apache configuration files."/>
</c:map-property>
</c:list-property>
diff --git a/modules/plugins/augeas/src/main/java/org/rhq/augeas/AugeasProxy.java b/modules/plugins/augeas/src/main/java/org/rhq/augeas/AugeasProxy.java
index d685fd4..1e37161 100644
--- a/modules/plugins/augeas/src/main/java/org/rhq/augeas/AugeasProxy.java
+++ b/modules/plugins/augeas/src/main/java/org/rhq/augeas/AugeasProxy.java
@@ -28,12 +28,15 @@ import java.util.List;
import net.augeas.Augeas;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.rhq.augeas.config.AugeasConfiguration;
import org.rhq.augeas.config.AugeasModuleConfig;
import org.rhq.augeas.tree.AugeasTree;
import org.rhq.augeas.tree.AugeasTreeBuilder;
import org.rhq.augeas.tree.AugeasTreeException;
import org.rhq.augeas.tree.impl.DefaultAugeasTreeBuilder;
+import org.rhq.augeas.util.LensHelper;
/**
* This is the main entry point for interfacing with Augeas.
@@ -48,12 +51,14 @@ import org.rhq.augeas.tree.impl.DefaultAugeasTreeBuilder;
*
*/
public class AugeasProxy {
-
+
+ private final Log log = LogFactory.getLog(this.getClass());
private AugeasConfiguration config;
private Augeas augeas;
private List<String> modules;
private AugeasTreeBuilder augeasTreeBuilder;
-
+
+
/**
* Instantiates new proxy with supplied configuration and
* {@link DefaultAugeasTreeBuilder} as the tree builder.
@@ -93,10 +98,12 @@ public class AugeasProxy {
config.loadFiles();
augeas = new Augeas(config.getRootPath(), config.getLoadPath(), config.getMode());
+ try {
for (AugeasModuleConfig module : config.getModules()) {
modules.add(module.getModuletName());
- augeas.set("/augeas/load/" + module.getModuletName() + "/lens", module.getLensPath());
+
+ augeas.set("/augeas/load/" + module.getModuletName() + "/lens", LensHelper.getLensPath(module.getLensPath()));
int idx = 1;
for (String incl : module.getConfigFiles()) {
@@ -104,8 +111,14 @@ public class AugeasProxy {
}
}
+ }catch(Exception e){
+ log.error("Loading of augeas failed",e);
+ throw new AugeasTreeException(e);
+ }
augeas.load();
}
+
+
/**
* Produces the Augeas tree by loading it from augeas (if {@link #load()} wasn't called already)
diff --git a/modules/plugins/augeas/src/main/java/org/rhq/augeas/util/LensFilter.java b/modules/plugins/augeas/src/main/java/org/rhq/augeas/util/LensFilter.java
new file mode 100644
index 0000000..9fa7a3e
--- /dev/null
+++ b/modules/plugins/augeas/src/main/java/org/rhq/augeas/util/LensFilter.java
@@ -0,0 +1,23 @@
+package org.rhq.augeas.util;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class LensFilter implements FileFilter{
+ private Pattern pattern;
+
+ public LensFilter(String name){
+ pattern = Pattern.compile(name+".*"+LensHelper.TEMP_FILE_SUFFIX);
+ }
+
+ public boolean accept(File pathname) {
+ String name = pathname.getName();
+ Matcher match = pattern.matcher(name);
+ if (match.matches())
+ return true;
+
+ return false;
+ }
+}
diff --git a/modules/plugins/augeas/src/main/java/org/rhq/augeas/util/LensHelper.java b/modules/plugins/augeas/src/main/java/org/rhq/augeas/util/LensHelper.java
new file mode 100644
index 0000000..a56fb25
--- /dev/null
+++ b/modules/plugins/augeas/src/main/java/org/rhq/augeas/util/LensHelper.java
@@ -0,0 +1,66 @@
+package org.rhq.augeas.util;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class LensHelper {
+ public static final String TEMP_DIRECTORY = "java.io.tmpdir";
+ public static final String TEMP_FILE_SUFFIX = ".aug";
+
+
+ public static String getLensPath(String param) throws IOException,Exception{
+ String lensPath=null;
+
+ if (param.indexOf(File.separatorChar)==-1){
+ String tempDir = (String)System.getProperties().get(TEMP_DIRECTORY);
+ File tempDirectory = new File(tempDir);
+ File [] lens = tempDirectory.listFiles(new LensFilter(param));
+ File sourceFile = new File(param);
+
+ File tempFile;
+
+ if (lens.length==0){
+ tempFile = File.createTempFile(param, ".aug");
+ tempFile.deleteOnExit();
+ copyFile(sourceFile,tempFile);
+ }else{
+ tempFile = lens[0];
+ }
+ lensPath = tempFile.getAbsolutePath();
+ }else
+ lensPath = param;
+ return lensPath;
+
+ }
+
+ private static void copyFile(File source,File destination) throws Exception{
+
+ if (!destination.canWrite())
+ throw new Exception("Creating of temporary file for lens failed. Destination file "
+ + destination.getAbsolutePath()+" is not accessible.");
+
+ if (!source.canRead())
+ throw new Exception("Creating of temporary file for lens failed. Destination file "
+ + destination.getAbsolutePath()+" is not accessible.");
+
+
+ InputStream in = new FileInputStream(source);
+ OutputStream out = new FileOutputStream(destination);
+
+ byte[] buf = new byte[1024];
+ int length;
+
+ while ((length = in.read(buf)) > 0) {
+ out.write(buf, 0, length);
+ }
+
+ in.close();
+ out.close();
+
+ }
+
+}
commit 5be08eaf382da2a58d48938f49cea9cd328a827d
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Tue Dec 22 18:51:04 2009 +0100
update of configuration fix
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMap.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMap.java
index b2b424d..4297be3 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMap.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMap.java
@@ -72,7 +72,7 @@ public class MappingToAugeasDirectivePerMap extends ConfigurationToAugeasApacheB
if (list.getList().size()<nodes.size())
{
for (int i=0;i<nodes.size()-list.getList().size();i++){
- nodes.get(nodes.size()-i).remove(false);
+ nodes.get(nodes.size()-1-i).remove(false);
}
}
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectiveToSimple.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectiveToSimple.java
index aa0387c..5369514 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectiveToSimple.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectiveToSimple.java
@@ -62,7 +62,7 @@ public class MappingToAugeasDirectiveToSimple extends ConfigurationToAugeasApach
List<AugeasNode> nodes = tree.matchRelative(parentNode, propName);
try {
//NODE WAS DELETED IN CONFIGURATION
- if (propertyValue == null)
+ if (propertyValue == null || propertyValue.equals(""))
{
for (AugeasNode nod : nodes)
nod.remove(false);
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasParamPerMap.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasParamPerMap.java
index 6663d41..9bdbba4 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasParamPerMap.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasParamPerMap.java
@@ -47,7 +47,7 @@ public class MappingToAugeasParamPerMap extends ConfigurationToAugeasApacheBase{
public void updateList(PropertyDefinitionList propDef, Property prop,
AugeasNode listNode, int seq) throws AugeasRhqException {
- String propertyName = propDef.getName();
+ String propertyName = propDef.getName();
PropertyDefinition memberPropDef = propDef.getMemberDefinition();
List<AugeasNode> nodes = tree.matchRelative(listNode, propertyName);
@@ -80,7 +80,7 @@ public class MappingToAugeasParamPerMap extends ConfigurationToAugeasApacheBase{
if (map.size()<nodes.size())
{
for (int i=0;i<nodes.size()-map.size();i++){
- nodes.get(nodes.size()-i).remove(false);
+ nodes.get(nodes.size()-i-1).remove(false);
}
}
@@ -101,6 +101,7 @@ public class MappingToAugeasParamPerMap extends ConfigurationToAugeasApacheBase{
List<String> params = ApacheDirectiveRegExpression.createParams(param.toString(), propertyName);
updateNodeParams(nodes.get(i), params);
param.delete(0, param.length()-1);
+ i++;
}
}
@@ -144,13 +145,17 @@ public class MappingToAugeasParamPerMap extends ConfigurationToAugeasApacheBase{
}
min = next;
next = Integer.MAX_VALUE;
+ if (!tempList.isEmpty())
+ {
map.add(tempList);
+ tempList = new ArrayList<PropertyMap>();
+ }
}
return map;
}
private void updateNodeParams(AugeasNode node,List<String> params){
- List<AugeasNode> nodes = node.getChildByLabel("param");
+ List<AugeasNode> nodes = tree.matchRelative(node,"param");
//THERE IS MORE CONFIGURATIONS THAN NODES, NEW NODES WILL BE CREATED
if (params.size()>nodes.size())
@@ -164,7 +169,7 @@ public class MappingToAugeasParamPerMap extends ConfigurationToAugeasApacheBase{
if (params.size() < nodes.size())
{
for (int i=0;i<nodes.size()-params.size();i++){
- nodes.get(params.size()+i).remove(false);
+ nodes.get(nodes.size()-i-1).remove(false);
}
}
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/ApacheDirectiveRegExpression.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/ApacheDirectiveRegExpression.java
index c05a340..44df2a7 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/ApacheDirectiveRegExpression.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/ApacheDirectiveRegExpression.java
@@ -105,16 +105,16 @@ public class ApacheDirectiveRegExpression {
DIRECTIVEREGEX_TO_AUGEAS.put("Options", new Pattern[] { Pattern.compile("([+-]?" + WORD + ")" + WS) });
DIRECTIVEREGEX_TO_AUGEAS.put("Allow", new Pattern[] { Pattern.compile("(?:" + WS_MAN + "(" + WORD + "))") });
DIRECTIVEREGEX_TO_AUGEAS.put("Deny", new Pattern[] { Pattern.compile("(?:" + WS_MAN + "(" + WORD + "))") });
- DIRECTIVEREGEX_TO_AUGEAS.put("ServerAlias", new Pattern[] { Pattern.compile(WS + "(" + WORD + ")") });
- DIRECTIVEREGEX_TO_AUGEAS.put("DirectoryIndex", new Pattern[] { Pattern.compile(WS+ "(" + WORD + ")" + WS) });
+ DIRECTIVEREGEX_TO_AUGEAS.put("ServerAlias", new Pattern[] { Pattern.compile(WS_MAN + "(" + WORD + ")") });
+ DIRECTIVEREGEX_TO_AUGEAS.put("DirectoryIndex", new Pattern[] { Pattern.compile(WS_MAN+ "(" + WORD + ")" + WS_MAN) });
DIRECTIVEREGEX_TO_AUGEAS.put("Alias",
- new Pattern[] { Pattern.compile(WS + "(" + WORD + ")" + WS + "(" + WORD + ")" + WS) });
- DIRECTIVEREGEX_TO_AUGEAS.put("CustomLog", new Pattern[] { Pattern.compile(WS + "(" + WORD + ")" + "(?:" + WS_MAN + "("
+ new Pattern[] { Pattern.compile(WS_MAN + "(" + WORD + ")" + WS_MAN + "(" + WORD + ")" + WS) });
+ DIRECTIVEREGEX_TO_AUGEAS.put("CustomLog", new Pattern[] { Pattern.compile(WS_MAN + "(" + WORD + ")" + "(?:" + WS_MAN + "("
+ WORD + ")" + ")?" + WS) });
DIRECTIVEREGEX_TO_AUGEAS.put("AllowOverride", new Pattern[] { Pattern
.compile(WS+"(All)|(None)|(AuthConfig)|(FileInfo)|(Indexes)|(Limit)|(Options)") });
- DIRECTIVEREGEX_TO_AUGEAS.put("Listen", new Pattern[] { Pattern.compile(WS+ "(" + WORD + ")" + WS)});
- DIRECTIVEREGEX_TO_AUGEAS.put("ErrorDocument", new Pattern[] { Pattern.compile(WS + "(" + NUM + ")" + WS_MAN + "(" + WORD
+ DIRECTIVEREGEX_TO_AUGEAS.put("Listen", new Pattern[] { Pattern.compile(WS_MAN+ "(" + WORD + ")" + WS)});
+ DIRECTIVEREGEX_TO_AUGEAS.put("ErrorDocument", new Pattern[] { Pattern.compile(WS_MAN + "(" + NUM + ")" + WS_MAN + "(" + WORD
+ ")" + WS) });
}
diff --git a/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml
index cca02cd..027a968 100644
--- a/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml
@@ -42,7 +42,7 @@
The log entry format is documented fully in the Apache documentation http://httpd.apache.org/docs/2.2/mod/mod_log_config.html#formats.
</c:description>
</c:simple-property>
- <c:simple-property name="_index" readOnly="true" required="false" description="Helper property to retain the consistent ordering inside Apache configuration files."/>
+ <c:simple-property name="_index" required="false" description="Helper property to retain the consistent ordering inside Apache configuration files."/>
</c:map-property>
</c:list-property>
'>
@@ -177,7 +177,7 @@
<c:option value="SymLinksIfOwnerMatch"/>
</c:property-options>
</c:simple-property>
- <c:simple-property name="_index" readOnly="true" required="false" description="Helper property to retain the consistent ordering inside Apache configuration files."/>
+ <c:simple-property name="_index" required="false" description="Helper property to retain the consistent ordering inside Apache configuration files."/>
</c:map-property>
</c:list-property>
'>
@@ -202,7 +202,7 @@
</c:description>
<c:map-property name="Allow">
<c:simple-property name="host"/>
- <c:simple-property name="_index" readOnly="true" required="false" description="Helper property to retain the consistent ordering inside Apache configuration files."/>
+ <c:simple-property name="_index" required="false" description="Helper property to retain the consistent ordering inside Apache configuration files."/>
</c:map-property>
</c:list-property>
'>
@@ -214,7 +214,7 @@
</c:description>
<c:map-property name="Deny">
<c:simple-property name="host"/>
- <c:simple-property name="_index" readOnly="true" required="false" description="Helper property to retain the consistent ordering inside Apache configuration files."/>
+ <c:simple-property name="_index" required="false" description="Helper property to retain the consistent ordering inside Apache configuration files."/>
</c:map-property>
</c:list-property>
'>
@@ -642,7 +642,7 @@
<c:list-property name="ServerAlias">
<c:map-property name="ServerAlias">
<c:simple-property name="hostname"/>
- <c:simple-property name="_index" readOnly="true" required="false" description="Helper property to retain the consistent ordering inside Apache configuration files."/>
+ <c:simple-property name="_index" required="false" description="Helper property to retain the consistent ordering inside Apache configuration files."/>
</c:map-property>
</c:list-property>
&ServerAdmin;
@@ -682,7 +682,7 @@
<c:simple-property name="Indexes" type="boolean" description="Allow use of the directives controlling directory indexing (AddDescription, AddIcon, AddIconByEncoding, AddIconByType, DefaultIcon, DirectoryIndex, FancyIndexing, HeaderName, IndexIgnore, IndexOptions, ReadmeName, etc.)."/>
<c:simple-property name="Limit" type="boolean" description="Allow use of the directives controlling host access (Allow, Deny and Order)."/>
<c:simple-property name="Options" type="boolean" description="Allow use of the directives controlling specific directory features (Options and XBitHack)."/>
- <c:simple-property name="_index" readOnly="true" required="false" description="Helper property to retain the consistent ordering inside Apache configuration files."/>
+ <c:simple-property name="_index" required="false" description="Helper property to retain the consistent ordering inside Apache configuration files."/>
</c:map-property>
</c:list-property>
&AddDefaultCharset;
@@ -694,8 +694,8 @@
&UseCanonicalPhysicalPort;
</resource-configuration>
</service>
-<!--
- <service name="Files" class="ApacheFilesComponent" createDeletePolicy="both">
+
+ <!-- <service name="Files" class="ApacheFilesComponent" createDeletePolicy="both">
<plugin-configuration>
<c:simple-property name="directiveIndex" readOnly="true" required="true" type="integer"/>
</plugin-configuration>
@@ -732,6 +732,7 @@
</resource-configuration>
</service>
-->
+
</service>
<service name="Mod JK" description="Management of mod_jk"
discovery="ModJKDiscoveryComponent"
commit 314c4ef2f120c72193819456077a11e4a7973f65
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Tue Dec 22 11:43:39 2009 +0100
update mapping
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java
index 8ef3a9f..efcd382 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java
@@ -304,20 +304,25 @@ public class ApacheVirtualHostServiceComponent implements ResourceComponent<Apac
String[] addrs = resourceKey.substring(pipeIdx + 1).split(" ");
List<AugeasNode> nodes = tree.matchRelative(tree.getRootNode(), "<VirtualHost");
List<AugeasNode> virtualHosts = new ArrayList<AugeasNode>();
- boolean updated;
+ boolean updated = false;
for (AugeasNode node : nodes) {
+ updated = false;
List<AugeasNode> serverNameNodes = tree.matchRelative(node, "ServerName/param");
String tempServerName = null;
if (!(serverNameNodes.isEmpty())) {
tempServerName = serverNameNodes.get(0).getValue();
}
+ if (tempServerName == null & serverName == null)
+ updated = true;
+ if (tempServerName != null & serverName != null)
+ if (tempServerName.equals(serverName)){
+ updated = true;
+ }
+
- if (tempServerName == null && serverName == null) {
- virtualHosts.add(node);
- } else if (tempServerName != null && serverName != null)
- if (tempServerName.equals(serverName)) {
+ if (updated){
updated = false;
List<AugeasNode> params = node.getChildByLabel("param");
for (AugeasNode nd : params) {
@@ -328,15 +333,13 @@ public class ApacheVirtualHostServiceComponent implements ResourceComponent<Apac
}
if (!updated)
break;
+ }
- }
-
- if (updated) {
- virtualHosts.add(node);
- }
+ if (updated)
+ virtualHosts.add(node);
}
- }
-
+ }
+
if (virtualHosts.size() == 0) {
throw new IllegalStateException("Could not find virtual host configuration in augeas for virtual host: "
+ resourceKey);
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMapIndex.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMapIndex.java
index a04ca24..096a4f7 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMapIndex.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMapIndex.java
@@ -22,6 +22,7 @@
*/
package org.rhq.plugins.apache.augeas.mappingImpl;
+import java.util.ArrayList;
import java.util.List;
import org.rhq.augeas.node.AugeasNode;
@@ -77,9 +78,9 @@ public class MappingToAugeasDirectivePerMapIndex extends ConfigurationToAugeasAp
PropertyDefinition memberPropDef = ((PropertyDefinitionList) propDef).getMemberDefinition();
int i=0;
- sort(property);
+ List<PropertyMap> propertyMap = sort(property);
- for (Property pr : property.getList()){
+ for (Property pr : propertyMap){
updateProperty(memberPropDef, pr, nodes.get(i), i);
i=i+1;
}
@@ -124,10 +125,10 @@ public class MappingToAugeasDirectivePerMapIndex extends ConfigurationToAugeasAp
}
- private void sort(PropertyList list){
+ /* private void sort(PropertyList list){
List<Property> propList = list.getList();
- int min = 0;
+ int min = -1;
int minIndex = 0;
int index = 0;
Integer value = 0;
@@ -138,7 +139,9 @@ public class MappingToAugeasDirectivePerMapIndex extends ConfigurationToAugeasAp
PropertyMap map = (PropertyMap)propList.get(index);
PropertySimple simple = (PropertySimple) map.get("_index");
value = simple.getIntegerValue();
-
+ if (value==null){
+ value = 0;
+ }
if (value.intValue() < min){
propList.set(index, propList.get(minIndex));
propList.set(minIndex, map);
@@ -150,6 +153,36 @@ public class MappingToAugeasDirectivePerMapIndex extends ConfigurationToAugeasAp
}
}
- }
+ }*/
+ private List<PropertyMap> sort(PropertyList list){
+ List<PropertyMap> map = new ArrayList<PropertyMap>();
+
+ int next = Integer.MAX_VALUE;
+ int min=0;
+ int count = 0;
+
+ while(count<list.getList().size()){
+ for (Property prop : list.getList()){
+ PropertyMap propMap = (PropertyMap)prop;
+ PropertySimple propSim = ((PropertySimple)propMap.get("_index"));
+ int value;
+ if (propSim ==null | propSim.getIntegerValue() == null)
+ value = 0;
+ else
+ value = propSim.getIntegerValue().intValue();
+
+ if (value == min){
+ map.add(propMap);
+ count = count + 1;
+ }
+ if (value > min & value<next){
+ next = value;
+ }
+ }
+ min = next;
+ next = Integer.MAX_VALUE;
+ }
+ return map;
+ }
}
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasParamPerMap.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasParamPerMap.java
index 9fa4f4f..6663d41 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasParamPerMap.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasParamPerMap.java
@@ -129,7 +129,7 @@ public class MappingToAugeasParamPerMap extends ConfigurationToAugeasApacheBase{
PropertyMap propMap = (PropertyMap)prop;
PropertySimple propSim = ((PropertySimple)propMap.get("_index"));
int value;
- if (propSim ==null)
+ if (propSim ==null | propSim.getIntegerValue() == null)
value = 0;
else
value = propSim.getIntegerValue().intValue();
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/ApacheDirectiveRegExpression.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/ApacheDirectiveRegExpression.java
index ffbcbc9..c05a340 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/ApacheDirectiveRegExpression.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/ApacheDirectiveRegExpression.java
@@ -109,9 +109,14 @@ public class ApacheDirectiveRegExpression {
DIRECTIVEREGEX_TO_AUGEAS.put("DirectoryIndex", new Pattern[] { Pattern.compile(WS+ "(" + WORD + ")" + WS) });
DIRECTIVEREGEX_TO_AUGEAS.put("Alias",
new Pattern[] { Pattern.compile(WS + "(" + WORD + ")" + WS + "(" + WORD + ")" + WS) });
+ DIRECTIVEREGEX_TO_AUGEAS.put("CustomLog", new Pattern[] { Pattern.compile(WS + "(" + WORD + ")" + "(?:" + WS_MAN + "("
+ + WORD + ")" + ")?" + WS) });
+ DIRECTIVEREGEX_TO_AUGEAS.put("AllowOverride", new Pattern[] { Pattern
+ .compile(WS+"(All)|(None)|(AuthConfig)|(FileInfo)|(Indexes)|(Limit)|(Options)") });
DIRECTIVEREGEX_TO_AUGEAS.put("Listen", new Pattern[] { Pattern.compile(WS+ "(" + WORD + ")" + WS)});
DIRECTIVEREGEX_TO_AUGEAS.put("ErrorDocument", new Pattern[] { Pattern.compile(WS + "(" + NUM + ")" + WS_MAN + "(" + WORD
+ ")" + WS) });
+
}
/**
* Parses the parameters of the supplied node and returns a list
14 years, 4 months
[rhq] Branch 'linux-config' - modules/plugins
by Shannon Hughes
modules/plugins/samba/src/main/java/org/rhq/plugins/samba/SambaServerComponent.java | 37 +++++++---
modules/plugins/samba/src/main/resources/META-INF/rhq-plugin.xml | 7 +
2 files changed, 30 insertions(+), 14 deletions(-)
New commits:
commit 8a7181ea2f1050643e00219952671e854ba29fed
Author: Shannon Hughes <shughes(a)scooby.rdu.redhat.com>
Date: Tue Jan 5 09:10:23 2010 -0500
changes based off 12/23 demo of samba ads
diff --git a/modules/plugins/samba/src/main/java/org/rhq/plugins/samba/SambaServerComponent.java b/modules/plugins/samba/src/main/java/org/rhq/plugins/samba/SambaServerComponent.java
index e7c54cd..38c9678 100644
--- a/modules/plugins/samba/src/main/java/org/rhq/plugins/samba/SambaServerComponent.java
+++ b/modules/plugins/samba/src/main/java/org/rhq/plugins/samba/SambaServerComponent.java
@@ -42,6 +42,7 @@ public class SambaServerComponent extends AugeasConfigurationComponent {
static final String ENABLE_RECYCLING = "enableRecycleBin";
static final String AUTHCONFIG_PATH = "/usr/bin/authconfig";
static final String NET_PATH = "/usr/bin/net";
+ static final String SPACE = " ";
private ResourceContext resourceContext;
@@ -136,7 +137,11 @@ public class SambaServerComponent extends AugeasConfigurationComponent {
String controller = pluginConfig.getSimple("controller").getStringValue();
String username = pluginConfig.getSimple("username").getStringValue();
String password = pluginConfig.getSimple("password").getStringValue();
+
String workgroup = resourceConfig.getSimple("workgroup").getStringValue();
+ String idmapuid = resourceConfig.getSimple("idmap uid").getStringValue();
+ String idmapgid = resourceConfig.getSimple("idmap gid").getStringValue();
+ String shell = resourceConfig.getSimple("template shell").getStringValue();
if (realm == null || controller == null || username == null || password == null || workgroup == null) {
// no point in doing anything
@@ -146,21 +151,31 @@ public class SambaServerComponent extends AugeasConfigurationComponent {
StringBuilder authArgs = new StringBuilder();
StringBuilder netArgs = new StringBuilder();
- //String workgroup = pluginConfig.getSimple("workgroup").getStringValue();
-
- // AuthConfig arguments
+ // AuthConfig arguments...ugly and would be a lot prettier using python
authArgs.append("--smbservers=" + controller);
- authArgs.append(" --smbrealm=" + realm);
- authArgs.append(" --enablewinbind --smbsecurity=ads");
- authArgs.append(" --smbidmapuid=15000-20000 --smbidmapgid=15000-20000");
- authArgs.append(" --winbindtemplateshell=/bin/bash");
- authArgs.append(" --update");
+ authArgs.append(SPACE + "--smbrealm=" + realm);
+ authArgs.append(SPACE + "--enablewinbind --smbsecurity=ads");
+
+ if (idmapuid != null) {
+ authArgs.append(SPACE + "--smbidmapuid=" + idmapuid);
+ }
+
+ if (idmapgid != null) {
+ authArgs.append(SPACE + "--smbidmapgid=" + idmapgid);
+ }
+
+ if (shell != null) {
+ authArgs.append(SPACE + "--winbindtemplateshell=" + shell);
+ }
+
+ authArgs.append(SPACE + "--update");
// Net join arguments
netArgs.append("join");
- netArgs.append(" -w " + workgroup);
- netArgs.append(" -S " + controller);
- netArgs.append(" -U " + username + "%" + password);
+ netArgs.append(SPACE + "-w " + workgroup);
+ netArgs.append(SPACE + "-S " + controller);
+ //TODO is there more secure way to do this.
+ netArgs.append(SPACE + "-U " + username + "%" + password);
execute(AUTHCONFIG_PATH, authArgs.toString());
execute(NET_PATH, netArgs.toString());
diff --git a/modules/plugins/samba/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/samba/src/main/resources/META-INF/rhq-plugin.xml
index ce01244..0dd785f 100644
--- a/modules/plugins/samba/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/samba/src/main/resources/META-INF/rhq-plugin.xml
@@ -63,11 +63,12 @@
</c:group>
<c:group name="Active Server Directory">
- <c:simple-property name="idmap uid" required="false" displayName="Idmap UID" description="Specifies range of users ids that are allocated for use in mapping Linux users to NT user SIDs"/>
- <c:simple-property name="idmap gid" required="false" displayName="Idmap GID" description="Specifies range of group ids that are allocated for use in mapping Linux groups to NT group SIDs"/>
+ <c:simple-property name="idmap uid" required="false" displayName="Idmap UID range" description="Specifies range of users ids that are allocated for use in mapping Linux users to NT user SIDs"/>
+ <c:simple-property name="idmap gid" required="false" displayName="Idmap GID range" description="Specifies range of group ids that are allocated for use in mapping Linux groups to NT group SIDs"/>
+ <c:simple-property name="template shell" required="false" displayName="Template Shell" default="/bin/bash" description="winbindd daemon uses this parameter to fill in the login shell for users"/>
<c:simple-property name="winbind enum users" required="false" displayName="User enumeration" type="boolean" description="Allow enumeration of user info"/>
<c:simple-property name="winbind enum groups" required="false" displayName="Group enumeration" type="boolean" description="Allow enumeration of group info"/>
- <c:simple-property name="winbind separator" required="false" displayName="Winbind separator" description="Character used when listing a username in the DOMAIN\user format"/>
+ <c:simple-property name="winbind separator" default="+" required="false" displayName="Winbind separator" description="Character used when listing a username in the DOMAIN\user format"/>
</c:group>
</resource-configuration>
14 years, 4 months
[rhq] Branch 'linux-config' - 7 commits - modules/core modules/enterprise
by Jay Shaughnessy
modules/core/domain/pom.xml | 2
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml | 46 +++++++++
modules/enterprise/remoting/client-api/pom.xml | 48 ++++++++++
3 files changed, 94 insertions(+), 2 deletions(-)
New commits:
commit 482a067fb38d04b2ca8e063c3a68a610bed626b5
Merge: 530106b... a9aedbd...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Jan 4 16:42:24 2010 -0500
Merge branch 'linux-config' into linux-config-dev
commit a9aedbdc1fc430960061b90f249c078495f560a6
Merge: 7e25219... 57c23cc...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Jan 4 16:42:03 2010 -0500
Merge branch 'linux-config' of ssh://git.fedorahosted.org/git/rhq/rhq into linux-config
Conflicts:
modules/core/pom.xml
modules/enterprise/server/jar/pom.xml
commit 530106b1d1f52bf30704da23dbf9624a330f9c93
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Jan 4 16:37:04 2010 -0500
[BZ 545596] A further fix to handle, I think, a legacy problem avoiding
simultaneous reloads.
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
index fa81d78..3bd4af6 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
@@ -268,19 +268,22 @@
function refresh() {
- timeLeft = timeLeft - 1;
- document.getElementById("refreshTimeLeft").innerHTML = timeLeft;
-
- if (timeLeft < 1) {
- window.location.href = window.location.href;
+ if (timeLeft > 0) {
+ timeLeft = timeLeft - 1;
+ document.getElementById("refreshTimeLeft").innerHTML = timeLeft;
+ setTimeout("refresh()", 1000); // call again in 1 second (1000ms)
}
- setTimeout("refresh()", 1000);
+
+ if (timeLeft == 0) {
+ document.getElementById("refreshTimeLeft").innerHTML = timeLeft;
+ window.location.reload(true);
+ }
}
var refreshTime = <h:outputText value="#{UserPreferencesUIBean.pageRefresh}"/>;
var timeLeft = refreshTime;
- if (refreshTime > 0) {
+ if (refreshTime > 0) {
setTimeout("refresh()", 1000);
}
@@ -290,7 +293,7 @@
<a4j:jsFunction
name="updatePageRefresh"
status="commonStatus"
- oncomplete="window.location.href = window.location.href;">
+ oncomplete="window.location.reload(true);">
<a4j:actionparam
name="param1"
assignTo="#{UserPreferencesUIBean.refreshPath}" />
commit 7e25219242f643a3347b267d7c812b1c0ef921b9
Merge: 90c6808... 3a73579...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Jan 4 09:23:20 2010 -0500
Merge branch 'linux-config' into linux-config-dev
commit 90c6808e887884250e118815151cc2be0ff999e7
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Jan 4 09:21:11 2010 -0500
Trivial format change.
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
index bc30bdc..fa81d78 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
@@ -163,7 +163,6 @@
height="16" />
</f:facet>
</rich:menuItem>
-
</rich:dropDownMenu>
<ui:remove>***** Logged in as > EDIT DETAILS *****</ui:remove>
@@ -264,6 +263,7 @@
renderRegionOnly="true"
selfRendered="true">
+
<script type="text/javascript">
function refresh() {
@@ -299,7 +299,6 @@
assignTo="#{UserPreferencesUIBean.pageRefresh}" />
</a4j:jsFunction>
</a4j:form>
-
</a4j:region>
</a4j:region>
commit 5999791dd6419bf3d484033095fd8dd8480e0aa2
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Dec 30 17:52:57 2009 -0500
[BZ-545596] Fixed regression in refresh period menu item.
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
index 44bb844..bc30bdc 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
@@ -260,4 +260,46 @@
</h:form>
+ <a4j:region
+ renderRegionOnly="true"
+ selfRendered="true">
+
+ <script type="text/javascript">
+
+ function refresh() {
+
+ timeLeft = timeLeft - 1;
+ document.getElementById("refreshTimeLeft").innerHTML = timeLeft;
+
+ if (timeLeft < 1) {
+ window.location.href = window.location.href;
+ }
+ setTimeout("refresh()", 1000);
+ }
+
+ var refreshTime = <h:outputText value="#{UserPreferencesUIBean.pageRefresh}"/>;
+ var timeLeft = refreshTime;
+
+ if (refreshTime > 0) {
+ setTimeout("refresh()", 1000);
+ }
+
+ </script>
+
+ <a4j:form>
+ <a4j:jsFunction
+ name="updatePageRefresh"
+ status="commonStatus"
+ oncomplete="window.location.href = window.location.href;">
+ <a4j:actionparam
+ name="param1"
+ assignTo="#{UserPreferencesUIBean.refreshPath}" />
+ <a4j:actionparam
+ name="param2"
+ assignTo="#{UserPreferencesUIBean.pageRefresh}" />
+ </a4j:jsFunction>
+ </a4j:form>
+
+ </a4j:region>
+
</a4j:region>
commit cc579c92b275ce5563f1f44bdefe6fd574e98d77
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Dec 30 15:02:31 2009 -0500
Added javadoc profiles in various places for public API's. To generate
a full set of jdoc execute:
mvn compile -Djavadoc.outputDirectory=<jdocParentDir>
from (and in this order):
core/domain
core
enterprise/server/jar
enterprise/remoting/client-api
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index 5e0a9e0..53d16e5 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -318,6 +318,47 @@
</build>
</profile>
+ <profile>
+ <id>javadoc</id>
+ <activation>
+ <property>
+ <name>javadoc.outputDirectory</name>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+
+ <executions>
+ <execution>
+ <id>javadoc-domain-api</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ <configuration>
+ <doctitle>RHQ ${project.version} - Domain</doctitle>
+ <reportOutputDirectory>${javadoc.outputDirectory}</reportOutputDirectory>
+ <destDir>domain</destDir>
+ <aggregate>true</aggregate>
+ <encoding>UTF-8</encoding>
+ <charset>UTF-8</charset>
+ <docencoding>UTF-8</docencoding>
+ <author>false</author>
+ <breakiterator>true</breakiterator>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ </links>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 52b4963..ad83d23 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -1,85 +1,122 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-parent</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ </parent>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-parent</artifactId>
- <packaging>pom</packaging>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-parent</artifactId>
+ <packaging>pom</packaging>
- <name>RHQ Core Modules</name>
- <description>parent POM for modules comprising the RHQ core (i.e. modules required by both the enterprise and embedded editions of RHQ)</description>
+ <name>RHQ Core Modules</name>
+ <description>parent POM for modules comprising the RHQ core (i.e. modules required by both the enterprise and embedded editions of RHQ)</description>
- <scm>
- <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/core</connection>
- <developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/core</developerConnection>
- </scm>
+ <scm>
+ <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/core</connection>
+ <developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/core</developerConnection>
+ </scm>
<properties>
<scm.module.path>modules/core/</scm.module.path>
</properties>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <doctitle>RHQ ${project.version} Plugin API</doctitle>
- <aggregate>true</aggregate>
- <encoding>UTF-8</encoding>
- <charset>UTF-8</charset>
- <docencoding>UTF-8</docencoding>
- <author>false</author>
- <breakiterator>true</breakiterator>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- </links>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
- <profiles>
-
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>util</module>
- <module>native-system</module>
- <module>comm-api</module>
- <module>dbutils</module>
- <module>domain</module>
- <module>plugin-api</module>
- <module>client-api</module>
- <module>plugin-container</module>
- <module>gui</module>
- <module>plugindoc</module>
- <module>plugin-validator</module>
- </modules>
- </profile>
-
- <profile>
- <id>plugin-api-javadoc</id>
- <activation>
- <property>
- <name>plugin-api-javadoc</name>
- </property>
- </activation>
- <modules>
- <module>native-system</module>
- <module>domain</module>
- <module>plugin-api</module>
- </modules>
- </profile>
-
- </profiles>
-
-</project>
\ No newline at end of file
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <doctitle>RHQ ${project.version} Plugin API</doctitle>
+ <aggregate>true</aggregate>
+ <encoding>UTF-8</encoding>
+ <charset>UTF-8</charset>
+ <docencoding>UTF-8</docencoding>
+ <author>false</author>
+ <breakiterator>true</breakiterator>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ </links>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <profiles>
+
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>util</module>
+ <module>native-system</module>
+ <module>comm-api</module>
+ <module>dbutils</module>
+ <module>domain</module>
+ <module>plugin-api</module>
+ <module>client-api</module>
+ <module>plugin-container</module>
+ <module>gui</module>
+ <module>plugindoc</module>
+ <module>plugin-validator</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>javadoc</id>
+ <activation>
+ <property>
+ <name>javadoc.outputDirectory</name>
+ </property>
+ </activation>
+
+ <modules>
+ <module>native-system</module>
+ <module>plugin-api</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+
+ <executions>
+ <execution>
+ <id>javadoc-domain-api</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+
+ <configuration>
+ <doctitle>RHQ ${project.version} - Plugin API</doctitle>
+ <reportOutputDirectory>${javadoc.outputDirectory}</reportOutputDirectory>
+ <destDir>plugin-api</destDir>
+ <aggregate>true</aggregate>
+ <encoding>UTF-8</encoding>
+ <charset>UTF-8</charset>
+ <docencoding>UTF-8</docencoding>
+ <author>false</author>
+ <breakiterator>true</breakiterator>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ <link>../domain</link>
+ </links>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
+</project>
diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml
index bbfb502..0fc95b6 100644
--- a/modules/enterprise/remoting/client-api/pom.xml
+++ b/modules/enterprise/remoting/client-api/pom.xml
@@ -182,5 +182,53 @@
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>javadoc</id>
+ <activation>
+ <property>
+ <name>javadoc.outputDirectory</name>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+
+ <executions>
+ <execution>
+ <id>javadoc-client-api</id>
+ <phase>compile</phase>
+
+ <configuration>
+ <doctitle>RHQ ${project.version} - Client API</doctitle>
+ <reportOutputDirectory>${javadoc.outputDirectory}</reportOutputDirectory>
+ <destDir>client-api</destDir>
+ <aggregate>true</aggregate>
+ <encoding>UTF-8</encoding>
+ <charset>UTF-8</charset>
+ <docencoding>UTF-8</docencoding>
+ <author>false</author>
+ <breakiterator>true</breakiterator>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ <link>../remote-api</link>
+ </links>
+ </configuration>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ </execution>
+ </executions>
+
+ </plugin>
+ </plugins>
+ </build>
+
+ </profile>
+
+ </profiles>
</project>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index e960104..4377223 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -571,6 +571,76 @@
</dependency>
</dependencies>
</profile>
+
+ <profile>
+ <id>javadoc</id>
+ <activation>
+ <property>
+ <name>javadoc.outputDirectory</name>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+
+ <execution>
+ <id>javadoc-remote-api</id>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <property
+ name="javadoc.outputDirectory"
+ value="${javadoc.outputDirectory}" />
+ <property
+ name="project.dir"
+ value="./src/main/java/org/rhq/enterprise/server" />
+ <property
+ name="maven.compile.classpath"
+ refid="maven.compile.classpath" />
+
+ <javadoc
+ destdir="${javadoc.outputDirectory}/remote-api"
+ author="true"
+ version="true"
+ windowtitle="Remote API"
+ noindex="false">
+ <classpath>
+ <pathelement
+ path="${maven.compile.classpath}" />
+ </classpath>
+ <fileset
+ dir="${project.dir}"
+ defaultexcludes="yes">
+ <include
+ name="**/*Remote.java" />
+ </fileset>
+ <link
+ href="../domain" />
+ <link
+ href="../plugin-api" />
+ <link
+ href="http://java.sun.com/j2se/1.5.0/docs/api/" />
+ <bottom><![CDATA[Copyright © 2008-2009 <a href="http://rhq-project.org/">Red Hat, Inc.</a>. All Rights Reserved.
+]]></bottom>
+ </javadoc>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ </profile>
+
</profiles>
</project>
diff --git a/pom.xml b/pom.xml
index 5a63160..dc2b8d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -459,7 +459,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</plugin>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
14 years, 4 months
[rhq] modules/enterprise
by Bryan Kearney
modules/enterprise/server/ear/pom.xml | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit da720845756a2c37f5db5249799fca6b946b1ee8
Author: Bryan Kearney <bkearney(a)localhost.localdomain>
Date: Mon Jan 4 13:12:03 2010 -0500
always copy over the license.xml file
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index 92d255c..0666bbe 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -118,6 +118,9 @@
<tasks>
<mkdir
dir="${earDirectory}/license" />
+ <copy
+ todir="${earDirectory}/license"
+ file="${basedir}/src/main/license/license.xml" />
</tasks>
</configuration>
<goals>
14 years, 4 months
[rhq] Branch 'linux-config' - 4 commits - modules/core modules/enterprise modules/pom.xml pom.xml
by Partha Aji
modules/core/domain/pom.xml | 41 ++++++++
modules/core/pom.xml | 159 ++++++++++++++++++----------------
modules/enterprise/pom.xml | 5 -
modules/enterprise/server/jar/pom.xml | 72 +++++++++++++++
modules/pom.xml | 149 ++++++++++++++++---------------
pom.xml | 2
6 files changed, 281 insertions(+), 147 deletions(-)
New commits:
commit 57c23cc25251d08afaeb5dea767f4fd4a71ae314
Merge: 3a73579... 2c5095d...
Author: Partha Aji <paji(a)redhat.com>
Date: Mon Jan 4 11:14:41 2010 -0500
Merge branch 'master' into linux-config
commit 2c5095d2b2ddc4d4ab377589faee091f6f01e066
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Dec 30 15:12:16 2009 -0500
Added javadoc profiles in various places for public API's. To generate
a full set of jdoc execute:
mvn compile -Djavadoc.outputDirectory=<jdocParentDir>
from (and in this order):
core/domain
core
enterprise/server/jar
enterprise/remoting/client-api (this last one is pending linux-config merge into master)
The maven javadoc plugin rev has been upped from 2.4 to 2.5.
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index 1f6aafb..b828840 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -326,28 +326,37 @@
</property>
</activation>
- <reporting>
+ <build>
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <doctitle>RHQ ${project.version} - Domain</doctitle>
- <reportOutputDirectory>${javadoc.outputDirectory}</reportOutputDirectory>
- <destDir>domain</destDir>
- <aggregate>true</aggregate>
- <encoding>UTF-8</encoding>
- <charset>UTF-8</charset>
- <docencoding>UTF-8</docencoding>
- <author>false</author>
- <breakiterator>true</breakiterator>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- </links>
- </configuration>
+ <executions>
+ <execution>
+ <id>javadoc-domain-api</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ <configuration>
+ <doctitle>RHQ ${project.version} - Domain</doctitle>
+ <reportOutputDirectory>${javadoc.outputDirectory}</reportOutputDirectory>
+ <destDir>domain</destDir>
+ <aggregate>true</aggregate>
+ <encoding>UTF-8</encoding>
+ <charset>UTF-8</charset>
+ <docencoding>UTF-8</docencoding>
+ <author>false</author>
+ <breakiterator>true</breakiterator>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ </links>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
- </reporting>
+ </build>
</profile>
</profiles>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 3489844..4ed8447 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -56,35 +56,45 @@
<name>javadoc.outputDirectory</name>
</property>
</activation>
+
<modules>
- <module>domain</module>
<module>native-system</module>
<module>plugin-api</module>
</modules>
- <reporting>
+ <build>
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <doctitle>RHQ ${project.version} - Plugin API</doctitle>
- <reportOutputDirectory>${javadoc.outputDirectory}</reportOutputDirectory>
- <destDir>plugin-api</destDir>
- <aggregate>true</aggregate>
- <encoding>UTF-8</encoding>
- <charset>UTF-8</charset>
- <docencoding>UTF-8</docencoding>
- <author>false</author>
- <breakiterator>true</breakiterator>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>../domain</link>
- </links>
- </configuration>
+ <executions>
+ <execution>
+ <id>javadoc-domain-api</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+
+ <configuration>
+ <doctitle>RHQ ${project.version} - Plugin API</doctitle>
+ <reportOutputDirectory>${javadoc.outputDirectory}</reportOutputDirectory>
+ <destDir>plugin-api</destDir>
+ <aggregate>true</aggregate>
+ <encoding>UTF-8</encoding>
+ <charset>UTF-8</charset>
+ <docencoding>UTF-8</docencoding>
+ <author>false</author>
+ <breakiterator>true</breakiterator>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ <link>../domain</link>
+ </links>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
- </reporting>
+ </build>
</profile>
</profiles>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index d3ff184..0ba712c 100644
--- a/modules/enterprise/pom.xml
+++ b/modules/enterprise/pom.xml
@@ -73,92 +73,6 @@
</modules>
</profile>
- <profile>
- <id>javadoc</id>
- <activation>
- <property>
- <name>javadoc.outputDirectory</name>
- </property>
- </activation>
- <modules>
- <module>server/jar</module>
- <module>remoting/cli</module>
- </modules>
-
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <doctitle>RHQ ${project.version} - Client API</doctitle>
- <reportOutputDirectory>${javadoc.outputDirectory}</reportOutputDirectory>
- <destDir>client-api</destDir>
- <aggregate>true</aggregate>
- <encoding>UTF-8</encoding>
- <charset>UTF-8</charset>
- <docencoding>UTF-8</docencoding>
- <author>false</author>
- <breakiterator>true</breakiterator>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- </links>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
-
- <execution>
- <id>javadoc-remote-api</id>
- <phase>compile</phase>
- <configuration>
- <tasks>
- <property
- name="javadoc.outputDirectory"
- value="${javadoc.outputDirectory}" />
- <property
- name="project.dir"
- value="./server/jar/src/main/java/org/rhq/enterprise/server" />
- <property
- name="classpath"
- value="${maven.compile.classpath}" />
-
- <javadoc
- destdir="${javadoc.outputDirectory}/remote-api"
- author="true"
- version="true"
- windowtitle="Remote API"
- noindex="false"
- classpath="${classpath}">
-
- <fileset
- dir="${project.dir}"
- defaultexcludes="yes">
- <include
- name="**/*Remote.java" />
- </fileset>
- </javadoc>
-
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- </executions>
- </plugin>
- </plugins>
- </build>
-
- </profile>
-
</profiles>
</project>
diff --git a/modules/pom.xml b/modules/pom.xml
index 9512735..4ce0286 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -83,19 +83,6 @@
</activation>
</profile>
- <profile>
- <id>javadoc</id>
- <activation>
- <property>
- <name>javadoc.outputDirectory</name>
- </property>
- </activation>
- <modules>
- <module>core</module>
- <module>enterprise</module>
- </modules>
- </profile>
-
</profiles>
<modules>
commit c0f987fd0c283e30536986588268bf0846e7e981
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Dec 30 11:15:20 2009 -0500
Jdoc generation using -Djavadoc.outputDirectory
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index 5e0a9e0..1f6aafb 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -318,6 +318,38 @@
</build>
</profile>
+ <profile>
+ <id>javadoc</id>
+ <activation>
+ <property>
+ <name>javadoc.outputDirectory</name>
+ </property>
+ </activation>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <doctitle>RHQ ${project.version} - Domain</doctitle>
+ <reportOutputDirectory>${javadoc.outputDirectory}</reportOutputDirectory>
+ <destDir>domain</destDir>
+ <aggregate>true</aggregate>
+ <encoding>UTF-8</encoding>
+ <charset>UTF-8</charset>
+ <docencoding>UTF-8</docencoding>
+ <author>false</author>
+ <breakiterator>true</breakiterator>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ </links>
+ </configuration>
+
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+
</profiles>
</project>
\ No newline at end of file
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 52b4963..3489844 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -1,85 +1,92 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-parent</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ </parent>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-parent</artifactId>
- <packaging>pom</packaging>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-parent</artifactId>
+ <packaging>pom</packaging>
- <name>RHQ Core Modules</name>
- <description>parent POM for modules comprising the RHQ core (i.e. modules required by both the enterprise and embedded editions of RHQ)</description>
+ <name>RHQ Core Modules</name>
+ <description>parent POM for modules comprising the RHQ core (i.e. modules required by both the enterprise and embedded editions of RHQ)</description>
- <scm>
- <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/core</connection>
- <developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/core</developerConnection>
- </scm>
+ <scm>
+ <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/core</connection>
+ <developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/core</developerConnection>
+ </scm>
<properties>
<scm.module.path>modules/core/</scm.module.path>
</properties>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <doctitle>RHQ ${project.version} Plugin API</doctitle>
- <aggregate>true</aggregate>
- <encoding>UTF-8</encoding>
- <charset>UTF-8</charset>
- <docencoding>UTF-8</docencoding>
- <author>false</author>
- <breakiterator>true</breakiterator>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- </links>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
- <profiles>
+ <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>util</module>
- <module>native-system</module>
- <module>comm-api</module>
- <module>dbutils</module>
- <module>domain</module>
- <module>plugin-api</module>
- <module>client-api</module>
- <module>plugin-container</module>
- <module>gui</module>
- <module>plugindoc</module>
- <module>plugin-validator</module>
- </modules>
- </profile>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>util</module>
+ <module>native-system</module>
+ <module>comm-api</module>
+ <module>dbutils</module>
+ <module>domain</module>
+ <module>plugin-api</module>
+ <module>client-api</module>
+ <module>plugin-container</module>
+ <module>gui</module>
+ <module>plugindoc</module>
+ <module>plugin-validator</module>
+ </modules>
+ </profile>
- <profile>
- <id>plugin-api-javadoc</id>
- <activation>
- <property>
- <name>plugin-api-javadoc</name>
- </property>
- </activation>
- <modules>
- <module>native-system</module>
- <module>domain</module>
- <module>plugin-api</module>
- </modules>
- </profile>
+ <profile>
+ <id>javadoc</id>
+ <activation>
+ <property>
+ <name>javadoc.outputDirectory</name>
+ </property>
+ </activation>
+ <modules>
+ <module>domain</module>
+ <module>native-system</module>
+ <module>plugin-api</module>
+ </modules>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <doctitle>RHQ ${project.version} - Plugin API</doctitle>
+ <reportOutputDirectory>${javadoc.outputDirectory}</reportOutputDirectory>
+ <destDir>plugin-api</destDir>
+ <aggregate>true</aggregate>
+ <encoding>UTF-8</encoding>
+ <charset>UTF-8</charset>
+ <docencoding>UTF-8</docencoding>
+ <author>false</author>
+ <breakiterator>true</breakiterator>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ <link>../domain</link>
+ </links>
+ </configuration>
+
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+
+ </profiles>
- </profiles>
-
</project>
\ No newline at end of file
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index 0cf6c85..d3ff184 100644
--- a/modules/enterprise/pom.xml
+++ b/modules/enterprise/pom.xml
@@ -1,4 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -70,6 +73,92 @@
</modules>
</profile>
+ <profile>
+ <id>javadoc</id>
+ <activation>
+ <property>
+ <name>javadoc.outputDirectory</name>
+ </property>
+ </activation>
+ <modules>
+ <module>server/jar</module>
+ <module>remoting/cli</module>
+ </modules>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <doctitle>RHQ ${project.version} - Client API</doctitle>
+ <reportOutputDirectory>${javadoc.outputDirectory}</reportOutputDirectory>
+ <destDir>client-api</destDir>
+ <aggregate>true</aggregate>
+ <encoding>UTF-8</encoding>
+ <charset>UTF-8</charset>
+ <docencoding>UTF-8</docencoding>
+ <author>false</author>
+ <breakiterator>true</breakiterator>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ </links>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+
+ <execution>
+ <id>javadoc-remote-api</id>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <property
+ name="javadoc.outputDirectory"
+ value="${javadoc.outputDirectory}" />
+ <property
+ name="project.dir"
+ value="./server/jar/src/main/java/org/rhq/enterprise/server" />
+ <property
+ name="classpath"
+ value="${maven.compile.classpath}" />
+
+ <javadoc
+ destdir="${javadoc.outputDirectory}/remote-api"
+ author="true"
+ version="true"
+ windowtitle="Remote API"
+ noindex="false"
+ classpath="${classpath}">
+
+ <fileset
+ dir="${project.dir}"
+ defaultexcludes="yes">
+ <include
+ name="**/*Remote.java" />
+ </fileset>
+ </javadoc>
+
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ </profile>
+
</profiles>
</project>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index e960104..eafa5ae 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -571,6 +571,76 @@
</dependency>
</dependencies>
</profile>
- </profiles>
+
+ <profile>
+ <id>javadoc</id>
+ <activation>
+ <property>
+ <name>javadoc.outputDirectory</name>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>javadoc-remote-api</id>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <property
+ name="javadoc.outputDirectory"
+ value="${javadoc.outputDirectory}" />
+ <property
+ name="project.dir"
+ value="./src/main/java/org/rhq/enterprise/server" />
+ <property
+ name="maven.compile.classpath"
+ refid="maven.compile.classpath" />
+
+ <javadoc
+ destdir="${javadoc.outputDirectory}/remote-api"
+ author="true"
+ version="true"
+ windowtitle="Remote API"
+ noindex="false">
+ <classpath>
+ <pathelement
+ path="${maven.compile.classpath}" />
+ </classpath>
+ <fileset
+ dir="${project.dir}"
+ defaultexcludes="yes">
+ <include
+ name="**/*Remote.java" />
+ </fileset>
+ <link
+ href="../domain" />
+ <link
+ href="../plugin-api" />
+ <link
+ href="http://java.sun.com/j2se/1.5.0/docs/api/" />
+ <bottom><![CDATA[Copyright © 2008-2009 <a href="http://rhq-project.org/">Red Hat, Inc.</a>. All Rights Reserved.
+]]></bottom>
+ </javadoc>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ </profile>
+
+ </profiles>
+
</project>
diff --git a/modules/pom.xml b/modules/pom.xml
index 9954974..9512735 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -1,88 +1,104 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-parent</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ </parent>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-modules-parent</artifactId>
- <packaging>pom</packaging>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-modules-parent</artifactId>
+ <packaging>pom</packaging>
- <name>RHQ Modules</name>
- <description>parent POM for all RHQ modules</description>
+ <name>RHQ Modules</name>
+ <description>parent POM for all RHQ modules</description>
- <scm>
- <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules</connection>
- <developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules</developerConnection>
- </scm>
+ <scm>
+ <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules</connection>
+ <developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules</developerConnection>
+ </scm>
- <properties>
- <scm.module.path>modules/</scm.module.path>
- </properties>
+ <properties>
+ <scm.module.path>modules/</scm.module.path>
+ </properties>
- <profiles>
+ <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>core</module>
- <module>common</module>
- <module>plugins</module>
- <module>helpers</module>
- <module>enterprise</module>
- </modules>
- </profile>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>core</module>
+ <module>common</module>
+ <module>plugins</module>
+ <module>helpers</module>
+ <module>enterprise</module>
+ </modules>
+ </profile>
- <profile>
- <id>agent</id>
- <activation>
- <property>
- <name>agent</name>
- </property>
- </activation>
- <modules>
- <module>core</module>
- <module>enterprise/comm</module>
- <module>enterprise/agent</module>
- <module>enterprise/agentupdate</module>
- </modules>
- </profile>
+ <profile>
+ <id>agent</id>
+ <activation>
+ <property>
+ <name>agent</name>
+ </property>
+ </activation>
+ <modules>
+ <module>core</module>
+ <module>enterprise/comm</module>
+ <module>enterprise/agent</module>
+ <module>enterprise/agentupdate</module>
+ </modules>
+ </profile>
- <profile>
- <id>core</id>
- <activation>
- <property>
- <name>core</name>
- </property>
- </activation>
- <modules>
- <module>core</module>
- <module>common</module>
- <module>helpers</module>
- <module>enterprise</module>
- </modules>
- </profile>
+ <profile>
+ <id>core</id>
+ <activation>
+ <property>
+ <name>core</name>
+ </property>
+ </activation>
+ <modules>
+ <module>core</module>
+ <module>common</module>
+ <module>helpers</module>
+ <module>enterprise</module>
+ </modules>
+ </profile>
- <profile>
- <id>plugins</id>
- <activation>
- <property>
- <name>plugins</name>
- </property>
- </activation>
- </profile>
+ <profile>
+ <id>plugins</id>
+ <activation>
+ <property>
+ <name>plugins</name>
+ </property>
+ </activation>
+ </profile>
- </profiles>
+ <profile>
+ <id>javadoc</id>
+ <activation>
+ <property>
+ <name>javadoc.outputDirectory</name>
+ </property>
+ </activation>
+ <modules>
+ <module>core</module>
+ <module>enterprise</module>
+ </modules>
+ </profile>
- <modules>
- <module>test-utils</module>
- </modules>
+ </profiles>
+
+ <modules>
+ <module>test-utils</module>
+ </modules>
</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ca7f4c7..2525d5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -459,7 +459,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</plugin>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
commit f736032f02e06b945462248075a6de11e806e1ff
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Dec 30 09:44:38 2009 -0500
Git forced commit due to a Line Termination issue.
diff --git a/modules/core/domain/src/main/java/META-INF/MANIFEST.MF b/modules/core/domain/src/main/java/META-INF/MANIFEST.MF
index 3090f97..7d3b7e3 100644
--- a/modules/core/domain/src/main/java/META-INF/MANIFEST.MF
+++ b/modules/core/domain/src/main/java/META-INF/MANIFEST.MF
@@ -1,4 +1,4 @@
-Manifest-Version: 1.0
-Class-Path: i18nlog-1.0.9.jar jaxb-api-2.1.jar stax-api-1.0-2.jar acti
- vation-1.1.jar rhq-core-util-1.4.0-SNAPSHOT.jar jdom-1.0.jar
-
+Manifest-Version: 1.0
+Class-Path: i18nlog-1.0.9.jar jaxb-api-2.1.jar stax-api-1.0-2.jar acti
+ vation-1.1.jar rhq-core-util-1.4.0-SNAPSHOT.jar jdom-1.0.jar
+
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/classes/messages.properties b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/classes/messages.properties
index 06d7c32..13a3a73 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/classes/messages.properties
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/classes/messages.properties
@@ -17,19 +17,19 @@ javax.faces.validator.DoubleRangeValidator.NOT_IN_RANGE = For property "{2}", th
youareviewingraw = You are viewing this in files mode.
youareviewingstructured = You are viewing this in structured mode.
-editstructured=Change Properties
-editraw=Edit Files
+editstructured=Change Properties
+editraw=Edit Files
switch2 = Switch to
raw = files mode
structured = structured mode
files = List of files
currentfile = Current File
-uncommitted = file has uncommitted changes
-discard=Discard Changes
-commit=Commit Changes
-fullscreen=Full Screen
-upload=Upload
-save=save
-download=Download
-nopermissionedit=You do not have permission to edit this resource's configuration
+uncommitted = file has uncommitted changes
+discard=Discard Changes
+commit=Commit Changes
+fullscreen=Full Screen
+upload=Upload
+save=save
+download=Download
+nopermissionedit=You do not have permission to edit this resource's configuration
uploadcomplete=Back
\ No newline at end of file
diff --git a/modules/enterprise/server/jar/src/main/java/META-INF/MANIFEST.MF b/modules/enterprise/server/jar/src/main/java/META-INF/MANIFEST.MF
index 6bb10a8..4c71d9a 100644
--- a/modules/enterprise/server/jar/src/main/java/META-INF/MANIFEST.MF
+++ b/modules/enterprise/server/jar/src/main/java/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
-Manifest-Version: 1.0
-Class-Path: i18nlog-1.0.9.jar junit-3.8.1.jar rhq-enterprise-comm-1.4.
- 0-SNAPSHOT.jar rhq-core-util-1.4.0-SNAPSHOT.jar jdom-1.0.jar rhq-core
- -comm-api-1.4.0-SNAPSHOT.jar dom4j-1.6.1-jboss.jar getopt-1.0.13.jar
- jboss-remoting-2.2.2.SP8.jar jboss-serialization-1.0.3.GA.jar concurr
- ent-1.3.4.jar rhq-enterprise-server-xml-schemas-1.4.0-SNAPSHOT.jar rh
- q-core-client-api-1.4.0-SNAPSHOT.jar jaxb-impl-2.1.6.jar rhq-core-dbu
- tils-1.4.0-SNAPSHOT.jar ant-1.6.5.jar safe-invoker-1.4.0-SNAPSHOT.jar
- jbossws-native-core-3.1.1.GA.jar jbossws-spi-1.1.1.GA.jar commons-be
- anutils-1.6.1.jar commons-collections-3.2.jar commons-httpclient-3.0.
- 1.jar commons-codec-1.2.jar commons-validator-1.1.4.jar xml-apis-1.0.
- b2.jar jboss-cache-1.4.1.SP9.jar jbpm-3.1.1.jar snmp4j-1.8.2.jar post
- gresql-8.4-701.jdbc3.jar rss4j-0.92-on.2.jar
-
+Manifest-Version: 1.0
+Class-Path: i18nlog-1.0.9.jar junit-3.8.1.jar rhq-enterprise-comm-1.4.
+ 0-SNAPSHOT.jar rhq-core-util-1.4.0-SNAPSHOT.jar jdom-1.0.jar rhq-core
+ -comm-api-1.4.0-SNAPSHOT.jar dom4j-1.6.1-jboss.jar getopt-1.0.13.jar
+ jboss-remoting-2.2.2.SP8.jar jboss-serialization-1.0.3.GA.jar concurr
+ ent-1.3.4.jar rhq-enterprise-server-xml-schemas-1.4.0-SNAPSHOT.jar rh
+ q-core-client-api-1.4.0-SNAPSHOT.jar jaxb-impl-2.1.6.jar rhq-core-dbu
+ tils-1.4.0-SNAPSHOT.jar ant-1.6.5.jar safe-invoker-1.4.0-SNAPSHOT.jar
+ jbossws-native-core-3.1.1.GA.jar jbossws-spi-1.1.1.GA.jar commons-be
+ anutils-1.6.1.jar commons-collections-3.2.jar commons-httpclient-3.0.
+ 1.jar commons-codec-1.2.jar commons-validator-1.1.4.jar xml-apis-1.0.
+ b2.jar jboss-cache-1.4.1.SP9.jar jbpm-3.1.1.jar snmp4j-1.8.2.jar post
+ gresql-8.4-701.jdbc3.jar rss4j-0.92-on.2.jar
+
14 years, 4 months
[rhq] Changes to 'linux-config-dev'
by Jay Shaughnessy
New branch 'linux-config-dev' available with the following commits:
commit 7e25219242f643a3347b267d7c812b1c0ef921b9
Merge: 90c6808e887884250e118815151cc2be0ff999e7 3a7357969cc44c40ffd031dd2244023221fee0bb
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Jan 4 09:23:20 2010 -0500
Merge branch 'linux-config' into linux-config-dev
commit 90c6808e887884250e118815151cc2be0ff999e7
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Jan 4 09:21:11 2010 -0500
Trivial format change.
commit 5999791dd6419bf3d484033095fd8dd8480e0aa2
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Dec 30 17:52:57 2009 -0500
[BZ-545596] Fixed regression in refresh period menu item.
commit cc579c92b275ce5563f1f44bdefe6fd574e98d77
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Dec 30 15:02:31 2009 -0500
Added javadoc profiles in various places for public API's. To generate
a full set of jdoc execute:
mvn compile -Djavadoc.outputDirectory=<jdocParentDir>
from (and in this order):
core/domain
core
enterprise/server/jar
enterprise/remoting/client-api
14 years, 4 months