Author: channa
Date: Sun Jan 27 03:44:19 2008
New Revision: 12997
Log:
Setting status in initializer for server monitoring using ServerMonitor MBean.
Reverting installer script to start monitor. (MASHUP-600).
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/transport/MashupServerInitializer.java
trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java
trunk/mashup/java/modules/distribution/installer/mashupserver-setup.nsi
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/transport/MashupServerInitializer.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/transport/MashupServerInitializer.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/transport/MashupServerInitializer.java
Sun Jan 27 03:44:19 2008
@@ -115,6 +115,9 @@
new String[] {
MashupConstants.MASHUP_USER_ROLE });
+ // Notify MBean that server is now running.
+ MashupUtils.setServerRunning(true);
+
// Applying a dummy tag so that searching works
// https://wso2.org/jira/browse/REGISTRY-24
SecureRegistry secureRegistry =
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java
==============================================================================
--- trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java
(original)
+++ trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java
Sun Jan 27 03:44:19 2008
@@ -197,20 +197,22 @@
try {
beanServer = getBeanServer();
- beanName = new
ObjectName("org.wso2.monitor.mbeans:type=ServerMonitor");
+ if (beanServer != null) {
+ beanName = new
ObjectName("org.wso2.monitor.mbeans:type=ServerMonitor");
- // Call notification method of mbean.
- Object[] params = { new Boolean(serverRunning) };
- String[] signatures = { "boolean" };
- beanServer.invoke(beanName, "setServerRunning", params,
signatures);
+ // Call notification method of mbean.
+ Object[] params = { new Boolean(serverRunning) };
+ String[] signatures = { "boolean" };
+ beanServer.invoke(beanName, "setServerRunning", params,
signatures);
+ }
} catch (InstanceNotFoundException e) {
- log.error("Named bean not found " + e.getLocalizedMessage());
+ log.info("Named bean not found " + e.getLocalizedMessage());
} catch (MBeanException e) {
- log.error("MBean error " + e.getLocalizedMessage());
+ log.info("MBean error " + e.getLocalizedMessage());
} catch (ReflectionException e) {
- log.error("Error invoking method " + e.getLocalizedMessage());
+ log.info("Method not called: " + e.getLocalizedMessage());
} catch (MalformedObjectNameException e) {
- log.error("Object name incorrect when registering MBean", e);
+ log.info("Object name incorrect when registering MBean", e);
}
}
Modified:
trunk/mashup/java/modules/distribution/installer/mashupserver-setup.nsi
==============================================================================
--- trunk/mashup/java/modules/distribution/installer/mashupserver-setup.nsi
(original)
+++ trunk/mashup/java/modules/distribution/installer/mashupserver-setup.nsi
Sun Jan 27 03:44:19 2008
@@ -129,7 +129,7 @@
ExecWait '"$INSTDIR\bin\native\wrapper-windows-x86-32.exe" -t
..\..\conf\wrapper.conf'
# Starting the System Tray Monitor
- # Exec 'javaw.exe -jar "$INSTDIR\lib\${MONITOR_JAR_NAME}" -start
"$INSTDIR"'
+ Exec 'javaw.exe -jar "$INSTDIR\lib\${MONITOR_JAR_NAME}" -start "$INSTDIR"'
SectionEnd
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
