[jboss-svn-commits] JBL Code SVN: r15779 - in labs/jbossesb/trunk/product/tools/console: management/src/main/java/org/jboss/soa/esb/monitoring and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Oct 11 16:43:33 EDT 2007
Author: tcunning
Date: 2007-10-11 16:43:33 -0400 (Thu, 11 Oct 2007)
New Revision: 15779
Modified:
labs/jbossesb/trunk/product/tools/console/management-esb/deployment.xml
labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/hsqldb/create_database.sql
labs/jbossesb/trunk/product/tools/console/management/monitoring.cfg.xml
labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/MonitoringSessionFactory.java
labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/pojo/JMXData.java
labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerScheduler.java
Log:
bug:JBESB-1139
Remove unique constraint on JMXDATA so that we don't throw constraint
exceptions after a crash (and JUDDI duplicates the EPRs). Change JNDI
name to get something out of the /comp/env/hibernate domain so that
Tomcat does not cause problems.
Modified: labs/jbossesb/trunk/product/tools/console/management/monitoring.cfg.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/monitoring.cfg.xml 2007-10-11 20:23:32 UTC (rev 15778)
+++ labs/jbossesb/trunk/product/tools/console/management/monitoring.cfg.xml 2007-10-11 20:43:33 UTC (rev 15779)
@@ -7,7 +7,7 @@
<property name="hibernate.session_factory_name">SessionFactory</property>
<property name="connection.datasource">@connection.datasource@</property>
<property name="dialect">@db.dialect@</property>
- <property name="hibernate.session_factory_name">java:/comp/env/hibernate/MonitoringSessionFactory</property>
+ <property name="hibernate.session_factory_name">java:/hibernate/MonitoringSessionFactory</property>
<!-- Mapping files -->
<mapping resource="org/jboss/soa/esb/monitoring/monitoring-mappings.hbm.xml"/>
</session-factory>
Modified: labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/MonitoringSessionFactory.java
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/MonitoringSessionFactory.java 2007-10-11 20:23:32 UTC (rev 15778)
+++ labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/MonitoringSessionFactory.java 2007-10-11 20:43:33 UTC (rev 15779)
@@ -55,7 +55,7 @@
*
*/
public class MonitoringSessionFactory {
- public static final String HIBERNATE_JNDI = "java:comp/env/hibernate/MonitoringSessionFactory";
+ public static final String HIBERNATE_JNDI = "java:/hibernate/MonitoringSessionFactory";
private static final Logger m_Logger = Logger.getLogger(MonitoringSessionFactory.class);
private static SessionFactory sessionFactory;
@@ -78,6 +78,7 @@
private static void init() {
try {
sessionFactory = new Configuration().configure("monitoring.cfg.xml").buildSessionFactory();
+
} catch (Exception e) {
m_Logger.error("", e);
}
Modified: labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/pojo/JMXData.java
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/pojo/JMXData.java 2007-10-11 20:23:32 UTC (rev 15778)
+++ labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/pojo/JMXData.java 2007-10-11 20:43:33 UTC (rev 15779)
@@ -184,7 +184,9 @@
* @see java.lang.Object#toString()
*/
public String toString() {
- return "id [" + id + "] time[" + statdate + "]";
+ return "id [" + id + "] time[" + statdate + "] server ["
+ + server + "] attribute [" + attribute.getId() + " " + attribute.getObjectname()
+ + "] count[" + countvalue + "] text [" + textvalue + "] timevalue [" + timevalue + "]";
}
}
Modified: labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerScheduler.java
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerScheduler.java 2007-10-11 20:23:32 UTC (rev 15778)
+++ labs/jbossesb/trunk/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerScheduler.java 2007-10-11 20:43:33 UTC (rev 15779)
@@ -67,7 +67,7 @@
jobDetail.setJobDataMap(datamap) ;
SimpleTrigger simpleTrigger = new SimpleTrigger(DataFilerJob.JOB_GROUP, DataFilerJob.JOB_NAME);
- simpleTrigger.setStartTime(new Date(ctime));
+ simpleTrigger.setStartTime(new Date(ctime + 10000));
simpleTrigger.setRepeatInterval(1000 * 60 * pollMinuteFrequency);
simpleTrigger.setRepeatCount(-1);
Modified: labs/jbossesb/trunk/product/tools/console/management-esb/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management-esb/deployment.xml 2007-10-11 20:23:32 UTC (rev 15778)
+++ labs/jbossesb/trunk/product/tools/console/management-esb/deployment.xml 2007-10-11 20:43:33 UTC (rev 15779)
@@ -1,5 +1,7 @@
<jbossesb-deployment>
+ <depends>jboss.jca:service=DataSourceBinding,name=ManagementDS</depends>
<depends>jboss.esb.console.destination:service=Queue,name=DataFilerQueue</depends>
<depends>jboss.esb.console.destination:service=Queue,name=OperationsFilerQueue</depends>
<depends>jboss.esb.console.destination:service=Queue,name=InvokerFilerQueue</depends>
+ <depends>jboss.jca:service=DataSourceBinding,name=juddiDB</depends>
</jbossesb-deployment>
Modified: labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/hsqldb/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/hsqldb/create_database.sql 2007-10-11 20:23:32 UTC (rev 15778)
+++ labs/jbossesb/trunk/product/tools/console/management-esb/src/main/resources/hsqldb/create_database.sql 2007-10-11 20:43:33 UTC (rev 15779)
@@ -7,7 +7,7 @@
);
CREATE TABLE JMXATTRIBUTE (
-STATID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 0) NOT NULL PRIMARY KEY,
+STATID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 1) NOT NULL PRIMARY KEY,
OBJECTNAME VARCHAR(255) NOT NULL,
ATTRIBUTE VARCHAR(255) NOT NULL,
CONSTRAINT UNIQUE_ATTRID UNIQUE(STATID),
@@ -15,7 +15,7 @@
);
CREATE TABLE JMXOPERATION (
-OPID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 0) NOT NULL PRIMARY KEY,
+OPID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 1) NOT NULL PRIMARY KEY,
OBJECTNAME VARCHAR(255) NOT NULL,
OPERATION VARCHAR(255) NOT NULL,
DESCRIPTION VARCHAR(255) NOT NULL,
@@ -27,7 +27,7 @@
);
CREATE TABLE JMXOPERATIONRESULT (
-ID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 0) NOT NULL PRIMARY KEY,
+ID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 1) NOT NULL PRIMARY KEY,
OPID INTEGER,
SERVER VARCHAR(255),
STATDATE TIMESTAMP,
@@ -37,13 +37,12 @@
);
CREATE TABLE JMXDATA (
-ID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 0) NOT NULL PRIMARY KEY,
+ID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 1) NOT NULL PRIMARY KEY,
STATID INTEGER,
SERVER VARCHAR(255),
STATDATE TIMESTAMP,
TIMEVALUE FLOAT,
COUNTVALUE INT,
TEXTVALUE VARCHAR(255),
-CONSTRAINT UNIQUE_DATA UNIQUE(STATID, SERVER, STATDATE),
CONSTRAINT FK_ATTRIBUTE FOREIGN KEY(STATID) REFERENCES JMXATTRIBUTE
);
More information about the jboss-svn-commits
mailing list