[jboss-svn-commits] JBL Code SVN: r20014 - in labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console: management-esb and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon May 19 05:05:45 EDT 2008
Author: kevin.conner at jboss.com
Date: 2008-05-19 05:05:44 -0400 (Mon, 19 May 2008)
New Revision: 20014
Removed:
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/BeanRegistrationServlet.java
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/src/main/resources/jbossesbmanagement-service.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-web/build.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-web/src/main/webapp/WEB-INF/jboss-web.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-web/web.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerScheduler.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerSchedulerMBean.java
Log:
Changed to AS MBean and added to dependencies: JBESB-1724
Deleted: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/BeanRegistrationServlet.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/BeanRegistrationServlet.java 2008-05-19 09:05:27 UTC (rev 20013)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/BeanRegistrationServlet.java 2008-05-19 09:05:44 UTC (rev 20014)
@@ -1,100 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.soa.esb.monitoring.server;
-
-import javax.management.InstanceAlreadyExistsException;
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanRegistrationException;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-import javax.management.NotCompliantMBeanException;
-import javax.management.ObjectName;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-
-import org.apache.log4j.Logger;
-import org.jboss.mx.util.MBeanServerLocator;
-
-/**
- * BeanRegistrationServlet registers the DataFilerSchedulerMBean. The
- * DataFilerSchedulerMBean contains information as to the frequency to
- * which to collect data, and on update, it reschedules a Quartz job
- * which fires it off at the selected interval.
- *
- * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
- * @since Version 4.2
- */
-public class BeanRegistrationServlet extends HttpServlet {
- private static final long serialVersionUID = 5501281194727672262L;
-
- Logger logger = Logger.getLogger(BeanRegistrationServlet.class);
-
- public void init(ServletConfig config) throws ServletException {
- MBeanServer mbeanServer = null;
- ObjectName dataSchedulerName = null;
- try {
- mbeanServer = MBeanServerLocator.locateJBoss();
- } catch (IllegalStateException ise) {
- logger.error("", ise);
- return;
- }
-
- try {
- dataSchedulerName = new ObjectName("jboss.esb:service=DataFilerScheduler");
- } catch (MalformedObjectNameException e) {
- logger.error("", e);
- } catch (NullPointerException e) {
- logger.error("", e);
- }
-
- if (mbeanServer.isRegistered(dataSchedulerName)) {
- try {
- mbeanServer.unregisterMBean(dataSchedulerName);
- } catch (InstanceNotFoundException e) {
- logger.error("", e);
- } catch (MBeanRegistrationException e) {
- logger.error("", e);
- }
- }
-
- // Grab initial poll minute frequency from web.xml
- String pollString = config.getInitParameter("pollMinuteFrequency");
- int pollMinuteFrequency = Integer.parseInt(pollString);
-
- try {
- DataFilerScheduler dfs = new DataFilerScheduler();
- dfs.create();
- dfs.setPollMinuteFrequency(pollMinuteFrequency);
- mbeanServer.registerMBean(dfs, dataSchedulerName);
- } catch (InstanceAlreadyExistsException e) {
- logger.error("", e);
- } catch (MBeanRegistrationException e) {
- logger.error("", e);
- } catch (NotCompliantMBeanException e) {
- logger.error("", e);
- } catch (Exception e) {
- logger.error("", e);
- }
-
- }
-}
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerScheduler.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerScheduler.java 2008-05-19 09:05:27 UTC (rev 20013)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerScheduler.java 2008-05-19 09:05:44 UTC (rev 20014)
@@ -41,7 +41,7 @@
* @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
* @since Version 4.2
*/
-public class DataFilerScheduler implements DataFilerSchedulerMBean {
+public class DataFilerScheduler extends ServiceMBeanSupport implements DataFilerSchedulerMBean {
private static final Logger logger = Logger.getLogger(DataFilerScheduler.class);
private static final int DEFAULT_POLL_MINUTE_FREQ = 2;
@@ -53,18 +53,20 @@
return pollMinuteFrequency;
}
- public void create() throws Exception {
+ public void start() throws Exception {
+ super.start();
SchedulerFactory schedulerFactory = new StdSchedulerFactory();
scheduler = schedulerFactory.getScheduler();
}
- public void destroy() {
+ public void stop() {
try {
scheduler.shutdown();
scheduler.deleteJob(DataFilerJob.JOB_GROUP, DataFilerJob.JOB_NAME);
} catch (SchedulerException e) {
logger.error("", e);
}
+ super.stop();
}
public void setPollMinuteFrequency(int f_pollMinuteFrequency) {
@@ -94,7 +96,4 @@
logger.error("", e);
}
}
-
-
-
}
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerSchedulerMBean.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerSchedulerMBean.java 2008-05-19 09:05:27 UTC (rev 20013)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/server/DataFilerSchedulerMBean.java 2008-05-19 09:05:44 UTC (rev 20014)
@@ -31,7 +31,7 @@
* @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
* @since Version 4.2
*/
-public interface DataFilerSchedulerMBean {
+public interface DataFilerSchedulerMBean extends ServiceMBean {
public int getPollMinuteFrequency();
public void setPollMinuteFrequency(int f_pollMinuteFrequency);
}
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-05-19 09:05:27 UTC (rev 20013)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/build.xml 2008-05-19 09:05:44 UTC (rev 20014)
@@ -81,6 +81,7 @@
<filter token="database.depends" value="${database.depends}"/>
<filter token="db.datasource" value="${db.datasource}"/>
<filter token="connection.datasource" value="${connection.datasource}"/>
+ <filter token="pollMinuteFrequency" value="${pollMinuteFrequency}"/>
</filterset>
</copy>
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/src/main/resources/jbossesbmanagement-service.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/src/main/resources/jbossesbmanagement-service.xml 2008-05-19 09:05:27 UTC (rev 20013)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-esb/src/main/resources/jbossesbmanagement-service.xml 2008-05-19 09:05:44 UTC (rev 20014)
@@ -3,6 +3,11 @@
<server>
<classpath codebase="deploy" archives="management.esb"/>
<classpath codebase="deploy/jbossesb.sar/lib" archives="jbossesb-rosetta.jar"/>
+ <mbean code="org.jboss.soa.esb.monitoring.server.DataFilerScheduler"
+ name="jboss.esb:service=DataFilerScheduler">
+ <attribute name="PollMinuteFrequency">@pollMinuteFrequency@</attribute>
+ </mbean>
+
<mbean code="org.jboss.internal.soa.esb.dependencies.DatabaseInitializer"
name="jboss.esb:service=ManagementDatabaseInitializer">
<attribute name="Datasource">@connection.datasource@</attribute>
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-web/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-web/build.xml 2008-05-19 09:05:27 UTC (rev 20013)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-web/build.xml 2008-05-19 09:05:44 UTC (rev 20014)
@@ -23,12 +23,7 @@
<mkdir dir="${mgmt.web.dir}/build"/>
<copy file="${mgmt.web.dir}/web.xml"
todir="${mgmt.web.dir}/build"
- overwrite="true">
- <filterset>
- <filter token="pollMinuteFrequency"
- value="${pollMinuteFrequency}"/>
- </filterset>
- </copy>
+ overwrite="true"/>
</target>
<target name="war" depends="create-webxml,build-jar"
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-web/src/main/webapp/WEB-INF/jboss-web.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-web/src/main/webapp/WEB-INF/jboss-web.xml 2008-05-19 09:05:27 UTC (rev 20013)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-web/src/main/webapp/WEB-INF/jboss-web.xml 2008-05-19 09:05:44 UTC (rev 20014)
@@ -4,4 +4,5 @@
<jboss-web>
<depends>jboss.esb:service=ManagementDatabaseInitializer</depends>
+ <depends>jboss.esb:service=DataFilerScheduler</depends>
</jboss-web>
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-web/web.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-web/web.xml 2008-05-19 09:05:27 UTC (rev 20013)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management-web/web.xml 2008-05-19 09:05:44 UTC (rev 20014)
@@ -4,20 +4,4 @@
<web-app>
<display-name>Archetype Created Web Application</display-name>
-
- <servlet>
- <servlet-name>BeanRegistration</servlet-name>
- <servlet-class>org.jboss.soa.esb.monitoring.server.BeanRegistrationServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- <init-param>
- <param-name>pollMinuteFrequency</param-name>
- <param-value>@pollMinuteFrequency@</param-value>
- </init-param>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>BeanRegistration</servlet-name>
- <url-pattern>/beanregistrationservlet</url-pattern>
- </servlet-mapping>
-
</web-app>
More information about the jboss-svn-commits
mailing list