Prepare release 0.6.

Author: rlewczuk

CHANGES.md

@@ -1,11 +1,11 @@
-Zorka 0.6 (2012-12-21)
+Zorka 0.6 (2012-12-22)
 ----------------------
 
  * normalization of xQL queries (all major query languages);
  * normalization of LDAP search queries;
  * file trapper (logs events to files instead of syslog/zabbix/SNMP);
  * composite processing chains and comparator filters;
- * zorka API overhaul;
+ * zorka API overhaul (yet more refactoring are on the way);
 
 
 Zorka 0.5 (2012-12-07)

configs/zabbix/scripts/jboss.bsh

@@ -153,22 +153,27 @@ __jboss() {
 
   // Catch MX mbean server initialization and register JBoss MBean Server here ...
 
-  jbossMbs = null;
-
-  collect(record) {
-    synchronized (super) {
-      if (super.jbossMbs == null) {
-        mbs = record.get(spy.ON_COLLECT,0);
-        zorka.registerMbs("jboss", mbs);
-        super.jbossMbs = mbs;
-        zorka.log("jboss").debug("Registered JBoss MBean server as 'jboss'");
+  __mbsRegister() {
+
+    jbossMbs = null;
+
+    process(stage,record) {
+      synchronized (super) {
+        if (super.jbossMbs == null) {
+          mbs = record.get(spy.ON_RETURN,0);
+          zorka.registerMbs("jboss", mbs);
+          super.jbossMbs = mbs;
+          zorka.logInfo("Registered JBoss MBean server as 'jboss'");
+        }
       }
+      return record;
     }
-  }
-
+    return this;
+  } // __mbsRegister()
 
-  spy.add(spy.instance().onReturn().withArguments(0)
-     .lookFor("org.jboss.mx.server.MBeanServerImpl", "<init>").toBsh("jboss"));
+  spy.add(spy.instance()
+    .onReturn(0, (com.jitlogic.zorka.spy.SpyProcessor)__mbsRegister())
+    .include(spy.byMethod("org.jboss.mx.server.MBeanServerImpl", "<init>")));
 
   return this;
 }

configs/zabbix/scripts/jboss7.bsh

@@ -124,7 +124,7 @@ __jboss7() {
   __mbsRegister() {
     jbossMbs = null;
 
-    collect(record) {
+    process(stage,record) {
       synchronized (super) {
         if (super.jbossMbs == null) {
           mbs = java.lang.management.ManagementFactory.getPlatformMBeanServer();
@@ -133,14 +133,16 @@ __jboss7() {
           zorka.logInfo("Registered platform mbean server as 'java'");
         }
       }
+      return record;
     }
     return this;
   }
 
 
-  spy.add(spy.instance().onReturn().withNull()
-    .include("org.jboss.modules.ModuleLoader", "installMBeanServer")
-    .toCollector((com.jitlogic.zorka.spy.SpyCollector)__mbsRegister()));
+  spy.add(spy.instance()
+    .onReturn(spy.FETCH_NULL, (com.jitlogic.zorka.spy.SpyProcessor)__mbsRegister())
+    .include(spy.byMethod("org.jboss.modules.ModuleLoader", "installMBeanServer")));
+
 
 
   return this;

pom.xml

@@ -3,7 +3,7 @@
     <groupId>com.jitlogic.zorka</groupId>
     <artifactId>zorka</artifactId>
     <packaging>pom</packaging>
-    <version>0.5.1-SNAPSHOT</version>
+    <version>0.6.0</version>
     <name>zorka: parent aggregator</name>
     <url>http://www.jitlogic.com/zorka</url>
 

zorka-agent/pom.xml

@@ -6,7 +6,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
     <parent>
         <groupId>com.jitlogic.zorka</groupId>
         <artifactId>zorka</artifactId>
-        <version>0.5.1-SNAPSHOT</version>
+        <version>0.6.0</version>
     </parent>
     <dependencies>
         <dependency>