[jboss-svn-commits] JBL Code SVN: r20355 - in labs/jbossesb/workspace/maeste/product: services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db and 13 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jun 6 10:42:55 EDT 2008
Author: maeste
Date: 2008-06-06 10:42:54 -0400 (Fri, 06 Jun 2008)
New Revision: 20355
Added:
labs/jbossesb/workspace/maeste/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713_01.xml
labs/jbossesb/workspace/maeste/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713_02.xml
labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/postgresql/
labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/postgresql/create_database.sql
labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/postgresql/insert_rows.sql
labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/postgresql/management-ds.xml
labs/jbossesb/workspace/maeste/product/tools/console/management/postgresql.properties
labs/jbossesb/workspace/maeste/product/tools/console/management/src/main/resources/postgresql/
labs/jbossesb/workspace/maeste/product/tools/console/management/src/main/resources/postgresql/monitoring-mappings.hbm.xml
Removed:
labs/jbossesb/workspace/maeste/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713.xml
labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/postgresql/create_database.sql
labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/postgresql/insert_rows.sql
labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/postgresql/management-ds.xml
labs/jbossesb/workspace/maeste/product/tools/console/management/src/main/resources/postgresql/monitoring-mappings.hbm.xml
Modified:
labs/jbossesb/workspace/maeste/product/install/conf/actionArtifactMap.properties
labs/jbossesb/workspace/maeste/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java
labs/jbossesb/workspace/maeste/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java
labs/jbossesb/workspace/maeste/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/JBESB_1713_SoapUIClientServiceMBeanUnitTest.java
labs/jbossesb/workspace/maeste/product/tools/console/MANAGEMENT-README.txt
labs/jbossesb/workspace/maeste/product/tools/console/management-esb/build.xml
labs/jbossesb/workspace/maeste/product/tools/console/management-esb/db.properties
labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/hsqldb/management-ds.xml
labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/mysql/management-ds.xml
labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/oracle/management-ds.xml
labs/jbossesb/workspace/maeste/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/OperationsFiler.java
Log:
fixed few bugs. Basic functionality provided
Modified: labs/jbossesb/workspace/maeste/product/install/conf/actionArtifactMap.properties
===================================================================
--- labs/jbossesb/workspace/maeste/product/install/conf/actionArtifactMap.properties 2008-06-06 14:31:43 UTC (rev 20354)
+++ labs/jbossesb/workspace/maeste/product/install/conf/actionArtifactMap.properties 2008-06-06 14:42:54 UTC (rev 20355)
@@ -46,6 +46,7 @@
# smooks.esb actions
org.jboss.soa.esb.actions.converters.SmooksTransformer=smooks.esb
+org.jboss.soa.esb.actions.smooks.SmooksAction=smooks.esb
# management.esb actions
org.jboss.soa.esb.monitoring.server.DataFilerAction=management.esb
Modified: labs/jbossesb/workspace/maeste/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java
===================================================================
--- labs/jbossesb/workspace/maeste/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java 2008-06-06 14:31:43 UTC (rev 20354)
+++ labs/jbossesb/workspace/maeste/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java 2008-06-06 14:42:54 UTC (rev 20355)
@@ -374,8 +374,8 @@
catch (final SQLException e)
{
if (logger.isDebugEnabled()) {
- logger.debug("Deadlocks may occur under normal processing.");
- logger.debug(e.getMessage(), e);
+ logger.debug("Deadlocks may occur under normal processing.");
+ logger.debug(e.getMessage(), e);
}
}
Modified: labs/jbossesb/workspace/maeste/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java
===================================================================
--- labs/jbossesb/workspace/maeste/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java 2008-06-06 14:31:43 UTC (rev 20354)
+++ labs/jbossesb/workspace/maeste/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java 2008-06-06 14:42:54 UTC (rev 20355)
@@ -260,6 +260,10 @@
} else if(collectionSize == 1) {
// It's a collection, but no need to clone coz we
// already have an entry for it...
+ if(clonePoint == element) {
+ // If the element itself is the clone point, add the OGNL expression attribute...
+ element.setAttributeNS(OGNLUtils.JBOSSESB_SOAP_NS, OGNLUtils.JBOSSESB_SOAP_NS_PREFIX + OGNLUtils.OGNL_ATTRIB, ognl + "[0]");
+ }
} else {
// It's a collection and we need to do some cloning
if(clonePoint != null) {
Modified: labs/jbossesb/workspace/maeste/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/JBESB_1713_SoapUIClientServiceMBeanUnitTest.java
===================================================================
--- labs/jbossesb/workspace/maeste/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/JBESB_1713_SoapUIClientServiceMBeanUnitTest.java 2008-06-06 14:31:43 UTC (rev 20354)
+++ labs/jbossesb/workspace/maeste/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/JBESB_1713_SoapUIClientServiceMBeanUnitTest.java 2008-06-06 14:42:54 UTC (rev 20355)
@@ -60,18 +60,16 @@
public long arg6 = 2;
}
- private void addBlahs(List<String> trains) {
- trains.add(new String("1111"));
- trains.add(new String("2222"));
- trains.add(new String("3333"));
- trains.add(new String("4444"));
+ private void addBlahs(List<String> trains, int num) {
+ for(int i = 0; i < num; i++) {
+ trains.add(String.valueOf(i + 1));
+ }
}
- private void addRoles(List<String> roles) {
- roles.add(new String("Role 1"));
- roles.add(new String("Role 2"));
- roles.add(new String("Role 3"));
- roles.add(new String("Role 4"));
+ private void addRoles(List<String> roles, int num) {
+ for(int i = 0; i < num; i++) {
+ roles.add(new String("Role " + (i + 1)));
+ }
}
private static final String WSDL_LOCATAION = "src/test/java/org/jboss/soa/esb/services/soapui";
@@ -80,8 +78,16 @@
protected void setUp() throws Exception {
properties = new Properties();
}
-
- public void test_JBESB_1713() throws IOException, SAXException, ConfigurationException {
+
+ public void test_JBESB_1713_single() throws IOException, SAXException, ConfigurationException {
+ test_JBESB_1713(1, "expected_JBESB_1713_01.xml");
+ }
+
+ public void test_JBESB_1713_multiple() throws IOException, SAXException, ConfigurationException {
+ test_JBESB_1713(4, "expected_JBESB_1713_02.xml");
+ }
+
+ public void test_JBESB_1713(int num, String expected) throws IOException, SAXException, ConfigurationException {
File wsdlFile = new File(WSDL_LOCATAION + "/handdator.wsdl");
SoapUIClientService mbean = new SoapUIClientService();
Map params = new HashMap();
@@ -93,13 +99,13 @@
List<String> blahs1 = new ArrayList<String>();
List<String> roles1 = new ArrayList<String>();
- String[] blahs2 = new String[4];
- String[] roles2 = new String[4];
+ String[] blahs2 = new String[num];
+ String[] roles2 = new String[num];
properties.setProperty(HttpClientFactory.TARGET_HOST_URL, wsdlFile.toURI().toString());
- addBlahs(blahs1);
- addRoles(roles1);
+ addBlahs(blahs1, num);
+ addRoles(roles1, num);
postBlahMessage1.arg1 = blahs1;
postBlahMessage1.arg2 = roles1;
blahs1.toArray(blahs2);
@@ -110,13 +116,13 @@
params.put("postBlahMessage", postBlahMessage1);
String message = mbean.buildRequest(wsdlFile.toURI().toString(), "postBlahMessage", params, properties, null, null);
- assertTrue("Generated SOAP message not as expected. See expected_JBESB_1713.xml. Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream("expected_JBESB_1713.xml"), new ByteArrayInputStream(message.getBytes())));
+ assertTrue("Generated SOAP message not as expected. See " + expected + ". Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream(expected), new ByteArrayInputStream(message.getBytes())));
params.put("postBlahMessage", postBlahMessage2);
message = mbean.buildRequest(wsdlFile.toURI().toString(), "postBlahMessage", params, properties, null, null);
- assertTrue("Generated SOAP message not as expected. See expected_JBESB_1713.xml. Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream("expected_JBESB_1713.xml"), new ByteArrayInputStream(message.getBytes())));
+ assertTrue("Generated SOAP message not as expected. See " + expected + ". Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream(expected), new ByteArrayInputStream(message.getBytes())));
}
// Lifted from milyn commons
Deleted: labs/jbossesb/workspace/maeste/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713.xml
===================================================================
--- labs/jbossesb/workspace/maeste/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713.xml 2008-06-06 14:31:43 UTC (rev 20354)
+++ labs/jbossesb/workspace/maeste/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713.xml 2008-06-06 14:42:54 UTC (rev 20355)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:x="http://x.y.x/">
- <soapenv:Header/>
- <soapenv:Body>
- <x:postBlahMessage>
- <!--Optional:-->
- <arg0>argument 0</arg0>
- <!--Zero or more repetitions: - cloned-->
- <arg1>1111</arg1>
-<arg1>2222</arg1>
-<arg1>3333</arg1>
-<arg1>4444</arg1>
- <!--Zero or more repetitions: - cloned-->
- <arg2>Role 1</arg2>
-<arg2>Role 2</arg2>
-<arg2>Role 3</arg2>
-<arg2>Role 4</arg2>
- <arg3>true</arg3>
- <!--Optional:-->
- <arg4>argument 4</arg4>
- <arg5>1</arg5>
- <arg6>2</arg6>
- </x:postBlahMessage>
- </soapenv:Body>
-</soapenv:Envelope>
Copied: labs/jbossesb/workspace/maeste/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713_01.xml (from rev 20330, labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713_01.xml)
===================================================================
--- labs/jbossesb/workspace/maeste/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713_01.xml (rev 0)
+++ labs/jbossesb/workspace/maeste/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713_01.xml 2008-06-06 14:42:54 UTC (rev 20355)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:x="http://x.y.x/">
+ <soapenv:Header/>
+ <soapenv:Body>
+ <x:postBlahMessage>
+ <!--Optional:-->
+ <arg0>argument 0</arg0>
+ <!--Zero or more repetitions: - cloned-->
+ <arg1>1</arg1>
+ <!--Zero or more repetitions: - cloned-->
+ <arg2>Role 1</arg2>
+ <arg3>true</arg3>
+ <!--Optional:-->
+ <arg4>argument 4</arg4>
+ <arg5>1</arg5>
+ <arg6>2</arg6>
+ </x:postBlahMessage>
+ </soapenv:Body>
+</soapenv:Envelope>
Copied: labs/jbossesb/workspace/maeste/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713_02.xml (from rev 20330, labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713_02.xml)
===================================================================
--- labs/jbossesb/workspace/maeste/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713_02.xml (rev 0)
+++ labs/jbossesb/workspace/maeste/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713_02.xml 2008-06-06 14:42:54 UTC (rev 20355)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:x="http://x.y.x/">
+ <soapenv:Header/>
+ <soapenv:Body>
+ <x:postBlahMessage>
+ <!--Optional:-->
+ <arg0>argument 0</arg0>
+ <!--Zero or more repetitions: - cloned-->
+ <arg1>1</arg1>
+<arg1>2</arg1>
+<arg1>3</arg1>
+<arg1>4</arg1>
+ <!--Zero or more repetitions: - cloned-->
+ <arg2>Role 1</arg2>
+<arg2>Role 2</arg2>
+<arg2>Role 3</arg2>
+<arg2>Role 4</arg2>
+ <arg3>true</arg3>
+ <!--Optional:-->
+ <arg4>argument 4</arg4>
+ <arg5>1</arg5>
+ <arg6>2</arg6>
+ </x:postBlahMessage>
+ </soapenv:Body>
+</soapenv:Envelope>
Modified: labs/jbossesb/workspace/maeste/product/tools/console/MANAGEMENT-README.txt
===================================================================
--- labs/jbossesb/workspace/maeste/product/tools/console/MANAGEMENT-README.txt 2008-06-06 14:31:43 UTC (rev 20354)
+++ labs/jbossesb/workspace/maeste/product/tools/console/MANAGEMENT-README.txt 2008-06-06 14:42:54 UTC (rev 20355)
@@ -17,7 +17,9 @@
In the management-esb directory there is a db.properties file. In order
to change the database from hsqldb to mysql or oracle, edit this file and
-change the db property to "mysql" or "oracle".
+change the db property to "mysql", "oracle" or "postgreql". Also, change
+the db.username and db.password to the username and password setup for
+the database.
Next, change the management-esb/src/main/resources/<db>/management-ds.xml
file so that the settings match the datasource for your database.
@@ -29,7 +31,11 @@
For MySQL, it may be necessary to create the database "statistics" before
deploying if you have not edited the management-ds.xml file.
+For Postgres, it may be necessary to create the database "jbossesb" or
+if you have modified the postgres management-ds.xml file, create the
+database that was named in the database url.
+
Collection Periods :
The period of time in between collections is by default 10 minutes, but
Copied: labs/jbossesb/workspace/maeste/product/tools/console/management/postgresql.properties (from rev 20330, labs/jbossesb/trunk/product/tools/console/management/postgresql.properties)
===================================================================
--- labs/jbossesb/workspace/maeste/product/tools/console/management/postgresql.properties (rev 0)
+++ labs/jbossesb/workspace/maeste/product/tools/console/management/postgresql.properties 2008-06-06 14:42:54 UTC (rev 20355)
@@ -0,0 +1,4 @@
+db.dialect=org.hibernate.dialect.PostgreSQLDialect
+connection.datasource=java:/ManagementDS
+db.datasource=ManagementDS
+database.depends=
Modified: labs/jbossesb/workspace/maeste/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/OperationsFiler.java
===================================================================
--- labs/jbossesb/workspace/maeste/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/OperationsFiler.java 2008-06-06 14:31:43 UTC (rev 20354)
+++ labs/jbossesb/workspace/maeste/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/OperationsFiler.java 2008-06-06 14:42:54 UTC (rev 20355)
@@ -87,7 +87,32 @@
}
return null;
}
+
+ /**
+ * Gets the operations that match the passed in arguements.
+ *
+ * @param sess session
+ * @param objectname object name
+ * @param attribute attribute name
+ * @param servername servername
+ * @return JMXAttribute
+ */
+ public JMXOperation getOperation(Session sess, String objectname, String operation, String servername) {
+ String query = "from JMXOperation jmxo "
+ + "where objectname = :objectname and operation = :operation and servername = :servername";
+
+ List result = sess.createQuery(query)
+ .setString("objectname", objectname)
+ .setString("operation", operation)
+ .setString("servername", servername).list();
+ if (result.size() > 0) {
+ JMXOperation jmxo = (JMXOperation) result.get(0);
+ return jmxo;
+ }
+ return null;
+ }
+
/**
* Create a JMXAttribute object based on the StatisticBean info and stores it.
* @param f_sb statistics bean
@@ -113,7 +138,7 @@
sess = (Session) MonitoringSessionFactory.getInstance().openSession();
tx = sess.beginTransaction();
- JMXOperation oper = getOperation(sess, f_ob.getObjectName(), f_ob.getOperation());
+ JMXOperation oper = getOperation(sess, f_ob.getObjectName(), f_ob.getOperation(), f_ob.getServer());
if (oper == null) {
oper = new JMXOperation(f_ob.getObjectName(), f_ob.getServer(), f_ob.getOperation(),
f_ob.getDescription(), f_ob.getReturntype(), true);
Copied: labs/jbossesb/workspace/maeste/product/tools/console/management/src/main/resources/postgresql (from rev 20330, labs/jbossesb/trunk/product/tools/console/management/src/main/resources/postgresql)
Deleted: labs/jbossesb/workspace/maeste/product/tools/console/management/src/main/resources/postgresql/monitoring-mappings.hbm.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/src/main/resources/postgresql/monitoring-mappings.hbm.xml 2008-06-05 11:13:30 UTC (rev 20330)
+++ labs/jbossesb/workspace/maeste/product/tools/console/management/src/main/resources/postgresql/monitoring-mappings.hbm.xml 2008-06-06 14:42:54 UTC (rev 20355)
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping>
- <class name="org.jboss.soa.esb.monitoring.pojo.JMXPattern" table="JMXPATTERN">
- <id name="id" column="id" type="java.lang.Long" unsaved-value="0">
- <generator class="native"/>
- </id>
- <property name="classpattern" type="java.lang.String" column="classpattern"/>
- <property name="keyvalue" type="java.lang.String" column="keyvalue"/>
- </class>
- <class name="org.jboss.soa.esb.monitoring.pojo.JMXData" table="JMXDATA">
- <id name="id" column="id" type="java.lang.Long" unsaved-value="0">
- <generator class="native"/>
- </id>
- <many-to-one name="attribute" column="STATID"/>
- <property name="server" type="java.lang.String" column="SERVER"/>
- <property name="statdate" type="java.util.Date" column="STATDATE"/>
- <property name="timevalue" type="java.lang.Float" column="timevalue"/>
- <property name="countvalue" type="java.lang.Integer" column="countvalue"/>
- <property name="textvalue" type="java.lang.String" column="textvalue"/>
- </class>
- <class name="org.jboss.soa.esb.monitoring.pojo.JMXOperationResult" table="JMXOPERATIONRESULT">
- <id name="id" column="id" type="java.lang.Long" unsaved-value="0">
- <generator class="native"/>
- </id>
- <many-to-one name="operation" column="OPID"/>
- <property name="servername" type="java.lang.String" column="SERVER"/>
- <property name="statdate" type="timestamp" column="STATDATE"/>
- <property name="result" type="java.lang.String" column="RESULT"/>
- </class>
- <class name="org.jboss.soa.esb.monitoring.pojo.JMXAttribute" table="JMXATTRIBUTE">
- <id name="id" column="statid" type="java.lang.Long" unsaved-value="0">
- <generator class="native"/>
- </id>
- <property name="objectname" type="java.lang.String" column="objectname"/>
- <property name="attribute" type="java.lang.String" column="attribute"/>
- </class>
- <class name="org.jboss.soa.esb.monitoring.pojo.JMXOperation" table="JMXOPERATION">
- <id name="id" column="opid" type="java.lang.Long" unsaved-value="0">
- <generator class="native"/>
- </id>
- <property name="objectname" type="java.lang.String" column="objectname"/>
- <property name="operation" type="java.lang.String" column="operation"/>
- <property name="description" type="java.lang.String" column="description"/>
- <property name="returntype" type="java.lang.String" column="returntype"/>
- <property name="servername" type="java.lang.String" column="servername"/>
- <property name="activeflag" type="java.lang.Boolean" column="activeflag"/>
- </class>
-</hibernate-mapping>
Copied: labs/jbossesb/workspace/maeste/product/tools/console/management/src/main/resources/postgresql/monitoring-mappings.hbm.xml (from rev 20330, labs/jbossesb/trunk/product/tools/console/management/src/main/resources/postgresql/monitoring-mappings.hbm.xml)
===================================================================
--- labs/jbossesb/workspace/maeste/product/tools/console/management/src/main/resources/postgresql/monitoring-mappings.hbm.xml (rev 0)
+++ labs/jbossesb/workspace/maeste/product/tools/console/management/src/main/resources/postgresql/monitoring-mappings.hbm.xml 2008-06-06 14:42:54 UTC (rev 20355)
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping>
+ <class name="org.jboss.soa.esb.monitoring.pojo.JMXPattern" table="JMXPATTERN">
+ <id name="id" column="id" type="java.lang.Long" unsaved-value="0">
+ <generator class="native"/>
+ </id>
+ <property name="classpattern" type="java.lang.String" column="classpattern"/>
+ <property name="keyvalue" type="java.lang.String" column="keyvalue"/>
+ </class>
+ <class name="org.jboss.soa.esb.monitoring.pojo.JMXData" table="JMXDATA">
+ <id name="id" column="id" type="java.lang.Long" unsaved-value="0">
+ <generator class="native"/>
+ </id>
+ <many-to-one name="attribute" column="STATID"/>
+ <property name="server" type="java.lang.String" column="SERVER"/>
+ <property name="statdate" type="java.util.Date" column="STATDATE"/>
+ <property name="timevalue" type="java.lang.Float" column="timevalue"/>
+ <property name="countvalue" type="java.lang.Integer" column="countvalue"/>
+ <property name="textvalue" type="java.lang.String" column="textvalue"/>
+ </class>
+ <class name="org.jboss.soa.esb.monitoring.pojo.JMXOperationResult" table="JMXOPERATIONRESULT">
+ <id name="id" column="id" type="java.lang.Long" unsaved-value="0">
+ <generator class="native"/>
+ </id>
+ <many-to-one name="operation" column="OPID"/>
+ <property name="servername" type="java.lang.String" column="SERVER"/>
+ <property name="statdate" type="timestamp" column="STATDATE"/>
+ <property name="result" type="java.lang.String" column="RESULT"/>
+ </class>
+ <class name="org.jboss.soa.esb.monitoring.pojo.JMXAttribute" table="JMXATTRIBUTE">
+ <id name="id" column="statid" type="java.lang.Long" unsaved-value="0">
+ <generator class="native"/>
+ </id>
+ <property name="objectname" type="java.lang.String" column="objectname"/>
+ <property name="attribute" type="java.lang.String" column="attribute"/>
+ </class>
+ <class name="org.jboss.soa.esb.monitoring.pojo.JMXOperation" table="JMXOPERATION">
+ <id name="id" column="opid" type="java.lang.Long" unsaved-value="0">
+ <generator class="native"/>
+ </id>
+ <property name="objectname" type="java.lang.String" column="objectname"/>
+ <property name="operation" type="java.lang.String" column="operation"/>
+ <property name="description" type="java.lang.String" column="description"/>
+ <property name="returntype" type="java.lang.String" column="returntype"/>
+ <property name="servername" type="java.lang.String" column="servername"/>
+ <property name="activeflag" type="java.lang.Boolean" column="activeflag"/>
+ </class>
+</hibernate-mapping>
Modified: labs/jbossesb/workspace/maeste/product/tools/console/management-esb/build.xml
===================================================================
--- labs/jbossesb/workspace/maeste/product/tools/console/management-esb/build.xml 2008-06-06 14:31:43 UTC (rev 20354)
+++ labs/jbossesb/workspace/maeste/product/tools/console/management-esb/build.xml 2008-06-06 14:42:54 UTC (rev 20355)
@@ -8,7 +8,7 @@
<property file="${install.dir}/deployment.properties"/>
<property name="mgmt.esb.dir" value="${console.dir}/management-esb"/>
- <property file="${mgmt.esb.dir}/db.properties"/>
+ <property file="${mgmt.esb.dir}/db.properties"/>
<property file="${console.dir}/management/${db}.properties"/>
<property name="build.dir" location="${mgmt.esb.dir}/build"/>
@@ -108,7 +108,9 @@
</target>
<target name="copy-datasource" if="management.ds.available">
- <copy file="${mgmt.esb.dir}/src/main/resources/${db}/management-ds.xml" todir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy" overwrite="true"/>
+ <filter token="db.username" value="${db.username}"/>
+ <filter token="db.password" value="${db.password}"/>
+ <copy file="${mgmt.esb.dir}/src/main/resources/${db}/management-ds.xml" todir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy" filtering="true" overwrite="true"/>
</target>
<target name="deploy" depends="esb,copy-datasource" description="Deploy the WAR">
Modified: labs/jbossesb/workspace/maeste/product/tools/console/management-esb/db.properties
===================================================================
--- labs/jbossesb/workspace/maeste/product/tools/console/management-esb/db.properties 2008-06-06 14:31:43 UTC (rev 20354)
+++ labs/jbossesb/workspace/maeste/product/tools/console/management-esb/db.properties 2008-06-06 14:42:54 UTC (rev 20355)
@@ -1,2 +1,4 @@
db=hsqldb
+db.username=sa
+db.password=
pollMinuteFrequency=10
Modified: labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/hsqldb/management-ds.xml
===================================================================
--- labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/hsqldb/management-ds.xml 2008-06-06 14:31:43 UTC (rev 20354)
+++ labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/hsqldb/management-ds.xml 2008-06-06 14:42:54 UTC (rev 20355)
@@ -4,8 +4,8 @@
<jndi-name>ManagementDS</jndi-name>
<connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}ManagementDS</connection-url>
<driver-class>org.hsqldb.jdbcDriver</driver-class>
- <user-name>sa</user-name>
- <password></password>
+ <user-name>@db.username@</user-name>
+ <password>@db.password@</password>
<min-pool-size>5</min-pool-size>
<max-pool-size>20</max-pool-size>
<idle-timeout-minutes>0</idle-timeout-minutes>
Modified: labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/mysql/management-ds.xml
===================================================================
--- labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/mysql/management-ds.xml 2008-06-06 14:31:43 UTC (rev 20354)
+++ labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/mysql/management-ds.xml 2008-06-06 14:42:54 UTC (rev 20355)
@@ -14,8 +14,8 @@
<driver-class>com.mysql.jdbc.Driver</driver-class>
<!-- The login and password -->
- <user-name>root</user-name>
- <password></password>
+ <user-name>@db.username@</user-name>
+ <password>@db.password@</password>
<!-- The minimum connections in a pool/sub-pool. Pools are lazily constructed on first use -->
<min-pool-size>5</min-pool-size>
Modified: labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/oracle/management-ds.xml
===================================================================
--- labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/oracle/management-ds.xml 2008-06-06 14:31:43 UTC (rev 20354)
+++ labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/oracle/management-ds.xml 2008-06-06 14:42:54 UTC (rev 20355)
@@ -14,8 +14,8 @@
<driver-class>oracle.jdbc.driver.OracleDriver</driver-class>
<!-- The login and password -->
- <user-name>vfafacility</user-name>
- <password>vfa</password>
+ <user-name>@db.username@</user-name>
+ <password>@db.password@</password>
<!-- The minimum connections in a pool/sub-pool. Pools are lazily constructed on first use -->
<min-pool-size>5</min-pool-size>
Copied: labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/postgresql (from rev 20330, labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/postgresql)
Deleted: labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/postgresql/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/postgresql/create_database.sql 2008-06-05 11:13:30 UTC (rev 20330)
+++ labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/postgresql/create_database.sql 2008-06-06 14:42:54 UTC (rev 20355)
@@ -1,66 +0,0 @@
-
- create table JMXATTRIBUTE (
- statid bigserial,
- objectname varchar(255),
- attribute varchar(255),
- primary key (statid)
- );
-
- create table JMXDATA (
- id bigserial,
- STATID integer,
- SERVER varchar(255),
- STATDATE timestamp,
- timevalue float,
- countvalue integer,
- textvalue text,
- primary key (id)
- );
-
- create table JMXPATTERN (
- id bigserial,
- classpattern varchar(255),
- keyvalue varchar(255),
- primary key (id)
- );
-
- create table JMXOPERATION (
- opid bigserial,
- objectname varchar(255),
- operation varchar(255),
- description varchar(255),
- returntype varchar(255),
- servername varchar(255),
- activeflag boolean,
- primary key (opid)
- );
-
- create table JMXOPERATIONRESULT (
- id bigserial,
- opid bigint,
- server varchar(255),
- statdate timestamp,
- result varchar(255),
- primary key(id)
- );
-
- CREATE INDEX FKD2EA449F4522DA9E ON JMXDATA (STATID);
-
- alter table JMXDATA
- add constraint FKD2EA449F4522DA9E
- foreign key (STATID)
- references JMXATTRIBUTE (statid);
-
- CREATE INDEX FKD2EA449F4522DA9F ON JMXOPERATIONRESULT (OPID);
-
- alter table JMXOPERATIONRESULT
- add constraint FKD2EA449F4522DA9F
- foreign key (OPID)
- references JMXOPERATION(opid);
-
- CREATE SEQUENCE hibernate_sequence
- INCREMENT 1
- MINVALUE 1
- MAXVALUE 9223372036854775807
- START 1
- CACHE 1;
Copied: labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/postgresql/create_database.sql (from rev 20330, labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/postgresql/create_database.sql)
===================================================================
--- labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/postgresql/create_database.sql (rev 0)
+++ labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/postgresql/create_database.sql 2008-06-06 14:42:54 UTC (rev 20355)
@@ -0,0 +1,66 @@
+
+ create table JMXATTRIBUTE (
+ statid bigserial,
+ objectname varchar(255),
+ attribute varchar(255),
+ primary key (statid)
+ );
+
+ create table JMXDATA (
+ id bigserial,
+ STATID integer,
+ SERVER varchar(255),
+ STATDATE timestamp,
+ timevalue float,
+ countvalue integer,
+ textvalue text,
+ primary key (id)
+ );
+
+ create table JMXPATTERN (
+ id bigserial,
+ classpattern varchar(255),
+ keyvalue varchar(255),
+ primary key (id)
+ );
+
+ create table JMXOPERATION (
+ opid bigserial,
+ objectname varchar(255),
+ operation varchar(255),
+ description varchar(255),
+ returntype varchar(255),
+ servername varchar(255),
+ activeflag boolean,
+ primary key (opid)
+ );
+
+ create table JMXOPERATIONRESULT (
+ id bigserial,
+ opid bigint,
+ server varchar(255),
+ statdate timestamp,
+ result varchar(255),
+ primary key(id)
+ );
+
+ CREATE INDEX FKD2EA449F4522DA9E ON JMXDATA (STATID);
+
+ alter table JMXDATA
+ add constraint FKD2EA449F4522DA9E
+ foreign key (STATID)
+ references JMXATTRIBUTE (statid);
+
+ CREATE INDEX FKD2EA449F4522DA9F ON JMXOPERATIONRESULT (OPID);
+
+ alter table JMXOPERATIONRESULT
+ add constraint FKD2EA449F4522DA9F
+ foreign key (OPID)
+ references JMXOPERATION(opid);
+
+ CREATE SEQUENCE hibernate_sequence
+ INCREMENT 1
+ MINVALUE 1
+ MAXVALUE 9223372036854775807
+ START 1
+ CACHE 1;
Deleted: labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/postgresql/insert_rows.sql
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/postgresql/insert_rows.sql 2008-06-05 11:13:30 UTC (rev 20330)
+++ labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/postgresql/insert_rows.sql 2008-06-06 14:42:54 UTC (rev 20355)
@@ -1,9 +0,0 @@
-INSERT INTO JMXPATTERN (CLASSPATTERN, KEYVALUE) VALUES ('jboss.esb:*', 'service=MessageCounter');
-
-INSERT INTO JMXPATTERN (CLASSPATTERN, KEYVALUE) VALUES ('jboss.esb:*', 'category=MessageCounter');
-
-INSERT INTO JMXPATTERN (CLASSPATTERN, KEYVALUE) VALUES ('jboss.esb:*', 'category=SmooksMessageCounter');
-
-INSERT INTO JMXPATTERN (CLASSPATTERN, KEYVALUE) VALUES ('jboss.esb:*', 'listener-name=');
-
-INSERT INTO JMXPATTERN (CLASSPATTERN, KEYVALUE) VALUES ('jboss.esb:*', 'gateway-name=');
Copied: labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/postgresql/insert_rows.sql (from rev 20330, labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/postgresql/insert_rows.sql)
===================================================================
--- labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/postgresql/insert_rows.sql (rev 0)
+++ labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/postgresql/insert_rows.sql 2008-06-06 14:42:54 UTC (rev 20355)
@@ -0,0 +1,9 @@
+INSERT INTO JMXPATTERN (CLASSPATTERN, KEYVALUE) VALUES ('jboss.esb:*', 'service=MessageCounter');
+
+INSERT INTO JMXPATTERN (CLASSPATTERN, KEYVALUE) VALUES ('jboss.esb:*', 'category=MessageCounter');
+
+INSERT INTO JMXPATTERN (CLASSPATTERN, KEYVALUE) VALUES ('jboss.esb:*', 'category=SmooksMessageCounter');
+
+INSERT INTO JMXPATTERN (CLASSPATTERN, KEYVALUE) VALUES ('jboss.esb:*', 'listener-name=');
+
+INSERT INTO JMXPATTERN (CLASSPATTERN, KEYVALUE) VALUES ('jboss.esb:*', 'gateway-name=');
Deleted: labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/postgresql/management-ds.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/postgresql/management-ds.xml 2008-06-05 11:13:30 UTC (rev 20330)
+++ labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/postgresql/management-ds.xml 2008-06-06 14:42:54 UTC (rev 20355)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<datasources>
- <local-tx-datasource>
- <jndi-name>ManagementDS</jndi-name>
- <connection-url>jdbc:postgresql://${jboss.bind.address}:5432/jbossesb</connection-url>
- <driver-class>org.postgresql.Driver</driver-class>
- <user-name>@db.username@</user-name>
- <password>@db.password@</password>
- <metadata>
- <type-mapping>PostgreSQL 8.3</type-mapping>
- </metadata>
- </local-tx-datasource>
-</datasources>
-
Copied: labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/postgresql/management-ds.xml (from rev 20330, labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/postgresql/management-ds.xml)
===================================================================
--- labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/postgresql/management-ds.xml (rev 0)
+++ labs/jbossesb/workspace/maeste/product/tools/console/management-esb/src/main/resources/postgresql/management-ds.xml 2008-06-06 14:42:54 UTC (rev 20355)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<datasources>
+ <local-tx-datasource>
+ <jndi-name>ManagementDS</jndi-name>
+ <connection-url>jdbc:postgresql://${jboss.bind.address}:5432/jbossesb</connection-url>
+ <driver-class>org.postgresql.Driver</driver-class>
+ <user-name>@db.username@</user-name>
+ <password>@db.password@</password>
+ <metadata>
+ <type-mapping>PostgreSQL 8.3</type-mapping>
+ </metadata>
+ </local-tx-datasource>
+</datasources>
+
More information about the jboss-svn-commits
mailing list