[jboss-svn-commits] JBL Code SVN: r15440 - in labs/jbossesb/trunk/product/tools/console: management/src/main/java/org/jboss/soa/esb/monitoring/server and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Sep 28 12:20:15 EDT 2007
Author: tcunning
Date: 2007-09-28 12:20:15 -0400 (Fri, 28 Sep 2007)
New Revision: 15440
Modified:
labs/jbossesb/trunk/product/tools/console/management-esb/build.xml
labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/jbossesbmanagement-service.xml
labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/mysql/create_database.sql
labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/oracle/create_database.sql
labs/jbossesb/trunk/product/tools/console/management/mysql.properties
labs/jbossesb/trunk/product/tools/console/management/oracle.properties
labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerJob.java
labs/jbossesb/trunk/product/tools/console/management/src/main/resources/mysql/monitoring-mappings.hbm.xml
labs/jbossesb/trunk/product/tools/console/management/src/main/resources/oracle/monitoring-mappings.hbm.xml
Log:
bug:JBESB-917
Add mysql/oracle support for management console.
Modified: labs/jbossesb/trunk/product/tools/console/management/mysql.properties
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/mysql.properties 2007-09-28 14:29:24 UTC (rev 15439)
+++ labs/jbossesb/trunk/product/tools/console/management/mysql.properties 2007-09-28 16:20:15 UTC (rev 15440)
@@ -1,3 +1,4 @@
db.dialect=org.hibernate.dialect.MySQLDialect
connection.datasource=java:/ManagementDS
db.datasource=ManagementDS
+database.depends=<depends>jboss.jdbc:datasource=ManagementDS,service=metadata</depends>
Modified: labs/jbossesb/trunk/product/tools/console/management/oracle.properties
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/oracle.properties 2007-09-28 14:29:24 UTC (rev 15439)
+++ labs/jbossesb/trunk/product/tools/console/management/oracle.properties 2007-09-28 16:20:15 UTC (rev 15440)
@@ -1,3 +1,4 @@
db.dialect=org.hibernate.dialect.OracleDialect
connection.datasource=java:/ManagementDS
db.datasource=ManagementDS
+database.depends=
Modified: labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerJob.java
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerJob.java 2007-09-28 14:29:24 UTC (rev 15439)
+++ labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerJob.java 2007-09-28 16:20:15 UTC (rev 15440)
@@ -59,7 +59,7 @@
public void execute (JobExecutionContext jobExecutionContext)
throws JobExecutionException {
DeliverOnlyCourier sender = null;
- logger.error("Collect statistics from EPRs");
+ logger.debug("Collect statistics from EPRs");
List list;
try {
list = RegistryUtil.getEprs(FilerAction.INTERNAL_CATEGORY, FilerAction.DATA_COLLECTOR_SERVICE_ACTION_NAME);
Modified: labs/jbossesb/trunk/product/tools/console/management/src/main/resources/mysql/monitoring-mappings.hbm.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/src/main/resources/mysql/monitoring-mappings.hbm.xml 2007-09-28 14:29:24 UTC (rev 15439)
+++ labs/jbossesb/trunk/product/tools/console/management/src/main/resources/mysql/monitoring-mappings.hbm.xml 2007-09-28 16:20:15 UTC (rev 15440)
@@ -26,8 +26,8 @@
<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"/>
+ <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>
@@ -43,6 +43,10 @@
<generator class="native"/>
</id>
<property name="objectname" type="java.lang.String" column="objectname"/>
- <property name="operation" type="java.lang.String" column="attribute"/>
+ <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/trunk/product/tools/console/management/src/main/resources/oracle/monitoring-mappings.hbm.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/src/main/resources/oracle/monitoring-mappings.hbm.xml 2007-09-28 14:29:24 UTC (rev 15439)
+++ labs/jbossesb/trunk/product/tools/console/management/src/main/resources/oracle/monitoring-mappings.hbm.xml 2007-09-28 16:20:15 UTC (rev 15440)
@@ -28,10 +28,12 @@
</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"/>
+ <generator class="sequence">
+ <param name="sequence">SEQ_JMX_OPERATION_RESULT</param>
+ </generator>
</id>
<many-to-one name="operation" column="OPID"/>
- <property name="server" type="java.lang.String" column="SERVER"/>
+ <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>
@@ -46,9 +48,15 @@
</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"/>
+ <generator class="sequence">
+ <param name="sequence">SEQ_JMX_OPERATION</param>
+ </generator>
</id>
<property name="objectname" type="java.lang.String" column="objectname"/>
<property name="operation" type="java.lang.String" column="attribute"/>
+ <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/trunk/product/tools/console/management-esb/build.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management-esb/build.xml 2007-09-28 14:29:24 UTC (rev 15439)
+++ labs/jbossesb/trunk/product/tools/console/management-esb/build.xml 2007-09-28 16:20:15 UTC (rev 15440)
@@ -78,6 +78,7 @@
todir="${mgmt.esb.dir}/build"
overwrite="true">
<filterset>
+ <filter token="database.depends" value="${database.depends}"/>
<filter token="db.datasource" value="${db.datasource}"/>
<filter token="connection.datasource" value="${connection.datasource}"/>
</filterset>
Modified: labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/jbossesbmanagement-service.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/jbossesbmanagement-service.xml 2007-09-28 14:29:24 UTC (rev 15439)
+++ labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/jbossesbmanagement-service.xml 2007-09-28 16:20:15 UTC (rev 15440)
@@ -11,7 +11,7 @@
create_database.sql,
insert_rows.sql
</attribute>
- <depends>jboss:database=ManagementDS,service=Hypersonic</depends>
<depends>jboss.jca:service=DataSourceBinding,name=ManagementDS</depends>
- </mbean>
+ @database.depends@
+ </mbean>
</server>
Modified: labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/mysql/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/mysql/create_database.sql 2007-09-28 14:29:24 UTC (rev 15439)
+++ labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/mysql/create_database.sql 2007-09-28 16:20:15 UTC (rev 15440)
@@ -23,9 +23,34 @@
keyvalue varchar(255),
primary key (id)
);
+
+ create table JMXOPERATION (
+ opid bigint not null auto_increment,
+ objectname varchar(255),
+ operation varchar(255),
+ description varchar(255),
+ returntype varchar(255),
+ servername varchar(255),
+ activeflag boolean,
+ primary key (opid)
+ );
+ create table JMXOPERATIONRESULT (
+ id bigint not null auto_increment,
+ opid bigint,
+ server varchar(255),
+ statdate datetime,
+ result varchar(255),
+ primary key(id)
+ );
+
alter table JMXDATA
add index FKD2EA449F4522DA9E (STATID),
add constraint FKD2EA449F4522DA9E
foreign key (STATID)
references JMXATTRIBUTE (statid);
+ alter table JMXOPERATIONRESULT
+ add index FKD2EA449F4522DA9F(OPID),
+ add constraint FKD2EA449F4522DA9F
+ foreign key (OPID)
+ references JMXOPERATION(opid);
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/oracle/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/oracle/create_database.sql 2007-09-28 14:29:24 UTC (rev 15439)
+++ labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/oracle/create_database.sql 2007-09-28 16:20:15 UTC (rev 15440)
@@ -1,8 +1,4 @@
-drop sequence SEQ_JMX_DATA;
-drop sequence SEQ_JMX_PATTERN;
-drop sequence SEQ_JMX_ATTRIBUTE;
-
create table JMXPATTERN (
id number(19,0),
classpattern varchar2(255 char),
@@ -27,7 +23,29 @@
textvalue varchar2(255 char),
primary key (id)
);
+
+ CREATE TABLE JMXOPERATION (
+ OPID number(19,0),
+ OBJECTNAME VARCHAR2(255 char) NOT NULL,
+ OPERATION VARCHAR2(255 char) NOT NULL,
+ DESCRIPTION VARCHAR2(255) NOT NULL,
+ RETURNTYPE VARCHAR2(255 char) NOT NULL,
+ SERVERNAME VARCHAR2(255 char) NOT NULL,
+ ACTIVEFLAG NUMBER(1) NOT NULL,
+ primary key (opid)
+ );
+
+ CREATE TABLE JMXOPERATIONRESULT (
+ ID number(19,0),
+ OPID number(19,0),
+ SERVER VARCHAR(255),
+ STATDATE TIMESTAMP,
+ RESULT VARCHAR(255),
+ primary key(id)
+ );
CREATE SEQUENCE SEQ_JMX_ATTRIBUTE START WITH 1 MINVALUE 1 INCREMENT BY 1 NOCYCLE;
CREATE SEQUENCE SEQ_JMX_DATA START WITH 1 MINVALUE 1 INCREMENT BY 1 NOCYCLE;
CREATE SEQUENCE SEQ_JMX_PATTERN START WITH 1 MINVALUE 1 INCREMENT BY 1 NOCYCLE;
+ CREATE SEQUENCE SEQ_JMX_OPERATION START WITH 1 MINVALUE 1 INCREMENT BY 1 NOCYCLE;
+ CREATE SEQUENCE SEQ_JMX_OPERATION_RESULT START WITH 1 MINVALUE 1 INCREMENT BY 1 NOCYCLE;
More information about the jboss-svn-commits
mailing list