You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by rm...@apache.org on 2013/10/22 12:03:07 UTC
svn commit: r1534581 [3/4] - in /incubator/sirona/trunk:
aop/src/main/java/org/apache/commons/ aop/src/main/java/org/apache/sirona/
aop/src/main/java/org/apache/sirona/aop/
aop/src/test/java/org/apache/commons/ aop/src/test/java/org/apache/sirona/
aop/...
Copied: incubator/sirona/trunk/jta/src/main/resources/META-INF/services/org.apache.sirona.gauges.GaugeFactory (from r1534560, incubator/sirona/trunk/jta/src/main/resources/META-INF/services/org.apache.commons.monitoring.gauges.GaugeFactory)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/jta/src/main/resources/META-INF/services/org.apache.sirona.gauges.GaugeFactory?p2=incubator/sirona/trunk/jta/src/main/resources/META-INF/services/org.apache.sirona.gauges.GaugeFactory&p1=incubator/sirona/trunk/jta/src/main/resources/META-INF/services/org.apache.commons.monitoring.gauges.GaugeFactory&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/jta/src/main/resources/META-INF/services/org.apache.commons.monitoring.gauges.GaugeFactory (original)
+++ incubator/sirona/trunk/jta/src/main/resources/META-INF/services/org.apache.sirona.gauges.GaugeFactory Tue Oct 22 10:03:02 2013
@@ -1 +1 @@
-org.apache.commons.monitoring.jta.JTAGauges
+org.apache.sirona.jta.JTAGauges
Copied: incubator/sirona/trunk/jta/src/test/java/org/apache/sirona/jta/GaugesTest.java (from r1534560, incubator/sirona/trunk/jta/src/test/java/org/apache/commons/monitoring/jta/GaugesTest.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/jta/src/test/java/org/apache/sirona/jta/GaugesTest.java?p2=incubator/sirona/trunk/jta/src/test/java/org/apache/sirona/jta/GaugesTest.java&p1=incubator/sirona/trunk/jta/src/test/java/org/apache/commons/monitoring/jta/GaugesTest.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/jta/src/test/java/org/apache/commons/monitoring/jta/GaugesTest.java (original)
+++ incubator/sirona/trunk/jta/src/test/java/org/apache/sirona/jta/GaugesTest.java Tue Oct 22 10:03:02 2013
@@ -14,10 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.jta;
+package org.apache.sirona.jta;
-import org.apache.commons.monitoring.gauges.Gauge;
-import org.apache.commons.monitoring.repositories.Repository;
+import org.apache.sirona.gauges.Gauge;
+import org.apache.sirona.jta.JTAGauges;
+import org.apache.sirona.jta.JTAMonitored;
+import org.apache.sirona.repositories.Repository;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
Modified: incubator/sirona/trunk/jta/src/test/resources/commons-monitoring.properties
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/jta/src/test/resources/commons-monitoring.properties?rev=1534581&r1=1534580&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/jta/src/test/resources/commons-monitoring.properties (original)
+++ incubator/sirona/trunk/jta/src/test/resources/commons-monitoring.properties Tue Oct 22 10:03:02 2013
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-org.apache.commons.monitoring.gauge.jta.period = 100
+org.apache.sirona.gauge.jta.period = 100
Copied: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/MonitoringController.java (from r1534560, incubator/sirona/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/MonitoringController.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/MonitoringController.java?p2=incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/MonitoringController.java&p1=incubator/sirona/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/MonitoringController.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/MonitoringController.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/MonitoringController.java Tue Oct 22 10:03:02 2013
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web;
+package org.apache.sirona.reporting.web;
-import org.apache.commons.monitoring.reporting.web.handler.FilteringEndpoints;
-import org.apache.commons.monitoring.reporting.web.handler.HomeEndpoint;
-import org.apache.commons.monitoring.reporting.web.handler.internal.EndpointInfo;
-import org.apache.commons.monitoring.reporting.web.handler.internal.Invoker;
-import org.apache.commons.monitoring.reporting.web.plugin.PluginRepository;
-import org.apache.commons.monitoring.reporting.web.template.MapBuilder;
-import org.apache.commons.monitoring.reporting.web.template.Templates;
+import org.apache.sirona.reporting.web.handler.FilteringEndpoints;
+import org.apache.sirona.reporting.web.handler.HomeEndpoint;
+import org.apache.sirona.reporting.web.handler.internal.EndpointInfo;
+import org.apache.sirona.reporting.web.handler.internal.Invoker;
+import org.apache.sirona.reporting.web.plugin.PluginRepository;
+import org.apache.sirona.reporting.web.template.MapBuilder;
+import org.apache.sirona.reporting.web.template.Templates;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/FilteringEndpoints.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/FilteringEndpoints.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/FilteringEndpoints.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/FilteringEndpoints.java Tue Oct 22 10:03:02 2013
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.handler;
+package org.apache.sirona.reporting.web.handler;
-import org.apache.commons.monitoring.reporting.web.handler.api.Regex;
-import org.apache.commons.monitoring.reporting.web.handler.api.TemplateHelper;
-import org.apache.commons.monitoring.reporting.web.template.Templates;
+import org.apache.sirona.reporting.web.handler.api.Regex;
+import org.apache.sirona.reporting.web.handler.api.TemplateHelper;
+import org.apache.sirona.reporting.web.template.Templates;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.RuntimeSingleton;
import org.apache.velocity.runtime.resource.loader.ResourceLoader;
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/HomeEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/HomeEndpoint.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/HomeEndpoint.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/HomeEndpoint.java Tue Oct 22 10:03:02 2013
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.handler;
+package org.apache.sirona.reporting.web.handler;
-import org.apache.commons.monitoring.reporting.web.handler.api.Regex;
-import org.apache.commons.monitoring.reporting.web.handler.api.Template;
+import org.apache.sirona.reporting.web.handler.api.Regex;
+import org.apache.sirona.reporting.web.handler.api.Template;
public class HomeEndpoint {
@Regex
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/Regex.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/Regex.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/Regex.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/Regex.java Tue Oct 22 10:03:02 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.handler.api;
+package org.apache.sirona.reporting.web.handler.api;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/Template.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/Template.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/Template.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/Template.java Tue Oct 22 10:03:02 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.handler.api;
+package org.apache.sirona.reporting.web.handler.api;
import java.util.Collections;
import java.util.Map;
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/TemplateHelper.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/TemplateHelper.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/TemplateHelper.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/TemplateHelper.java Tue Oct 22 10:03:02 2013
@@ -14,12 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.handler.api;
+package org.apache.sirona.reporting.web.handler.api;
-import org.apache.commons.monitoring.reporting.web.template.MapBuilder;
-import org.apache.commons.monitoring.reporting.web.template.Templates;
-import org.apache.velocity.app.Velocity;
-import org.apache.velocity.runtime.RuntimeSingleton;
+import org.apache.sirona.reporting.web.template.MapBuilder;
+import org.apache.sirona.reporting.web.template.Templates;
import java.io.PrintWriter;
import java.util.Collections;
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/internal/EndpointInfo.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/internal/EndpointInfo.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/internal/EndpointInfo.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/internal/EndpointInfo.java Tue Oct 22 10:03:02 2013
@@ -14,16 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.handler.internal;
+package org.apache.sirona.reporting.web.handler.internal;
-import org.apache.commons.monitoring.configuration.Configuration;
-import org.apache.commons.monitoring.reporting.web.handler.api.Regex;
-import org.apache.commons.monitoring.reporting.web.handler.api.TemplateHelper;
+import org.apache.sirona.configuration.Configuration;
+import org.apache.sirona.reporting.web.handler.api.Regex;
+import org.apache.sirona.reporting.web.handler.api.TemplateHelper;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Method;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.regex.Pattern;
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/internal/Invoker.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/internal/Invoker.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/internal/Invoker.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/handler/internal/Invoker.java Tue Oct 22 10:03:02 2013
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.handler.internal;
+package org.apache.sirona.reporting.web.handler.internal;
-import org.apache.commons.monitoring.MonitoringException;
-import org.apache.commons.monitoring.reporting.web.handler.api.Template;
-import org.apache.commons.monitoring.reporting.web.handler.api.TemplateHelper;
-import org.apache.commons.monitoring.reporting.web.template.MapBuilder;
+import org.apache.sirona.MonitoringException;
+import org.apache.sirona.reporting.web.handler.api.Template;
+import org.apache.sirona.reporting.web.handler.api.TemplateHelper;
+import org.apache.sirona.reporting.web.template.MapBuilder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/Plugin.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/Plugin.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/Plugin.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/Plugin.java Tue Oct 22 10:03:02 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.plugin;
+package org.apache.sirona.reporting.web.plugin;
public interface Plugin {
/**
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/PluginRepository.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/PluginRepository.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/PluginRepository.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/PluginRepository.java Tue Oct 22 10:03:02 2013
@@ -14,16 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.plugin;
+package org.apache.sirona.reporting.web.plugin;
-import org.apache.commons.monitoring.configuration.Configuration;
-import org.apache.commons.monitoring.reporting.web.handler.internal.EndpointInfo;
-import org.apache.commons.monitoring.reporting.web.handler.internal.Invoker;
-import org.apache.commons.monitoring.spi.SPI;
+import org.apache.sirona.configuration.Configuration;
+import org.apache.sirona.reporting.web.handler.internal.EndpointInfo;
+import org.apache.sirona.reporting.web.handler.internal.Invoker;
+import org.apache.sirona.spi.SPI;
import java.util.Collection;
import java.util.Map;
-import java.util.ServiceLoader;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.regex.Pattern;
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXEndpoints.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXEndpoints.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXEndpoints.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXEndpoints.java Tue Oct 22 10:03:02 2013
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.plugin.jmx;
+package org.apache.sirona.reporting.web.plugin.jmx;
import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.monitoring.MonitoringException;
-import org.apache.commons.monitoring.configuration.Configuration;
-import org.apache.commons.monitoring.reporting.web.handler.api.Regex;
-import org.apache.commons.monitoring.reporting.web.handler.api.Template;
-import org.apache.commons.monitoring.reporting.web.template.MapBuilder;
-import org.apache.commons.monitoring.util.ClassLoaders;
+import org.apache.sirona.MonitoringException;
+import org.apache.sirona.configuration.Configuration;
+import org.apache.sirona.reporting.web.handler.api.Regex;
+import org.apache.sirona.reporting.web.handler.api.Template;
+import org.apache.sirona.reporting.web.template.MapBuilder;
+import org.apache.sirona.util.ClassLoaders;
import javax.management.MBeanAttributeInfo;
import javax.management.MBeanInfo;
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXNode.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXNode.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXNode.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXNode.java Tue Oct 22 10:03:02 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.plugin.jmx;
+package org.apache.sirona.reporting.web.plugin.jmx;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang3.StringEscapeUtils;
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXPlugin.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXPlugin.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXPlugin.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXPlugin.java Tue Oct 22 10:03:02 2013
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.plugin.jmx;
+package org.apache.sirona.reporting.web.plugin.jmx;
-import org.apache.commons.monitoring.reporting.web.plugin.Plugin;
+import org.apache.sirona.reporting.web.plugin.Plugin;
public class JMXPlugin implements Plugin {
@Override
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/json/Jsons.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/json/Jsons.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/json/Jsons.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/json/Jsons.java Tue Oct 22 10:03:02 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.plugin.json;
+package org.apache.sirona.reporting.web.plugin.json;
import java.util.Iterator;
import java.util.Map;
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jta/JTAEndpoints.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jta/JTAEndpoints.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jta/JTAEndpoints.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jta/JTAEndpoints.java Tue Oct 22 10:03:02 2013
@@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.plugin.jta;
+package org.apache.sirona.reporting.web.plugin.jta;
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.counters.Unit;
-import org.apache.commons.monitoring.reporting.web.handler.api.Regex;
-import org.apache.commons.monitoring.reporting.web.handler.api.Template;
-import org.apache.commons.monitoring.reporting.web.plugin.json.Jsons;
-import org.apache.commons.monitoring.repositories.Repository;
+import org.apache.sirona.Role;
+import org.apache.sirona.counters.Unit;
+import org.apache.sirona.reporting.web.handler.api.Regex;
+import org.apache.sirona.reporting.web.handler.api.Template;
+import org.apache.sirona.reporting.web.plugin.json.Jsons;
+import org.apache.sirona.repositories.Repository;
public class JTAEndpoints {
- // copied to avoid classloading issue depending on the deployment, see org.apache.commons.monitoring.jta.JTAGauges
+ // copied to avoid classloading issue depending on the deployment, see org.apache.sirona.jta.JTAGauges
private static final Role COMMITED = new Role("jta-commited", Unit.UNARY);
private static final Role ROLLBACKED = new Role("jta-rollbacked", Unit.UNARY);
private static final Role ACTIVE = new Role("jta-active", Unit.UNARY);
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jta/JTAPlugin.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jta/JTAPlugin.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jta/JTAPlugin.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jta/JTAPlugin.java Tue Oct 22 10:03:02 2013
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.plugin.jta;
+package org.apache.sirona.reporting.web.plugin.jta;
-import org.apache.commons.monitoring.reporting.web.plugin.Plugin;
+import org.apache.sirona.reporting.web.plugin.Plugin;
public class JTAPlugin implements Plugin {
@Override
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/JVMEndpoints.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/JVMEndpoints.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/JVMEndpoints.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/JVMEndpoints.java Tue Oct 22 10:03:02 2013
@@ -14,21 +14,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.plugin.jvm;
+package org.apache.sirona.reporting.web.plugin.jvm;
-import org.apache.commons.monitoring.reporting.web.handler.api.Regex;
-import org.apache.commons.monitoring.reporting.web.handler.api.Template;
-import org.apache.commons.monitoring.reporting.web.plugin.json.Jsons;
-import org.apache.commons.monitoring.reporting.web.plugin.jvm.gauges.CPUGauge;
-import org.apache.commons.monitoring.reporting.web.plugin.jvm.gauges.UsedMemoryGauge;
-import org.apache.commons.monitoring.reporting.web.template.MapBuilder;
-import org.apache.commons.monitoring.repositories.Repository;
+import org.apache.sirona.reporting.web.handler.api.Regex;
+import org.apache.sirona.reporting.web.handler.api.Template;
+import org.apache.sirona.reporting.web.plugin.json.Jsons;
+import org.apache.sirona.reporting.web.plugin.jvm.gauges.CPUGauge;
+import org.apache.sirona.reporting.web.plugin.jvm.gauges.UsedMemoryGauge;
+import org.apache.sirona.reporting.web.template.MapBuilder;
+import org.apache.sirona.repositories.Repository;
import java.lang.management.ManagementFactory;
import java.lang.management.MemoryMXBean;
import java.lang.management.OperatingSystemMXBean;
-import java.util.Iterator;
-import java.util.Map;
public class JVMEndpoints {
@Regex
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/JVMPlugin.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/JVMPlugin.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/JVMPlugin.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/JVMPlugin.java Tue Oct 22 10:03:02 2013
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.plugin.jvm;
+package org.apache.sirona.reporting.web.plugin.jvm;
-import org.apache.commons.monitoring.reporting.web.plugin.Plugin;
+import org.apache.sirona.reporting.web.plugin.Plugin;
public class JVMPlugin implements Plugin {
@Override
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/gauges/BaseMemoryGauge.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/gauges/BaseMemoryGauge.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/gauges/BaseMemoryGauge.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/gauges/BaseMemoryGauge.java Tue Oct 22 10:03:02 2013
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.plugin.jvm.gauges;
+package org.apache.sirona.reporting.web.plugin.jvm.gauges;
-import org.apache.commons.monitoring.configuration.Configuration;
-import org.apache.commons.monitoring.gauges.Gauge;
+import org.apache.sirona.configuration.Configuration;
+import org.apache.sirona.gauges.Gauge;
import java.lang.management.ManagementFactory;
import java.lang.management.MemoryMXBean;
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/gauges/CPUGauge.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/gauges/CPUGauge.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/gauges/CPUGauge.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/gauges/CPUGauge.java Tue Oct 22 10:03:02 2013
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.plugin.jvm.gauges;
+package org.apache.sirona.reporting.web.plugin.jvm.gauges;
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.configuration.Configuration;
-import org.apache.commons.monitoring.counters.Unit;
-import org.apache.commons.monitoring.gauges.Gauge;
+import org.apache.sirona.Role;
+import org.apache.sirona.configuration.Configuration;
+import org.apache.sirona.counters.Unit;
+import org.apache.sirona.gauges.Gauge;
import java.lang.management.ManagementFactory;
import java.lang.management.OperatingSystemMXBean;
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/gauges/UsedMemoryGauge.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/gauges/UsedMemoryGauge.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/gauges/UsedMemoryGauge.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/gauges/UsedMemoryGauge.java Tue Oct 22 10:03:02 2013
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.plugin.jvm.gauges;
+package org.apache.sirona.reporting.web.plugin.jvm.gauges;
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.counters.Unit;
+import org.apache.sirona.Role;
+import org.apache.sirona.counters.Unit;
public class UsedMemoryGauge extends BaseMemoryGauge {
public static final Role USED_MEMORY = new Role("Used Memory", Unit.UNARY);
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/ReportEndpoints.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/ReportEndpoints.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/ReportEndpoints.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/ReportEndpoints.java Tue Oct 22 10:03:02 2013
@@ -14,20 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.plugin.report;
+package org.apache.sirona.reporting.web.plugin.report;
-import org.apache.commons.monitoring.MonitoringException;
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.counters.AggregatedCounter;
-import org.apache.commons.monitoring.counters.Counter;
-import org.apache.commons.monitoring.counters.Unit;
-import org.apache.commons.monitoring.reporting.web.handler.api.Regex;
-import org.apache.commons.monitoring.reporting.web.handler.api.Template;
-import org.apache.commons.monitoring.reporting.web.plugin.report.format.Format;
-import org.apache.commons.monitoring.reporting.web.plugin.report.format.HTMLFormat;
-import org.apache.commons.monitoring.reporting.web.plugin.report.format.MapFormat;
-import org.apache.commons.monitoring.reporting.web.template.MapBuilder;
-import org.apache.commons.monitoring.repositories.Repository;
+import org.apache.sirona.MonitoringException;
+import org.apache.sirona.Role;
+import org.apache.sirona.counters.AggregatedCounter;
+import org.apache.sirona.counters.Counter;
+import org.apache.sirona.counters.Unit;
+import org.apache.sirona.reporting.web.handler.api.Regex;
+import org.apache.sirona.reporting.web.handler.api.Template;
+import org.apache.sirona.reporting.web.plugin.report.format.Format;
+import org.apache.sirona.reporting.web.plugin.report.format.HTMLFormat;
+import org.apache.sirona.reporting.web.plugin.report.format.MapFormat;
+import org.apache.sirona.reporting.web.template.MapBuilder;
+import org.apache.sirona.repositories.Repository;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -38,9 +38,9 @@ import java.util.Collection;
import java.util.Map;
import java.util.TreeMap;
-import static org.apache.commons.monitoring.reporting.web.plugin.report.format.MapFormat.format;
-import static org.apache.commons.monitoring.reporting.web.plugin.report.format.MapFormat.generateLine;
-import static org.apache.commons.monitoring.reporting.web.plugin.report.format.MapFormat.timeUnit;
+import static org.apache.sirona.reporting.web.plugin.report.format.MapFormat.format;
+import static org.apache.sirona.reporting.web.plugin.report.format.MapFormat.generateLine;
+import static org.apache.sirona.reporting.web.plugin.report.format.MapFormat.timeUnit;
public class ReportEndpoints {
@Regex
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/ReportPlugin.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/ReportPlugin.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/ReportPlugin.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/ReportPlugin.java Tue Oct 22 10:03:02 2013
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.plugin.report;
+package org.apache.sirona.reporting.web.plugin.report;
-import org.apache.commons.monitoring.reporting.web.plugin.Plugin;
+import org.apache.sirona.reporting.web.plugin.Plugin;
public class ReportPlugin implements Plugin {
@Override
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/CSVFormat.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/CSVFormat.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/CSVFormat.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/CSVFormat.java Tue Oct 22 10:03:02 2013
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.plugin.report.format;
+package org.apache.sirona.reporting.web.plugin.report.format;
-import org.apache.commons.monitoring.configuration.Configuration;
-import org.apache.commons.monitoring.counters.Unit;
-import org.apache.commons.monitoring.reporting.web.handler.api.Template;
-import org.apache.commons.monitoring.reporting.web.template.MapBuilder;
+import org.apache.sirona.configuration.Configuration;
+import org.apache.sirona.counters.Unit;
+import org.apache.sirona.reporting.web.handler.api.Template;
+import org.apache.sirona.reporting.web.template.MapBuilder;
import java.util.Collection;
import java.util.Map;
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/Format.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/Format.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/Format.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/Format.java Tue Oct 22 10:03:02 2013
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.plugin.report.format;
+package org.apache.sirona.reporting.web.plugin.report.format;
-import org.apache.commons.monitoring.reporting.web.handler.api.Template;
+import org.apache.sirona.reporting.web.handler.api.Template;
import java.util.Map;
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/HTMLFormat.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/HTMLFormat.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/HTMLFormat.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/HTMLFormat.java Tue Oct 22 10:03:02 2013
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.plugin.report.format;
+package org.apache.sirona.reporting.web.plugin.report.format;
-import org.apache.commons.monitoring.counters.Unit;
-import org.apache.commons.monitoring.reporting.web.handler.api.Template;
-import org.apache.commons.monitoring.reporting.web.template.MapBuilder;
+import org.apache.sirona.counters.Unit;
+import org.apache.sirona.reporting.web.handler.api.Template;
+import org.apache.sirona.reporting.web.template.MapBuilder;
import java.util.Map;
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/JSONFormat.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/JSONFormat.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/JSONFormat.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/JSONFormat.java Tue Oct 22 10:03:02 2013
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.plugin.report.format;
+package org.apache.sirona.reporting.web.plugin.report.format;
-import org.apache.commons.monitoring.counters.MetricData;
-import org.apache.commons.monitoring.reporting.web.handler.api.Template;
-import org.apache.commons.monitoring.reporting.web.template.MapBuilder;
-import org.apache.commons.monitoring.repositories.Repository;
+import org.apache.sirona.counters.MetricData;
+import org.apache.sirona.reporting.web.handler.api.Template;
+import org.apache.sirona.reporting.web.template.MapBuilder;
+import org.apache.sirona.repositories.Repository;
import java.util.Map;
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/MapFormat.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/MapFormat.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/MapFormat.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/MapFormat.java Tue Oct 22 10:03:02 2013
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.plugin.report.format;
+package org.apache.sirona.reporting.web.plugin.report.format;
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.counters.Counter;
-import org.apache.commons.monitoring.counters.MetricData;
-import org.apache.commons.monitoring.counters.Unit;
-import org.apache.commons.monitoring.repositories.Repository;
+import org.apache.sirona.Role;
+import org.apache.sirona.counters.Counter;
+import org.apache.sirona.counters.MetricData;
+import org.apache.sirona.counters.Unit;
+import org.apache.sirona.repositories.Repository;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/XMLFormat.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/XMLFormat.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/XMLFormat.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/XMLFormat.java Tue Oct 22 10:03:02 2013
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.plugin.report.format;
+package org.apache.sirona.reporting.web.plugin.report.format;
-import org.apache.commons.monitoring.counters.MetricData;
-import org.apache.commons.monitoring.reporting.web.handler.api.Template;
-import org.apache.commons.monitoring.reporting.web.template.MapBuilder;
-import org.apache.commons.monitoring.repositories.Repository;
+import org.apache.sirona.counters.MetricData;
+import org.apache.sirona.reporting.web.handler.api.Template;
+import org.apache.sirona.reporting.web.template.MapBuilder;
+import org.apache.sirona.repositories.Repository;
import java.util.Map;
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/thread/ThreadEndpoints.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/thread/ThreadEndpoints.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/thread/ThreadEndpoints.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/thread/ThreadEndpoints.java Tue Oct 22 10:03:02 2013
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.plugin.thread;
+package org.apache.sirona.reporting.web.plugin.thread;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.commons.monitoring.reporting.web.handler.api.Regex;
-import org.apache.commons.monitoring.reporting.web.handler.api.Template;
-import org.apache.commons.monitoring.reporting.web.template.MapBuilder;
+import org.apache.sirona.reporting.web.handler.api.Regex;
+import org.apache.sirona.reporting.web.handler.api.Template;
+import org.apache.sirona.reporting.web.template.MapBuilder;
import java.util.Map;
import java.util.TreeMap;
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/thread/ThreadPlugin.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/thread/ThreadPlugin.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/thread/ThreadPlugin.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/thread/ThreadPlugin.java Tue Oct 22 10:03:02 2013
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.plugin.thread;
+package org.apache.sirona.reporting.web.plugin.thread;
-import org.apache.commons.monitoring.reporting.web.plugin.Plugin;
+import org.apache.sirona.reporting.web.plugin.Plugin;
public class ThreadPlugin implements Plugin {
@Override
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/web/WebEndpoints.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/web/WebEndpoints.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/web/WebEndpoints.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/web/WebEndpoints.java Tue Oct 22 10:03:02 2013
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.plugin.web;
+package org.apache.sirona.reporting.web.plugin.web;
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.reporting.web.handler.api.Regex;
-import org.apache.commons.monitoring.reporting.web.handler.api.Template;
-import org.apache.commons.monitoring.reporting.web.plugin.json.Jsons;
-import org.apache.commons.monitoring.repositories.Repository;
-import org.apache.commons.monitoring.web.session.SessionGauge;
+import org.apache.sirona.Role;
+import org.apache.sirona.reporting.web.handler.api.Regex;
+import org.apache.sirona.reporting.web.handler.api.Template;
+import org.apache.sirona.reporting.web.plugin.json.Jsons;
+import org.apache.sirona.repositories.Repository;
+import org.apache.sirona.web.session.SessionGauge;
public class WebEndpoints {
@Regex
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/web/WebPlugin.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/web/WebPlugin.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/web/WebPlugin.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/web/WebPlugin.java Tue Oct 22 10:03:02 2013
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.plugin.web;
+package org.apache.sirona.reporting.web.plugin.web;
-import org.apache.commons.monitoring.reporting.web.plugin.Plugin;
+import org.apache.sirona.reporting.web.plugin.Plugin;
public class WebPlugin implements Plugin {
@Override
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/registration/MonitoringReportingInitializer.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/registration/MonitoringReportingInitializer.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/registration/MonitoringReportingInitializer.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/registration/MonitoringReportingInitializer.java Tue Oct 22 10:03:02 2013
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.registration;
+package org.apache.sirona.reporting.web.registration;
-import org.apache.commons.monitoring.configuration.Configuration;
-import org.apache.commons.monitoring.reporting.web.MonitoringController;
+import org.apache.sirona.configuration.Configuration;
+import org.apache.sirona.reporting.web.MonitoringController;
import javax.servlet.DispatcherType;
import javax.servlet.ServletContainerInitializer;
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/template/MapBuilder.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/template/MapBuilder.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/template/MapBuilder.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/template/MapBuilder.java Tue Oct 22 10:03:02 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.template;
+package org.apache.sirona.reporting.web.template;
import java.util.HashMap;
import java.util.Map;
Modified: incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/template/Templates.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/template/Templates.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/template/Templates.java (original)
+++ incubator/sirona/trunk/reporting/src/main/java/org/apache/sirona/reporting/web/template/Templates.java Tue Oct 22 10:03:02 2013
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.web.template;
+package org.apache.sirona.reporting.web.template;
-import org.apache.commons.monitoring.configuration.Configuration;
-import org.apache.commons.monitoring.reporting.web.plugin.PluginRepository;
+import org.apache.sirona.configuration.Configuration;
+import org.apache.sirona.reporting.web.plugin.PluginRepository;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
Modified: incubator/sirona/trunk/reporting/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer?rev=1534581&r1=1534580&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer (original)
+++ incubator/sirona/trunk/reporting/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer Tue Oct 22 10:03:02 2013
@@ -1 +1 @@
-org.apache.commons.monitoring.reporting.web.registration.MonitoringReportingInitializer
+org.apache.sirona.reporting.web.registration.MonitoringReportingInitializer
Copied: incubator/sirona/trunk/reporting/src/main/resources/META-INF/services/org.apache.sirona.gauges.Gauge (from r1534560, incubator/sirona/trunk/reporting/src/main/resources/META-INF/services/org.apache.commons.monitoring.gauges.Gauge)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/resources/META-INF/services/org.apache.sirona.gauges.Gauge?p2=incubator/sirona/trunk/reporting/src/main/resources/META-INF/services/org.apache.sirona.gauges.Gauge&p1=incubator/sirona/trunk/reporting/src/main/resources/META-INF/services/org.apache.commons.monitoring.gauges.Gauge&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/resources/META-INF/services/org.apache.commons.monitoring.gauges.Gauge (original)
+++ incubator/sirona/trunk/reporting/src/main/resources/META-INF/services/org.apache.sirona.gauges.Gauge Tue Oct 22 10:03:02 2013
@@ -1,2 +1,2 @@
-org.apache.commons.monitoring.reporting.web.plugin.jvm.gauges.CPUGauge
-org.apache.commons.monitoring.reporting.web.plugin.jvm.gauges.UsedMemoryGauge
+org.apache.sirona.reporting.web.plugin.jvm.gauges.CPUGauge
+org.apache.sirona.reporting.web.plugin.jvm.gauges.UsedMemoryGauge
Copied: incubator/sirona/trunk/reporting/src/main/resources/META-INF/services/org.apache.sirona.reporting.web.plugin.Plugin (from r1534560, incubator/sirona/trunk/reporting/src/main/resources/META-INF/services/org.apache.commons.monitoring.reporting.web.plugin.Plugin)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/resources/META-INF/services/org.apache.sirona.reporting.web.plugin.Plugin?p2=incubator/sirona/trunk/reporting/src/main/resources/META-INF/services/org.apache.sirona.reporting.web.plugin.Plugin&p1=incubator/sirona/trunk/reporting/src/main/resources/META-INF/services/org.apache.commons.monitoring.reporting.web.plugin.Plugin&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/resources/META-INF/services/org.apache.commons.monitoring.reporting.web.plugin.Plugin (original)
+++ incubator/sirona/trunk/reporting/src/main/resources/META-INF/services/org.apache.sirona.reporting.web.plugin.Plugin Tue Oct 22 10:03:02 2013
@@ -1,6 +1,6 @@
-org.apache.commons.monitoring.reporting.web.plugin.report.ReportPlugin
-org.apache.commons.monitoring.reporting.web.plugin.jmx.JMXPlugin
-org.apache.commons.monitoring.reporting.web.plugin.jvm.JVMPlugin
-org.apache.commons.monitoring.reporting.web.plugin.jta.JTAPlugin
-org.apache.commons.monitoring.reporting.web.plugin.thread.ThreadPlugin
-org.apache.commons.monitoring.reporting.web.plugin.web.WebPlugin
+org.apache.sirona.reporting.web.plugin.report.ReportPlugin
+org.apache.sirona.reporting.web.plugin.jmx.JMXPlugin
+org.apache.sirona.reporting.web.plugin.jvm.JVMPlugin
+org.apache.sirona.reporting.web.plugin.jta.JTAPlugin
+org.apache.sirona.reporting.web.plugin.thread.ThreadPlugin
+org.apache.sirona.reporting.web.plugin.web.WebPlugin
Modified: incubator/sirona/trunk/reporting/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/main/webapp/WEB-INF/web.xml?rev=1534581&r1=1534580&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/sirona/trunk/reporting/src/main/webapp/WEB-INF/web.xml Tue Oct 22 10:03:02 2013
@@ -22,16 +22,16 @@
<context-param> <!-- only register this webapp gauges -->
<param-name>monitoring.discovery.packages</param-name>
- <param-value>org.apache.commons.monitoring.reporting.web.plugin</param-value>
+ <param-value>org.apache.sirona.reporting.web.plugin</param-value>
</context-param>
<listener>
- <listener-class>org.apache.commons.monitoring.web.discovery.GaugeDiscoveryListener</listener-class>
+ <listener-class>org.apache.sirona.web.discovery.GaugeDiscoveryListener</listener-class>
</listener>
<filter>
<filter-name>Monitoring</filter-name>
- <filter-class>org.apache.commons.monitoring.reporting.web.MonitoringController</filter-class>
+ <filter-class>org.apache.sirona.reporting.web.MonitoringController</filter-class>
</filter>
<filter-mapping>
Copied: incubator/sirona/trunk/reporting/src/test/java/org/apache/sirona/reporting/FormatsTest.java (from r1534560, incubator/sirona/trunk/reporting/src/test/java/org/apache/commons/monitoring/reporting/FormatsTest.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/test/java/org/apache/sirona/reporting/FormatsTest.java?p2=incubator/sirona/trunk/reporting/src/test/java/org/apache/sirona/reporting/FormatsTest.java&p1=incubator/sirona/trunk/reporting/src/test/java/org/apache/commons/monitoring/reporting/FormatsTest.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/test/java/org/apache/commons/monitoring/reporting/FormatsTest.java (original)
+++ incubator/sirona/trunk/reporting/src/test/java/org/apache/sirona/reporting/FormatsTest.java Tue Oct 22 10:03:02 2013
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting;
+package org.apache.sirona.reporting;
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.counters.Counter;
-import org.apache.commons.monitoring.reporting.web.handler.api.Template;
-import org.apache.commons.monitoring.reporting.web.handler.api.TemplateHelper;
-import org.apache.commons.monitoring.reporting.web.plugin.report.format.CSVFormat;
-import org.apache.commons.monitoring.reporting.web.plugin.report.format.Format;
-import org.apache.commons.monitoring.reporting.web.template.Templates;
-import org.apache.commons.monitoring.repositories.Repository;
+import org.apache.sirona.Role;
+import org.apache.sirona.counters.Counter;
+import org.apache.sirona.reporting.web.handler.api.Template;
+import org.apache.sirona.reporting.web.handler.api.TemplateHelper;
+import org.apache.sirona.reporting.web.plugin.report.format.CSVFormat;
+import org.apache.sirona.reporting.web.plugin.report.format.Format;
+import org.apache.sirona.reporting.web.template.Templates;
+import org.apache.sirona.repositories.Repository;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
Modified: incubator/sirona/trunk/reporting/src/test/java/org/apache/sirona/reporting/template/CounterDetailTemplateTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reporting/src/test/java/org/apache/sirona/reporting/template/CounterDetailTemplateTest.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/reporting/src/test/java/org/apache/sirona/reporting/template/CounterDetailTemplateTest.java (original)
+++ incubator/sirona/trunk/reporting/src/test/java/org/apache/sirona/reporting/template/CounterDetailTemplateTest.java Tue Oct 22 10:03:02 2013
@@ -14,20 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.reporting.template;
+package org.apache.sirona.reporting.template;
import com.gargoylesoftware.htmlunit.WebAssert;
import com.gargoylesoftware.htmlunit.WebClient;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import org.apache.catalina.startup.Constants;
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.counters.Counter;
-import org.apache.commons.monitoring.counters.Unit;
-import org.apache.commons.monitoring.reporting.web.plugin.Plugin;
-import org.apache.commons.monitoring.reporting.web.plugin.report.ReportPlugin;
-import org.apache.commons.monitoring.reporting.web.plugin.report.format.MapFormat;
-import org.apache.commons.monitoring.reporting.web.registration.MonitoringReportingInitializer;
-import org.apache.commons.monitoring.repositories.Repository;
+import org.apache.sirona.Role;
+import org.apache.sirona.counters.Counter;
+import org.apache.sirona.counters.Unit;
+import org.apache.sirona.reporting.web.plugin.Plugin;
+import org.apache.sirona.reporting.web.plugin.report.ReportPlugin;
+import org.apache.sirona.reporting.web.plugin.report.format.MapFormat;
+import org.apache.sirona.reporting.web.registration.MonitoringReportingInitializer;
+import org.apache.sirona.repositories.Repository;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
@@ -57,7 +57,7 @@ public class CounterDetailTemplateTest {
// real impl of this method starts here
return ShrinkWrap.create(WebArchive.class, "sirona-test.war")
- .addPackages(true, "org.apache.commons.monitoring.reporting.web")
+ .addPackages(true, "org.apache.sirona.reporting.web")
.addAsServiceProvider(Plugin.class, ReportPlugin.class)
.addAsWebInfResource(new ClassLoaderAsset("templates/report/report.vm"), "classes/templates/report/report.vm")
.addAsWebInfResource(new ClassLoaderAsset("templates/report/counter.vm"), "classes/templates/report/counter.vm")
Copied: incubator/sirona/trunk/spring/src/main/java/org/apache/sirona/spring/AopaliancePerformanceInterceptor.java (from r1534560, incubator/sirona/trunk/spring/src/main/java/org/apache/commons/monitoring/spring/AopaliancePerformanceInterceptor.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/spring/src/main/java/org/apache/sirona/spring/AopaliancePerformanceInterceptor.java?p2=incubator/sirona/trunk/spring/src/main/java/org/apache/sirona/spring/AopaliancePerformanceInterceptor.java&p1=incubator/sirona/trunk/spring/src/main/java/org/apache/commons/monitoring/spring/AopaliancePerformanceInterceptor.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/spring/src/main/java/org/apache/commons/monitoring/spring/AopaliancePerformanceInterceptor.java (original)
+++ incubator/sirona/trunk/spring/src/main/java/org/apache/sirona/spring/AopaliancePerformanceInterceptor.java Tue Oct 22 10:03:02 2013
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.commons.monitoring.spring;
+package org.apache.sirona.spring;
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
-import org.apache.commons.monitoring.aop.AbstractPerformanceInterceptor;
+import org.apache.sirona.aop.AbstractPerformanceInterceptor;
/**
* Spring-aop implementation of PerformanceInterceptor.
Copied: incubator/sirona/trunk/spring/src/main/java/org/apache/sirona/spring/BeanNameMonitoringAutoProxyCreator.java (from r1534560, incubator/sirona/trunk/spring/src/main/java/org/apache/commons/monitoring/spring/BeanNameMonitoringAutoProxyCreator.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/spring/src/main/java/org/apache/sirona/spring/BeanNameMonitoringAutoProxyCreator.java?p2=incubator/sirona/trunk/spring/src/main/java/org/apache/sirona/spring/BeanNameMonitoringAutoProxyCreator.java&p1=incubator/sirona/trunk/spring/src/main/java/org/apache/commons/monitoring/spring/BeanNameMonitoringAutoProxyCreator.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/spring/src/main/java/org/apache/commons/monitoring/spring/BeanNameMonitoringAutoProxyCreator.java (original)
+++ incubator/sirona/trunk/spring/src/main/java/org/apache/sirona/spring/BeanNameMonitoringAutoProxyCreator.java Tue Oct 22 10:03:02 2013
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.commons.monitoring.spring;
+package org.apache.sirona.spring;
-import org.apache.commons.monitoring.aop.DefaultMonitorNameExtractor;
-import org.apache.commons.monitoring.aop.MonitorNameExtractor;
+import org.apache.sirona.aop.DefaultMonitorNameExtractor;
+import org.apache.sirona.aop.MonitorNameExtractor;
import org.springframework.aop.TargetSource;
import org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator;
Copied: incubator/sirona/trunk/spring/src/main/java/org/apache/sirona/spring/PointcutMonitoringAutoProxyCreator.java (from r1534560, incubator/sirona/trunk/spring/src/main/java/org/apache/commons/monitoring/spring/PointcutMonitoringAutoProxyCreator.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/spring/src/main/java/org/apache/sirona/spring/PointcutMonitoringAutoProxyCreator.java?p2=incubator/sirona/trunk/spring/src/main/java/org/apache/sirona/spring/PointcutMonitoringAutoProxyCreator.java&p1=incubator/sirona/trunk/spring/src/main/java/org/apache/commons/monitoring/spring/PointcutMonitoringAutoProxyCreator.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/spring/src/main/java/org/apache/commons/monitoring/spring/PointcutMonitoringAutoProxyCreator.java (original)
+++ incubator/sirona/trunk/spring/src/main/java/org/apache/sirona/spring/PointcutMonitoringAutoProxyCreator.java Tue Oct 22 10:03:02 2013
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.commons.monitoring.spring;
+package org.apache.sirona.spring;
import org.aopalliance.aop.Advice;
-import org.apache.commons.monitoring.aop.DefaultMonitorNameExtractor;
-import org.apache.commons.monitoring.aop.MonitorNameExtractor;
+import org.apache.sirona.aop.DefaultMonitorNameExtractor;
+import org.apache.sirona.aop.MonitorNameExtractor;
import org.springframework.aop.Advisor;
import org.springframework.aop.Pointcut;
import org.springframework.aop.PointcutAdvisor;
Copied: incubator/sirona/trunk/spring/src/test/java/org/apache/sirona/spring/SpringMonitoringTest.java (from r1534560, incubator/sirona/trunk/spring/src/test/java/org/apache/commons/monitoring/spring/SpringMonitoringTest.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/spring/src/test/java/org/apache/sirona/spring/SpringMonitoringTest.java?p2=incubator/sirona/trunk/spring/src/test/java/org/apache/sirona/spring/SpringMonitoringTest.java&p1=incubator/sirona/trunk/spring/src/test/java/org/apache/commons/monitoring/spring/SpringMonitoringTest.java&r1=1534560&r2=1534581&rev=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/spring/src/test/java/org/apache/commons/monitoring/spring/SpringMonitoringTest.java (original)
+++ incubator/sirona/trunk/spring/src/test/java/org/apache/sirona/spring/SpringMonitoringTest.java Tue Oct 22 10:03:02 2013
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.spring;
+package org.apache.sirona.spring;
-import org.apache.commons.monitoring.Role;
-import org.apache.commons.monitoring.counters.Counter;
-import org.apache.commons.monitoring.repositories.Repository;
-import org.apache.commons.monitoring.spring.service.MyService;
+import org.apache.sirona.Role;
+import org.apache.sirona.counters.Counter;
+import org.apache.sirona.repositories.Repository;
+import org.apache.sirona.spring.service.MyService;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
Modified: incubator/sirona/trunk/spring/src/test/java/org/apache/sirona/spring/service/MyService.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/spring/src/test/java/org/apache/sirona/spring/service/MyService.java?rev=1534581&r1=1534560&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/spring/src/test/java/org/apache/sirona/spring/service/MyService.java (original)
+++ incubator/sirona/trunk/spring/src/test/java/org/apache/sirona/spring/service/MyService.java Tue Oct 22 10:03:02 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.monitoring.spring.service;
+package org.apache.sirona.spring.service;
public class MyService {
public String doIt() {
Modified: incubator/sirona/trunk/spring/src/test/resources/monitoring.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/spring/src/test/resources/monitoring.xml?rev=1534581&r1=1534580&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/spring/src/test/resources/monitoring.xml (original)
+++ incubator/sirona/trunk/spring/src/test/resources/monitoring.xml Tue Oct 22 10:03:02 2013
@@ -20,9 +20,9 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
- <bean id="service" class="org.apache.commons.monitoring.spring.service.MyService" />
+ <bean id="service" class="org.apache.sirona.spring.service.MyService" />
- <bean class="org.apache.commons.monitoring.spring.BeanNameMonitoringAutoProxyCreator">
+ <bean class="org.apache.sirona.spring.BeanNameMonitoringAutoProxyCreator">
<property name="beanNames">
<list>
<value>service</value>
Modified: incubator/sirona/trunk/src/site/markdown/basis.md
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/src/site/markdown/basis.md?rev=1534581&r1=1534580&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/src/site/markdown/basis.md (original)
+++ incubator/sirona/trunk/src/site/markdown/basis.md Tue Oct 22 10:03:02 2013
@@ -58,7 +58,7 @@ Gauges values are retrieved by interval:
## Monitor JDBC
-To monitor JDBC just configure your DataSource replacing its `java.sql.Driver` by `org.apache.commons.monitoring.jdbc.MonitoringDriver`
+To monitor JDBC just configure your DataSource replacing its `java.sql.Driver` by `org.apache.sirona.jdbc.MonitoringDriver`
and updating its jdbc url from `jdbc:foo:bar` to `jdbc:monitoring:foo:bar?delegateDriver=xxxxx`.
Note: delegateDriver needs to be the last parameter (if there are several).
Modified: incubator/sirona/trunk/src/site/markdown/collector.md
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/src/site/markdown/collector.md?rev=1534581&r1=1534580&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/src/site/markdown/collector.md (original)
+++ incubator/sirona/trunk/src/site/markdown/collector.md Tue Oct 22 10:03:02 2013
@@ -26,26 +26,26 @@ Default implementation only store data i
## Configuration
-Just use the collector `DataStoreFactory`: `org.apache.commons.monitoring.collector.server.store.CollectorDataStoreFactory`.
+Just use the collector `DataStoreFactory`: `org.apache.sirona.collector.server.store.CollectorDataStoreFactory`.
For instance your `commons-monitoring.properties` can look like:
```
-org.apache.commons.monitoring.store.DataStore = org.apache.commons.monitoring.collector.server.store.CollectorDataStoreFactory
+org.apache.sirona.store.DataStore = org.apache.sirona.collector.server.store.CollectorDataStoreFactory
```
-The `GaugeDataStore` can be configured through `org.apache.commons.monitoring.collector.gauge.store-class` property.
+The `GaugeDataStore` can be configured through `org.apache.sirona.collector.gauge.store-class` property.
By default it uses the in memory implementation but you can set your own one if you want.
Note: if your `GaugeDataStore` has a constructor with a `String`, the marker of the store will be passed to the `GaugeDataStore`.
-The `CounterDataStore` needs to be an instance of `org.apache.commons.monitoring.collector.server.store.counter.CollectorCounterStore`.
+The `CounterDataStore` needs to be an instance of `org.apache.sirona.collector.server.store.counter.CollectorCounterStore`.
By default it is in memory too but it is easily extensible to be persisted if needed.
## Installing the collector
To setup the collector you just need to configure the `DataStoreFactory` (see configuration part) and configure the
-servlet `org.apache.commons.monitoring.collector.server.Collector`.
+servlet `org.apache.sirona.collector.server.Collector`.
## Pushing data
Modified: incubator/sirona/trunk/src/site/markdown/configuration.md
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/src/site/markdown/configuration.md?rev=1534581&r1=1534580&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/src/site/markdown/configuration.md (original)
+++ incubator/sirona/trunk/src/site/markdown/configuration.md Tue Oct 22 10:03:02 2013
@@ -20,55 +20,55 @@ under the License.
### Location
Configuration relies on `commons-monitoring.properties` file which should be found in the commons-monitoring-core classloader.
-Note: you can change the file name using org.apache.commons.monitoring.configuration system property.
+Note: you can change the file name using org.apache.sirona.configuration system property.
### Utilities
-`org.apache.commons.monitoring.configuration.Configuration` has several utility methods to get
+`org.apache.sirona.configuration.Configuration` has several utility methods to get
int, boolean... from the properties file. You can reuse it in your monitoring extensions if you want.
Another interesting usage of Configuration class is to be a basic lifecycle handling of your objects.
-Using `org.apache.commons.monitoring.configuration.Configuration.newInstance` method you can
-decorate your class methods with `org.apache.commons.monitoring.configuration.Configuration.Created`
-and `org.apache.commons.monitoring.configuration.Configuration.Destroying` to get lifecycle hooks.
+Using `org.apache.sirona.configuration.Configuration.newInstance` method you can
+decorate your class methods with `org.apache.sirona.configuration.Configuration.Created`
+and `org.apache.sirona.configuration.Configuration.Destroying` to get lifecycle hooks.
`Destroying` is called when the monitoring is stopped. Generally since commons-monitoring-core is deployed in the
container or JVM classloader it is with the JVM but sometimes you can deploy it in your application. In this case
you'll need to either configure the `javax.servlet.ServletContextListener`
-`org.apache.commons.monitoring.web.lifecycle.CommonsMonitoringLifecycle` from reporting module
+`org.apache.sirona.web.lifecycle.CommonsMonitoringLifecycle` from reporting module
or to call manually `Configuration.shutdown()` method.
### Main configuration keys (by module)
#### Core
-* org.apache.commons.monitoring.configuration: the configuration file path if not using the default
-* org.apache.commons.monitoring.shutdown.hook: boolean, true by default. Should be set to false when deploying commons-monitoring-core in an application (see Utilities part).
-* org.apache.commons.monitoring.gauge.max-size: int, 100 by default. Number of gauge measures to keep in memory when not persistent.
-* org.apache.commons.monitoring.gauge.memory.period: int, 4000 (ms) by default. Period for memory gauge.
-* org.apache.commons.monitoring.gauge.cpu.period: int, 4000 (ms) by default. Period for CPU gauge.
-* org.apache.commons.monitoring.store.DataStore: qualified class name, default `org.apache.commons.monitoring.store.DefaultDataStore`. DataStore to use.
-* org.apache.commons.monitoring.repositories.Repository: qualified class name, default `org.apache.commons.monitoring.repositories.DefaultRepository`. Repository to use.
-* org.apache.commons.monitoring.<name>.period: the period to use to flush counters for a batch data store (like graphite one)
+* org.apache.sirona.configuration: the configuration file path if not using the default
+* org.apache.sirona.shutdown.hook: boolean, true by default. Should be set to false when deploying commons-monitoring-core in an application (see Utilities part).
+* org.apache.sirona.gauge.max-size: int, 100 by default. Number of gauge measures to keep in memory when not persistent.
+* org.apache.sirona.gauge.memory.period: int, 4000 (ms) by default. Period for memory gauge.
+* org.apache.sirona.gauge.cpu.period: int, 4000 (ms) by default. Period for CPU gauge.
+* org.apache.sirona.store.DataStore: qualified class name, default `org.apache.sirona.store.DefaultDataStore`. DataStore to use.
+* org.apache.sirona.repositories.Repository: qualified class name, default `org.apache.sirona.repositories.DefaultRepository`. Repository to use.
+* org.apache.sirona.<name>.period: the period to use to flush counters for a batch data store (like graphite one)
#### Reporting
* org.apache.commons.proxy.ProxyFactory: qualified class name. ProxyFactory to use for client aop.
* [plugin name].activated: boolean, true by default. Should the plugin referenced by [plugin.name] be used.
-* org.apache.commons.monitoring.jmx.method.allowed: boolean, true by default. Are JMX method invocation allowed.
-* org.apache.commons.monitoring.gauge.csv.separator: char, ';' by default. CSV separator for CSV report.
-* org.apache.commons.monitoring.gauge.jta.period: jta gauge period
-* org.apache.commons.monitoring.gauge.memory.period: memory gauge period
-* org.apache.commons.monitoring.gauge.cpu.period: cpu gauge period
-* org.apache.commons.monitoring.reporting.activated: if auto deployment of reporting module is activated
-* org.apache.commons.monitoring.reporting.mapping: the mapping of monitoring GUI
+* org.apache.sirona.jmx.method.allowed: boolean, true by default. Are JMX method invocation allowed.
+* org.apache.sirona.gauge.csv.separator: char, ';' by default. CSV separator for CSV report.
+* org.apache.sirona.gauge.jta.period: jta gauge period
+* org.apache.sirona.gauge.memory.period: memory gauge period
+* org.apache.sirona.gauge.cpu.period: cpu gauge period
+* org.apache.sirona.reporting.activated: if auto deployment of reporting module is activated
+* org.apache.sirona.reporting.mapping: the mapping of monitoring GUI
#### Web
-* org.apache.commons.monitoring.web.activated: if auto deployment of web module is activated
-* org.apache.commons.monitoring.web.monitored-urls: the mapping of monitored urls
-* org.apache.commons.monitoring.gauge.sessions.period: the gauge period for sessions number monitoring
+* org.apache.sirona.web.activated: if auto deployment of web module is activated
+* org.apache.sirona.web.monitored-urls: the mapping of monitored urls
+* org.apache.sirona.gauge.sessions.period: the gauge period for sessions number monitoring
#### CDI
-* org.apache.commons.monitoring.cdi.enabled: a boolean to activate/deactivate CDI interceptors config
+* org.apache.sirona.cdi.enabled: a boolean to activate/deactivate CDI interceptors config
Modified: incubator/sirona/trunk/src/site/markdown/cube.md
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/src/site/markdown/cube.md?rev=1534581&r1=1534580&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/src/site/markdown/cube.md (original)
+++ incubator/sirona/trunk/src/site/markdown/cube.md Tue Oct 22 10:03:02 2013
@@ -22,34 +22,34 @@ Cube module allows to push counters and
## Configuration
-org.apache.commons.monitoring.store.DataStore = org.apache.commons.monitoring.cube.CubeDataStore
-org.apache.commons.monitoring.cube.period = 100
-org.apache.commons.monitoring.cube.CubeBuilder.collector = http://localhost:1234/collector/1.0/event/put
-* `org.apache.commons.monitoring.cube.CubeBuilder.collector`: the cube event collector address (`http://xxx:1234/collector/1.0/event/put` for instance)
-* `org.apache.commons.monitoring.cube.CubeBuilder.proxyHost`: optionally a proxy host
-* `org.apache.commons.monitoring.cube.CubeBuilder.proxyPort`: optionally a proxy port
+org.apache.sirona.store.DataStore = org.apache.sirona.cube.CubeDataStore
+org.apache.sirona.cube.period = 100
+org.apache.sirona.cube.CubeBuilder.collector = http://localhost:1234/collector/1.0/event/put
+* `org.apache.sirona.cube.CubeBuilder.collector`: the cube event collector address (`http://xxx:1234/collector/1.0/event/put` for instance)
+* `org.apache.sirona.cube.CubeBuilder.proxyHost`: optionally a proxy host
+* `org.apache.sirona.cube.CubeBuilder.proxyPort`: optionally a proxy port
For instance your `commons-monitoring.properties` can look like:
```
-org.apache.commons.monitoring.cube.CubeBuilder.collector = http://localhost:1234/collector/1.0/event/put
+org.apache.sirona.cube.CubeBuilder.collector = http://localhost:1234/collector/1.0/event/put
```
## DataStore
-To push metrics (Gauges + Counters) to Graphite you can use the dedicated `DataStore`: `org.apache.commons.monitoring.cube.CubeDataStore`.
+To push metrics (Gauges + Counters) to Graphite you can use the dedicated `DataStore`: `org.apache.sirona.cube.CubeDataStore`.
Simply add to `commons-monitoring.properties` the line:
```
-org.apache.commons.monitoring.store.DataStore = org.apache.commons.monitoring.cube.CubeDataStore
+org.apache.sirona.store.DataStore = org.apache.sirona.cube.CubeDataStore
```
### Counters
You can also configure the period used to flush counters values:
-* `org.apache.commons.monitoring.cube.period`: which period to use to push counters data to Graphite (default to 1mn).
+* `org.apache.sirona.cube.period`: which period to use to push counters data to Graphite (default to 1mn).
## Limitations (ATM)
Modified: incubator/sirona/trunk/src/site/markdown/graphite.md
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/src/site/markdown/graphite.md?rev=1534581&r1=1534580&r2=1534581&view=diff
==============================================================================
--- incubator/sirona/trunk/src/site/markdown/graphite.md (original)
+++ incubator/sirona/trunk/src/site/markdown/graphite.md Tue Oct 22 10:03:02 2013
@@ -22,31 +22,31 @@ Graphite module allows to push counters
## Configuration
-* `org.apache.commons.monitoring.graphite.GraphiteBuilder.address`: the graphite instance host/IP
-* `org.apache.commons.monitoring.graphite.GraphiteBuilder.port`: the graphite instance port
-* `org.apache.commons.monitoring.graphite.GraphiteBuilder.charset`: the charset to use with this Graphite instance
+* `org.apache.sirona.graphite.GraphiteBuilder.address`: the graphite instance host/IP
+* `org.apache.sirona.graphite.GraphiteBuilder.port`: the graphite instance port
+* `org.apache.sirona.graphite.GraphiteBuilder.charset`: the charset to use with this Graphite instance
For instance your `commons-monitoring.properties` can look like:
```
-org.apache.commons.monitoring.graphite.GraphiteBuilder.address = localhost
-org.apache.commons.monitoring.graphite.GraphiteBuilder.port = 1234
+org.apache.sirona.graphite.GraphiteBuilder.address = localhost
+org.apache.sirona.graphite.GraphiteBuilder.port = 1234
```
## DataStore
-To push metrics (Gauges + Counters) to Graphite you can use the dedicated `DataStore`: `org.apache.commons.monitoring.graphite.GraphiteDataStore`.
+To push metrics (Gauges + Counters) to Graphite you can use the dedicated `DataStore`: `org.apache.sirona.graphite.GraphiteDataStore`.
Simply add to `commons-monitoring.properties` the line:
```
-org.apache.commons.monitoring.store.DataStore = org.apache.commons.monitoring.graphite.GraphiteDataStore
+org.apache.sirona.store.DataStore = org.apache.sirona.graphite.GraphiteDataStore
```
### Counters
You can also configure the period used to flush counters values:
-* `org.apache.commons.monitoring.graphite.period`: which period to use to push counters data to Graphite (default to 1mn).
+* `org.apache.sirona.graphite.period`: which period to use to push counters data to Graphite (default to 1mn).
## Limitations