[jboss-svn-commits] JBL Code SVN: r22351 - in labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console: management and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Sep 3 07:50:45 EDT 2008
Author: beve
Date: 2008-09-03 07:50:44 -0400 (Wed, 03 Sep 2008)
New Revision: 22351
Added:
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/src/main/resources/postgresql/
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/src/main/resources/postgresql/create_database.sql
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/src/main/resources/postgresql/insert_rows.sql
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/src/main/resources/postgresql/management-ds.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/postgresql.properties
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/resources/mysql/management-ds.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/resources/postgresql/
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/resources/postgresql/monitoring-mappings.hbm.xml
Modified:
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/MANAGEMENT-README.txt
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/build.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/db.properties
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/src/main/resources/hsqldb/management-ds.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/src/main/resources/oracle/management-ds.xml
Log:
Work for JBESB-1809 "postgres support for management.esb console in CP"
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/MANAGEMENT-README.txt
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/MANAGEMENT-README.txt 2008-09-03 11:00:07 UTC (rev 22350)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/MANAGEMENT-README.txt 2008-09-03 11:50:44 UTC (rev 22351)
@@ -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
Added: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/postgresql.properties
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/postgresql.properties (rev 0)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/postgresql.properties 2008-09-03 11:50:44 UTC (rev 22351)
@@ -0,0 +1,4 @@
+db.dialect=org.hibernate.dialect.PostgreSQLDialect
+connection.datasource=java:/ManagementDS
+db.datasource=ManagementDS
+database.depends=
Added: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/resources/mysql/management-ds.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/resources/mysql/management-ds.xml (rev 0)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/resources/mysql/management-ds.xml 2008-09-03 11:50:44 UTC (rev 22351)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- The Hypersonic embedded database JCA connection factory config -->
+
+<!-- $Id: hsqldb-ds.xml 63175 2007-05-21 16:26:06Z rrajesh $ -->
+
+<datasources>
+ <local-tx-datasource>
+ <jndi-name>ManagementDS</jndi-name>
+
+ <connection-url>jdbc:mysql://${jboss.bind.address}:3306/statistics</connection-url>
+
+ <!-- The driver class -->
+ <driver-class>com.mysql.jdbc.Driver</driver-class>
+
+ <!-- The login and 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>
+
+ <!-- The maximum connections in a pool/sub-pool -->
+ <max-pool-size>20</max-pool-size>
+ <connection-property name="autoReconnect">true</connection-property>
+ <metadata>
+ <type-mapping>mySQL</type-mapping>
+ </metadata>
+ </local-tx-datasource>
+</datasources>
Added: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/resources/postgresql/monitoring-mappings.hbm.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/resources/postgresql/monitoring-mappings.hbm.xml (rev 0)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/resources/postgresql/monitoring-mappings.hbm.xml 2008-09-03 11:50:44 UTC (rev 22351)
@@ -0,0 +1,60 @@
+<?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="sequence">
+ <param name="sequence">mgmt_hibernate_sequence</param>
+ </generator>
+ </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="sequence">
+ <param name="sequence">mgmt_hibernate_sequence</param>
+ </generator>
+ </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="sequence">
+ <param name="sequence">mgmt_hibernate_sequence</param>
+ </generator>
+ </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="sequence">
+ <param name="sequence">mgmt_hibernate_sequence</param>
+ </generator>
+ </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="sequence">
+ <param name="sequence">mgmt_hibernate_sequence</param>
+ </generator>
+ </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/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/build.xml 2008-09-03 11:00:07 UTC (rev 22350)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/build.xml 2008-09-03 11:50:44 UTC (rev 22351)
@@ -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/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/db.properties
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/db.properties 2008-09-03 11:00:07 UTC (rev 22350)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/db.properties 2008-09-03 11:50:44 UTC (rev 22351)
@@ -1,2 +1,4 @@
db=hsqldb
+db.username=sa
+db.password=
pollMinuteFrequency=10
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/src/main/resources/hsqldb/management-ds.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/src/main/resources/hsqldb/management-ds.xml 2008-09-03 11:00:07 UTC (rev 22350)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/src/main/resources/hsqldb/management-ds.xml 2008-09-03 11:50:44 UTC (rev 22351)
@@ -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/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/src/main/resources/oracle/management-ds.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/src/main/resources/oracle/management-ds.xml 2008-09-03 11:00:07 UTC (rev 22350)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/src/main/resources/oracle/management-ds.xml 2008-09-03 11:50:44 UTC (rev 22351)
@@ -14,8 +14,8 @@
<driver-class>oracle.jdbc.driver.OracleDriver</driver-class>
<!-- The login and password -->
- <user-name>oracle</user-name>
- <password>oracle</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>
Added: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/src/main/resources/postgresql/create_database.sql
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/src/main/resources/postgresql/create_database.sql (rev 0)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/src/main/resources/postgresql/create_database.sql 2008-09-03 11:50:44 UTC (rev 22351)
@@ -0,0 +1,77 @@
+ CREATE SEQUENCE mgmt_hibernate_sequence
+ INCREMENT 1
+ MINVALUE 1
+ MAXVALUE 9223372036854775807
+ START 1
+ CACHE 1;
+
+ create table JMXDATA (
+ id bigint,
+ STATID integer,
+ SERVER varchar(255),
+ STATDATE timestamp,
+ timevalue float,
+ countvalue integer,
+ textvalue text
+ );
+
+ create table JMXATTRIBUTE (
+ statid bigint,
+ objectname varchar(255),
+ attribute varchar(255)
+ );
+
+ create table JMXPATTERN (
+ id bigint,
+ classpattern varchar(255),
+ keyvalue varchar(255)
+ );
+
+ create table JMXOPERATION (
+ opid bigint,
+ objectname varchar(255),
+ operation varchar(255),
+ description varchar(255),
+ returntype varchar(255),
+ servername varchar(255),
+ activeflag boolean
+ );
+
+ create table JMXOPERATIONRESULT (
+ id bigint,
+ opid bigint,
+ server varchar(255),
+ statdate timestamp,
+ result varchar(255)
+ );
+ alter table JMXDATA
+ alter column id SET DEFAULT nextval('mgmt_hibernate_sequence');
+ alter table JMXATTRIBUTE
+ alter column statid SET DEFAULT nextval('mgmt_hibernate_sequence');
+ alter table JMXPATTERN
+ alter column id SET DEFAULT nextval('mgmt_hibernate_sequence');
+ alter table JMXOPERATION
+ alter column opid SET DEFAULT nextval('mgmt_hibernate_sequence');
+ alter table JMXOPERATIONRESULT
+ alter column id set DEFAULT nextval('mgmt_hibernate_sequence');
+ alter table JMXDATA
+ ADD primary key(id);
+ alter table JMXATTRIBUTE
+ ADD primary key(statid);
+ alter table JMXPATTERN
+ ADD primary key(id);
+ alter table JMXOPERATION
+ ADD primary key(opid);
+ alter table JMXOPERATIONRESULT
+ ADD 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);
+
Added: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/src/main/resources/postgresql/insert_rows.sql
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/src/main/resources/postgresql/insert_rows.sql (rev 0)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/src/main/resources/postgresql/insert_rows.sql 2008-09-03 11:50:44 UTC (rev 22351)
@@ -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=');
Added: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/src/main/resources/postgresql/management-ds.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/src/main/resources/postgresql/management-ds.xml (rev 0)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/src/main/resources/postgresql/management-ds.xml 2008-09-03 11:50:44 UTC (rev 22351)
@@ -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