Merge branch 'feature/instrumentation' into release/1.4.0

This collects various performance and use statistics that are accessable
via JMX

pom.xml

@@ -134,6 +134,11 @@
                         <artifactId>cxf-rt-transports-http</artifactId>
                         <version>${cxf-version}</version>
                 </dependency>
+                <dependency>
+                        <groupId>org.apache.cxf</groupId>
+                        <artifactId>cxf-rt-management</artifactId>
+                        <version>${cxf-version}</version>
+                </dependency>
                 <dependency>
                         <groupId>org.springframework</groupId>
                         <artifactId>spring-web</artifactId>

src/main/webapp/WEB-INF/beans.xml

@@ -3,10 +3,12 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:jaxrs="http://cxf.apache.org/jaxrs"
   xmlns:context="http://www.springframework.org/schema/context"
+  xmlns:cxf="http://cxf.apache.org/core"
   xsi:schemaLocation="
 http://www.springframework.org/schema/beans 
 http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
 http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
+http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
 http://cxf.apache.org/jaxrs
 http://cxf.apache.org/schemas/jaxrs.xsd">
 
@@ -32,7 +34,21 @@ http://cxf.apache.org/schemas/jaxrs.xsd">
   
   <bean class="org.springframework.web.context.support.ServletContextPropertyPlaceholderConfigurer"/>
   <bean class="org.springframework.beans.factory.config.PreferencesPlaceholderConfigurer"/>
+
+  <cxf:bus id="aggregator"/>
   
+  <bean id="org.apache.cxf.management.InstrumentationManager"
+    class="org.apache.cxf.management.jmx.InstrumentationManagerImpl">
+    <property name="enabled" value="true" />
+    <property name="bus" ref="cxf" />
+    <property name="usePlatformMBeanServer" value="true" />
+  </bean>
+
+  <!-- Wiring the counter repository -->
+  <bean id="CounterRepository" class="org.apache.cxf.management.counters.CounterRepository">
+    <property name="bus" ref="cxf" />
+  </bean>
+
   <bean id="stable-repo" class="info.textgrid.services.aggregator.util.TextGridRepProvider" scope="singleton">
       <constructor-arg value="${aggregator.textgridrep.default}"/>
   </bean>