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/11/15 10:31:22 UTC
svn commit: r1542210 - in /incubator/sirona/trunk: ./
agent/performance/jdbc/src/main/java/org/apache/sirona/jdbc/
server/collector/src/main/resources/META-INF/
server/collector/src/test/java/org/apache/sirona/collector/server/
server/plugins/ server/p...
Author: rmannibucau
Date: Fri Nov 15 09:31:20 2013
New Revision: 1542210
URL: http://svn.apache.org/r1542210
Log:
moving plugin api in its own jar + updating reporting and collector war NOTICE/LICENSE files
Added:
incubator/sirona/trunk/server/collector/src/main/resources/META-INF/
incubator/sirona/trunk/server/collector/src/main/resources/META-INF/LICENSE
- copied unchanged from r1542180, incubator/sirona/trunk/server/reporting/src/main/resources/META-INF/LICENSE
incubator/sirona/trunk/server/collector/src/main/resources/META-INF/NOTICE
- copied, changed from r1542180, incubator/sirona/trunk/server/reporting/src/main/resources/META-INF/NOTICE
incubator/sirona/trunk/server/plugins/api/
incubator/sirona/trunk/server/plugins/api/pom.xml
incubator/sirona/trunk/server/plugins/api/src/
incubator/sirona/trunk/server/plugins/api/src/main/
incubator/sirona/trunk/server/plugins/api/src/main/java/
incubator/sirona/trunk/server/plugins/api/src/main/java/org/
incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/
incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/
incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/
incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/
incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/plugin/
incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/plugin/api/
incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/plugin/api/Local.java
- copied, changed from r1542180, incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/Local.java
incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/plugin/api/MapBuilder.java
- copied, changed from r1542180, incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/template/MapBuilder.java
incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/plugin/api/Plugin.java
incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/plugin/api/Regex.java
- copied, changed from r1542180, incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/Regex.java
incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/plugin/api/Template.java
- copied, changed from r1542180, incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/Template.java
incubator/sirona/trunk/server/plugins/api/src/main/resources/
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/TemplateHelper.java
- copied, changed from r1542180, incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/TemplateHelper.java
incubator/sirona/trunk/server/reporting/src/main/resources/META-INF/services/org.apache.sirona.reporting.web.plugin.api.Plugin
- copied unchanged from r1542180, incubator/sirona/trunk/server/reporting/src/main/resources/META-INF/services/org.apache.sirona.reporting.web.plugin.Plugin
Removed:
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/Local.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/Plugin.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/template/MapBuilder.java
incubator/sirona/trunk/server/reporting/src/main/resources/META-INF/services/org.apache.sirona.reporting.web.plugin.Plugin
Modified:
incubator/sirona/trunk/agent/performance/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoredDataSource.java
incubator/sirona/trunk/agent/performance/jdbc/src/main/java/org/apache/sirona/jdbc/SironaDriver.java
incubator/sirona/trunk/pom.xml
incubator/sirona/trunk/server/collector/src/test/java/org/apache/sirona/collector/server/HttpCollectorTest.java
incubator/sirona/trunk/server/plugins/pom.xml
incubator/sirona/trunk/server/reporting/pom.xml
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/SironaController.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/FilteringEndpoints.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/HomeEndpoint.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/internal/EndpointInfo.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/internal/Invoker.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/PluginRepository.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/gauge/GaugeEndpoints.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/gauge/GaugePlugin.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXEndpoints.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXPlugin.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jta/JTAEndpoints.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jta/JTAPlugin.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/JVMEndpoints.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/JVMPlugin.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/ReportEndpoints.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/ReportPlugin.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/CSVFormat.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/Format.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/HTMLFormat.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/JSONFormat.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/XMLFormat.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/status/StatusEndpoints.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/status/StatusPlugin.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/thread/ThreadEndpoints.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/thread/ThreadPlugin.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/web/WebEndpoints.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/web/WebPlugin.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/registration/SironaReportingInitializer.java
incubator/sirona/trunk/server/reporting/src/main/resources/META-INF/NOTICE
incubator/sirona/trunk/server/reporting/src/test/java/org/apache/sirona/reporting/FormatsTest.java
incubator/sirona/trunk/src/site/markdown/collector.md
incubator/sirona/trunk/src/site/markdown/configuration.md
incubator/sirona/trunk/src/site/markdown/cube.md
incubator/sirona/trunk/src/site/markdown/graphite.md
incubator/sirona/trunk/src/site/markdown/index.md
incubator/sirona/trunk/src/site/markdown/instrumentation.md
incubator/sirona/trunk/src/site/markdown/jta.md
incubator/sirona/trunk/src/site/markdown/plugins.md
incubator/sirona/trunk/src/site/markdown/reporting.md
incubator/sirona/trunk/src/site/markdown/web.md
Modified: incubator/sirona/trunk/agent/performance/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoredDataSource.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/performance/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoredDataSource.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/performance/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoredDataSource.java (original)
+++ incubator/sirona/trunk/agent/performance/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoredDataSource.java Fri Nov 15 09:31:20 2013
@@ -142,6 +142,6 @@ public class MonitoredDataSource impleme
public Logger getParentLogger()
throws SQLFeatureNotSupportedException {
- return Logger.getLogger("commons-monitoring.datasource");
+ return Logger.getLogger("org.apache.sirona.jdbc.datasource");
}
}
Modified: incubator/sirona/trunk/agent/performance/jdbc/src/main/java/org/apache/sirona/jdbc/SironaDriver.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/performance/jdbc/src/main/java/org/apache/sirona/jdbc/SironaDriver.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/performance/jdbc/src/main/java/org/apache/sirona/jdbc/SironaDriver.java (original)
+++ incubator/sirona/trunk/agent/performance/jdbc/src/main/java/org/apache/sirona/jdbc/SironaDriver.java Fri Nov 15 09:31:20 2013
@@ -93,6 +93,6 @@ public class SironaDriver implements Dri
// @Override // java 7
public Logger getParentLogger() throws SQLFeatureNotSupportedException {
- return Logger.getLogger("commons-monitoring.jdbc-driver");
+ return Logger.getLogger("org.apache.sirona.jdbc.driver");
}
}
Modified: incubator/sirona/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/pom.xml?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/pom.xml (original)
+++ incubator/sirona/trunk/pom.xml Fri Nov 15 09:31:20 2013
@@ -269,6 +269,23 @@
<configuration>
<archiveClasses>true</archiveClasses>
<attachClasses>true</attachClasses>
+ <webResources>
+ <resource>
+ <directory>${project.build.directory}/classes/META-INF</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>DEPENDENCIES</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ <filtering>false</filtering>
+ </resource>
+ </webResources>
+ <packagingExcludes>
+ WEB-INF/classes/META-INF/LICENSE,
+ WEB-INF/classes/META-INF/NOTICE,
+ WEB-INF/classes/META-INF/DEPENDENCIES
+ </packagingExcludes>
</configuration>
</plugin>
</plugins>
Copied: incubator/sirona/trunk/server/collector/src/main/resources/META-INF/NOTICE (from r1542180, incubator/sirona/trunk/server/reporting/src/main/resources/META-INF/NOTICE)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/collector/src/main/resources/META-INF/NOTICE?p2=incubator/sirona/trunk/server/collector/src/main/resources/META-INF/NOTICE&p1=incubator/sirona/trunk/server/reporting/src/main/resources/META-INF/NOTICE&r1=1542180&r2=1542210&rev=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/resources/META-INF/NOTICE (original)
+++ incubator/sirona/trunk/server/collector/src/main/resources/META-INF/NOTICE Fri Nov 15 09:31:20 2013
@@ -5,3 +5,38 @@ license: Apache v2
Based on Bootstrap. Icons by Font Awesome.
Placeholder images by placehold.it, lorempixel, and placecreature.
+
+-------------------
+
+Twitter bootstrap
+
+website: http://getbootstrap.com/
+license: MIT
+
+-------------------
+
+Bootstrap datetimepicker
+
+website: https://github.com/eternicode/bootstrap-datepicker
+license: Apache v2
+
+-------------------
+
+Table sorter
+
+website: http://mottie.github.io/tablesorter/docs/index.html
+license: MIT
+
+-------------------
+
+JQuery
+
+website: https://jquery.org/license/
+license: MIT
+
+-------------------
+
+JQuery Flot
+
+website: http://www.flotcharts.org/
+license: MIT
Modified: incubator/sirona/trunk/server/collector/src/test/java/org/apache/sirona/collector/server/HttpCollectorTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/collector/src/test/java/org/apache/sirona/collector/server/HttpCollectorTest.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/collector/src/test/java/org/apache/sirona/collector/server/HttpCollectorTest.java (original)
+++ incubator/sirona/trunk/server/collector/src/test/java/org/apache/sirona/collector/server/HttpCollectorTest.java Fri Nov 15 09:31:20 2013
@@ -21,7 +21,7 @@ import org.apache.sirona.Role;
import org.apache.sirona.configuration.ioc.IoCs;
import org.apache.sirona.counters.Counter;
import org.apache.sirona.counters.Unit;
-import org.apache.sirona.reporting.web.template.MapBuilder;
+import org.apache.sirona.reporting.web.plugin.api.MapBuilder;
import org.apache.sirona.repositories.Repository;
import org.apache.sirona.status.NodeStatus;
import org.apache.sirona.status.Status;
Added: incubator/sirona/trunk/server/plugins/api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/plugins/api/pom.xml?rev=1542210&view=auto
==============================================================================
--- incubator/sirona/trunk/server/plugins/api/pom.xml (added)
+++ incubator/sirona/trunk/server/plugins/api/pom.xml Fri Nov 15 09:31:20 2013
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>sirona-plugins</artifactId>
+ <groupId>org.apache.sirona</groupId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>sirona-plugins-api</artifactId>
+ <name>Apache Sirona Incubator :: Server :: Plugins :: API</name>
+</project>
Copied: incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/plugin/api/Local.java (from r1542180, incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/Local.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/plugin/api/Local.java?p2=incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/plugin/api/Local.java&p1=incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/Local.java&r1=1542180&r2=1542210&rev=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/Local.java (original)
+++ incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/plugin/api/Local.java Fri Nov 15 09:31:20 2013
@@ -14,13 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sirona.reporting.web.plugin;
+package org.apache.sirona.reporting.web.plugin.api;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+/**
+ * Use to set that a plugin doesn't work when deployed in the collector.
+ */
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
public @interface Local {
Copied: incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/plugin/api/MapBuilder.java (from r1542180, incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/template/MapBuilder.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/plugin/api/MapBuilder.java?p2=incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/plugin/api/MapBuilder.java&p1=incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/template/MapBuilder.java&r1=1542180&r2=1542210&rev=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/template/MapBuilder.java (original)
+++ incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/plugin/api/MapBuilder.java Fri Nov 15 09:31:20 2013
@@ -14,11 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sirona.reporting.web.template;
+package org.apache.sirona.reporting.web.plugin.api;
import java.util.HashMap;
import java.util.Map;
+/**
+ * Just a helper class to build fluently maps.
+ *
+ * @param <A> key type
+ * @param <B> value type
+ */
public class MapBuilder<A, B> {
private final Map<A, B> map = new HashMap<A, B>();
Added: incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/plugin/api/Plugin.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/plugin/api/Plugin.java?rev=1542210&view=auto
==============================================================================
--- incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/plugin/api/Plugin.java (added)
+++ incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/plugin/api/Plugin.java Fri Nov 15 09:31:20 2013
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sirona.reporting.web.plugin.api;
+
+/**
+ * the main entry point to define a plugin.
+ */
+public interface Plugin {
+ /**
+ * @return plugin name.
+ */
+ String name();
+
+ /**
+ * List of used endpoints by this plugin.
+ * Use {@see @org.apache.sirona.reporting.web.plugin.api.Regex} to define endpoints.
+ *
+ * @return the endpoints to call when mapping() is matched.
+ */
+ Class<?> endpoints();
+
+ /**
+ * @return the base mapping of the endpoints if not null.
+ */
+ String mapping();
+}
Copied: incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/plugin/api/Regex.java (from r1542180, incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/Regex.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/plugin/api/Regex.java?p2=incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/plugin/api/Regex.java&p1=incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/Regex.java&r1=1542180&r2=1542210&rev=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/Regex.java (original)
+++ incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/plugin/api/Regex.java Fri Nov 15 09:31:20 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sirona.reporting.web.handler.api;
+package org.apache.sirona.reporting.web.plugin.api;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Copied: incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/plugin/api/Template.java (from r1542180, incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/Template.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/plugin/api/Template.java?p2=incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/plugin/api/Template.java&p1=incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/Template.java&r1=1542180&r2=1542210&rev=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/Template.java (original)
+++ incubator/sirona/trunk/server/plugins/api/src/main/java/org/apache/sirona/reporting/web/plugin/api/Template.java Fri Nov 15 09:31:20 2013
@@ -14,11 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sirona.reporting.web.handler.api;
+package org.apache.sirona.reporting.web.plugin.api;
import java.util.HashMap;
import java.util.Map;
+/**
+ * Represents a template (by name/path)
+ * and its set of parameters.
+ */
public class Template {
private final String template;
private final Map<String, Object> userParams;
Modified: incubator/sirona/trunk/server/plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/plugins/pom.xml?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/plugins/pom.xml (original)
+++ incubator/sirona/trunk/server/plugins/pom.xml Fri Nov 15 09:31:20 2013
@@ -32,5 +32,6 @@
<modules>
<module>tomee</module>
+ <module>api</module>
</modules>
</project>
Modified: incubator/sirona/trunk/server/reporting/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/pom.xml?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/pom.xml (original)
+++ incubator/sirona/trunk/server/reporting/pom.xml Fri Nov 15 09:31:20 2013
@@ -46,6 +46,11 @@
</dependency>
<dependency>
<groupId>org.apache.sirona</groupId>
+ <artifactId>sirona-plugins-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sirona</groupId>
<artifactId>sirona-web</artifactId>
</dependency>
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/SironaController.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/SironaController.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/SironaController.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/SironaController.java Fri Nov 15 09:31:20 2013
@@ -22,7 +22,7 @@ import org.apache.sirona.reporting.web.h
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.plugin.api.MapBuilder;
import org.apache.sirona.reporting.web.template.Templates;
import org.apache.sirona.repositories.Repository;
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/FilteringEndpoints.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/FilteringEndpoints.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/FilteringEndpoints.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/FilteringEndpoints.java Fri Nov 15 09:31:20 2013
@@ -16,8 +16,7 @@
*/
package org.apache.sirona.reporting.web.handler;
-import org.apache.sirona.reporting.web.handler.api.Regex;
-import org.apache.sirona.reporting.web.handler.api.TemplateHelper;
+import org.apache.sirona.reporting.web.plugin.api.Regex;
import org.apache.sirona.reporting.web.template.Templates;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.resource.loader.ResourceLoader;
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/HomeEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/HomeEndpoint.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/HomeEndpoint.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/HomeEndpoint.java Fri Nov 15 09:31:20 2013
@@ -16,8 +16,8 @@
*/
package org.apache.sirona.reporting.web.handler;
-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.api.Regex;
+import org.apache.sirona.reporting.web.plugin.api.Template;
public class HomeEndpoint {
@Regex
Copied: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/TemplateHelper.java (from r1542180, incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/TemplateHelper.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/TemplateHelper.java?p2=incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/TemplateHelper.java&p1=incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/TemplateHelper.java&r1=1542180&r2=1542210&rev=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/api/TemplateHelper.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/TemplateHelper.java Fri Nov 15 09:31:20 2013
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sirona.reporting.web.handler.api;
+package org.apache.sirona.reporting.web.handler;
-import org.apache.sirona.reporting.web.template.MapBuilder;
+import org.apache.sirona.reporting.web.plugin.api.MapBuilder;
import org.apache.sirona.reporting.web.template.Templates;
import java.io.PrintWriter;
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/internal/EndpointInfo.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/internal/EndpointInfo.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/internal/EndpointInfo.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/internal/EndpointInfo.java Fri Nov 15 09:31:20 2013
@@ -17,8 +17,8 @@
package org.apache.sirona.reporting.web.handler.internal;
import org.apache.sirona.configuration.ioc.IoCs;
-import org.apache.sirona.reporting.web.handler.api.Regex;
-import org.apache.sirona.reporting.web.handler.api.TemplateHelper;
+import org.apache.sirona.reporting.web.handler.TemplateHelper;
+import org.apache.sirona.reporting.web.plugin.api.Regex;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/internal/Invoker.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/internal/Invoker.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/internal/Invoker.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/handler/internal/Invoker.java Fri Nov 15 09:31:20 2013
@@ -17,9 +17,9 @@
package org.apache.sirona.reporting.web.handler.internal;
import org.apache.sirona.SironaException;
-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 org.apache.sirona.reporting.web.handler.TemplateHelper;
+import org.apache.sirona.reporting.web.plugin.api.MapBuilder;
+import org.apache.sirona.reporting.web.plugin.api.Template;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -118,6 +118,11 @@ public class Invoker {
}
}
+ @Override
+ public String toString() {
+ return "Invoker{" + method + '}';
+ }
+
protected static interface ParameterExtractor<T> {
T extract(HttpServletRequest request, HttpServletResponse response, Matcher matcher);
}
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/PluginRepository.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/PluginRepository.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/PluginRepository.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/PluginRepository.java Fri Nov 15 09:31:20 2013
@@ -19,6 +19,8 @@ package org.apache.sirona.reporting.web.
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.reporting.web.plugin.api.Local;
+import org.apache.sirona.reporting.web.plugin.api.Plugin;
import org.apache.sirona.spi.SPI;
import org.apache.sirona.util.Environment;
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/gauge/GaugeEndpoints.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/gauge/GaugeEndpoints.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/gauge/GaugeEndpoints.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/gauge/GaugeEndpoints.java Fri Nov 15 09:31:20 2013
@@ -18,8 +18,8 @@ package org.apache.sirona.reporting.web.
import org.apache.commons.codec.binary.Base64;
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.api.Regex;
+import org.apache.sirona.reporting.web.plugin.api.Template;
import org.apache.sirona.repositories.Repository;
import java.io.UnsupportedEncodingException;
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/gauge/GaugePlugin.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/gauge/GaugePlugin.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/gauge/GaugePlugin.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/gauge/GaugePlugin.java Fri Nov 15 09:31:20 2013
@@ -16,7 +16,7 @@
*/
package org.apache.sirona.reporting.web.plugin.gauge;
-import org.apache.sirona.reporting.web.plugin.Plugin;
+import org.apache.sirona.reporting.web.plugin.api.Plugin;
public class GaugePlugin implements Plugin {
@Override
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXEndpoints.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXEndpoints.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXEndpoints.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXEndpoints.java Fri Nov 15 09:31:20 2013
@@ -19,9 +19,9 @@ package org.apache.sirona.reporting.web.
import org.apache.commons.codec.binary.Base64;
import org.apache.sirona.SironaException;
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.reporting.web.plugin.api.MapBuilder;
+import org.apache.sirona.reporting.web.plugin.api.Regex;
+import org.apache.sirona.reporting.web.plugin.api.Template;
import org.apache.sirona.util.ClassLoaders;
import javax.management.MBeanAttributeInfo;
@@ -45,7 +45,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import static org.apache.sirona.reporting.web.handler.api.TemplateHelper.nullProtection;
+import static org.apache.sirona.reporting.web.handler.TemplateHelper.nullProtection;
public class JMXEndpoints {
private static final boolean METHOD_INVOCATION_ALLOWED = Configuration.is(Configuration.CONFIG_PROPERTY_PREFIX + "jmx.method.allowed", true);
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXPlugin.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXPlugin.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXPlugin.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jmx/JMXPlugin.java Fri Nov 15 09:31:20 2013
@@ -16,8 +16,8 @@
*/
package org.apache.sirona.reporting.web.plugin.jmx;
-import org.apache.sirona.reporting.web.plugin.Local;
-import org.apache.sirona.reporting.web.plugin.Plugin;
+import org.apache.sirona.reporting.web.plugin.api.Local;
+import org.apache.sirona.reporting.web.plugin.api.Plugin;
@Local
public class JMXPlugin implements Plugin {
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jta/JTAEndpoints.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jta/JTAEndpoints.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jta/JTAEndpoints.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jta/JTAEndpoints.java Fri Nov 15 09:31:20 2013
@@ -18,8 +18,8 @@ package org.apache.sirona.reporting.web.
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.api.Regex;
+import org.apache.sirona.reporting.web.plugin.api.Template;
import static org.apache.sirona.reporting.web.graph.Line.generateReport;
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jta/JTAPlugin.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jta/JTAPlugin.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jta/JTAPlugin.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jta/JTAPlugin.java Fri Nov 15 09:31:20 2013
@@ -16,7 +16,7 @@
*/
package org.apache.sirona.reporting.web.plugin.jta;
-import org.apache.sirona.reporting.web.plugin.Plugin;
+import org.apache.sirona.reporting.web.plugin.api.Plugin;
public class JTAPlugin implements Plugin {
@Override
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/JVMEndpoints.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/JVMEndpoints.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/JVMEndpoints.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/JVMEndpoints.java Fri Nov 15 09:31:20 2013
@@ -19,8 +19,8 @@ package org.apache.sirona.reporting.web.
import org.apache.sirona.gauges.jvm.CPUGauge;
import org.apache.sirona.gauges.jvm.UsedMemoryGauge;
import org.apache.sirona.gauges.jvm.UsedNonHeapMemoryGauge;
-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.api.Regex;
+import org.apache.sirona.reporting.web.plugin.api.Template;
import org.apache.sirona.util.Environment;
import java.lang.management.ManagementFactory;
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/JVMPlugin.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/JVMPlugin.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/JVMPlugin.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/jvm/JVMPlugin.java Fri Nov 15 09:31:20 2013
@@ -16,7 +16,7 @@
*/
package org.apache.sirona.reporting.web.plugin.jvm;
-import org.apache.sirona.reporting.web.plugin.Plugin;
+import org.apache.sirona.reporting.web.plugin.api.Plugin;
public class JVMPlugin implements Plugin {
@Override
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/ReportEndpoints.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/ReportEndpoints.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/ReportEndpoints.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/ReportEndpoints.java Fri Nov 15 09:31:20 2013
@@ -16,17 +16,17 @@
*/
package org.apache.sirona.reporting.web.plugin.report;
-import org.apache.sirona.SironaException;
import org.apache.sirona.Role;
+import org.apache.sirona.SironaException;
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.api.MapBuilder;
+import org.apache.sirona.reporting.web.plugin.api.Regex;
+import org.apache.sirona.reporting.web.plugin.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;
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/ReportPlugin.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/ReportPlugin.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/ReportPlugin.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/ReportPlugin.java Fri Nov 15 09:31:20 2013
@@ -16,7 +16,7 @@
*/
package org.apache.sirona.reporting.web.plugin.report;
-import org.apache.sirona.reporting.web.plugin.Plugin;
+import org.apache.sirona.reporting.web.plugin.api.Plugin;
public class ReportPlugin implements Plugin {
@Override
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/CSVFormat.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/CSVFormat.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/CSVFormat.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/CSVFormat.java Fri Nov 15 09:31:20 2013
@@ -18,8 +18,8 @@ package org.apache.sirona.reporting.web.
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 org.apache.sirona.reporting.web.plugin.api.MapBuilder;
+import org.apache.sirona.reporting.web.plugin.api.Template;
import java.util.Collection;
import java.util.Map;
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/Format.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/Format.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/Format.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/Format.java Fri Nov 15 09:31:20 2013
@@ -17,7 +17,7 @@
package org.apache.sirona.reporting.web.plugin.report.format;
-import org.apache.sirona.reporting.web.handler.api.Template;
+import org.apache.sirona.reporting.web.plugin.api.Template;
import java.util.Map;
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/HTMLFormat.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/HTMLFormat.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/HTMLFormat.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/HTMLFormat.java Fri Nov 15 09:31:20 2013
@@ -17,8 +17,8 @@
package org.apache.sirona.reporting.web.plugin.report.format;
import org.apache.sirona.counters.Unit;
-import org.apache.sirona.reporting.web.handler.api.Template;
-import org.apache.sirona.reporting.web.template.MapBuilder;
+import org.apache.sirona.reporting.web.plugin.api.MapBuilder;
+import org.apache.sirona.reporting.web.plugin.api.Template;
import java.util.Map;
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/JSONFormat.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/JSONFormat.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/JSONFormat.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/JSONFormat.java Fri Nov 15 09:31:20 2013
@@ -18,8 +18,8 @@
package org.apache.sirona.reporting.web.plugin.report.format;
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.reporting.web.plugin.api.MapBuilder;
+import org.apache.sirona.reporting.web.plugin.api.Template;
import org.apache.sirona.repositories.Repository;
import java.util.Map;
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/XMLFormat.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/XMLFormat.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/XMLFormat.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/report/format/XMLFormat.java Fri Nov 15 09:31:20 2013
@@ -18,8 +18,8 @@
package org.apache.sirona.reporting.web.plugin.report.format;
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.reporting.web.plugin.api.MapBuilder;
+import org.apache.sirona.reporting.web.plugin.api.Template;
import org.apache.sirona.repositories.Repository;
import java.util.Map;
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/status/StatusEndpoints.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/status/StatusEndpoints.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/status/StatusEndpoints.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/status/StatusEndpoints.java Fri Nov 15 09:31:20 2013
@@ -16,8 +16,8 @@
*/
package org.apache.sirona.reporting.web.plugin.status;
-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.api.Regex;
+import org.apache.sirona.reporting.web.plugin.api.Template;
import org.apache.sirona.repositories.Repository;
public class StatusEndpoints {
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/status/StatusPlugin.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/status/StatusPlugin.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/status/StatusPlugin.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/status/StatusPlugin.java Fri Nov 15 09:31:20 2013
@@ -16,7 +16,7 @@
*/
package org.apache.sirona.reporting.web.plugin.status;
-import org.apache.sirona.reporting.web.plugin.Plugin;
+import org.apache.sirona.reporting.web.plugin.api.Plugin;
public class StatusPlugin implements Plugin {
@Override
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/thread/ThreadEndpoints.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/thread/ThreadEndpoints.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/thread/ThreadEndpoints.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/thread/ThreadEndpoints.java Fri Nov 15 09:31:20 2013
@@ -18,9 +18,9 @@ package org.apache.sirona.reporting.web.
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang3.StringEscapeUtils;
-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.reporting.web.plugin.api.MapBuilder;
+import org.apache.sirona.reporting.web.plugin.api.Regex;
+import org.apache.sirona.reporting.web.plugin.api.Template;
import java.util.Map;
import java.util.TreeMap;
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/thread/ThreadPlugin.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/thread/ThreadPlugin.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/thread/ThreadPlugin.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/thread/ThreadPlugin.java Fri Nov 15 09:31:20 2013
@@ -16,8 +16,8 @@
*/
package org.apache.sirona.reporting.web.plugin.thread;
-import org.apache.sirona.reporting.web.plugin.Local;
-import org.apache.sirona.reporting.web.plugin.Plugin;
+import org.apache.sirona.reporting.web.plugin.api.Local;
+import org.apache.sirona.reporting.web.plugin.api.Plugin;
@Local
public class ThreadPlugin implements Plugin {
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/web/WebEndpoints.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/web/WebEndpoints.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/web/WebEndpoints.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/web/WebEndpoints.java Fri Nov 15 09:31:20 2013
@@ -18,8 +18,8 @@ package org.apache.sirona.reporting.web.
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.api.Regex;
+import org.apache.sirona.reporting.web.plugin.api.Template;
import org.apache.sirona.reporting.web.plugin.json.Jsons;
import org.apache.sirona.repositories.Repositories;
import org.apache.sirona.repositories.Repository;
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/web/WebPlugin.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/web/WebPlugin.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/web/WebPlugin.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/plugin/web/WebPlugin.java Fri Nov 15 09:31:20 2013
@@ -16,7 +16,7 @@
*/
package org.apache.sirona.reporting.web.plugin.web;
-import org.apache.sirona.reporting.web.plugin.Plugin;
+import org.apache.sirona.reporting.web.plugin.api.Plugin;
public class WebPlugin implements Plugin {
@Override
Modified: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/registration/SironaReportingInitializer.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/registration/SironaReportingInitializer.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/registration/SironaReportingInitializer.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/registration/SironaReportingInitializer.java Fri Nov 15 09:31:20 2013
@@ -47,6 +47,6 @@ public class SironaReportingInitializer
final SironaController controller = new SironaController();
controller.setMapping(mapping);
- ctx.addFilter("commons-monitoring-reporting", controller).addMappingForUrlPatterns(EnumSet.allOf(DispatcherType.class), true, mapping + "/*");
+ ctx.addFilter("sirona-reporting", controller).addMappingForUrlPatterns(EnumSet.allOf(DispatcherType.class), true, mapping + "/*");
}
}
Modified: incubator/sirona/trunk/server/reporting/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/resources/META-INF/NOTICE?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/resources/META-INF/NOTICE (original)
+++ incubator/sirona/trunk/server/reporting/src/main/resources/META-INF/NOTICE Fri Nov 15 09:31:20 2013
@@ -5,3 +5,38 @@ license: Apache v2
Based on Bootstrap. Icons by Font Awesome.
Placeholder images by placehold.it, lorempixel, and placecreature.
+
+-------------------
+
+Twitter bootstrap
+
+website: http://getbootstrap.com/
+license: MIT
+
+-------------------
+
+Bootstrap datetimepicker
+
+website: https://github.com/eternicode/bootstrap-datepicker
+license: Apache v2
+
+-------------------
+
+Table sorter
+
+website: http://mottie.github.io/tablesorter/docs/index.html
+license: MIT
+
+-------------------
+
+JQuery
+
+website: https://jquery.org/license/
+license: MIT
+
+-------------------
+
+JQuery Flot
+
+website: http://www.flotcharts.org/
+license: MIT
Modified: incubator/sirona/trunk/server/reporting/src/test/java/org/apache/sirona/reporting/FormatsTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/test/java/org/apache/sirona/reporting/FormatsTest.java?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/test/java/org/apache/sirona/reporting/FormatsTest.java (original)
+++ incubator/sirona/trunk/server/reporting/src/test/java/org/apache/sirona/reporting/FormatsTest.java Fri Nov 15 09:31:20 2013
@@ -18,8 +18,8 @@ package org.apache.sirona.reporting;
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.handler.TemplateHelper;
+import org.apache.sirona.reporting.web.plugin.api.Template;
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;
Modified: incubator/sirona/trunk/src/site/markdown/collector.md
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/src/site/markdown/collector.md?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/src/site/markdown/collector.md (original)
+++ incubator/sirona/trunk/src/site/markdown/collector.md Fri Nov 15 09:31:20 2013
@@ -34,7 +34,7 @@ Take a servlet container and deploy `sir
Just use the collector `DataStoreFactory`: `org.apache.sirona.store.CollectorDataStoreFactory`.
-For instance your `commons-monitoring.properties` can look like:
+For instance your `sirona.properties` can look like:
<pre class="prettyprint linenums"><![CDATA[
org.apache.sirona.store.DataStoreFactory = org.apache.sirona.store.CollectorDataStoreFactory
Modified: incubator/sirona/trunk/src/site/markdown/configuration.md
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/src/site/markdown/configuration.md?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/src/site/markdown/configuration.md (original)
+++ incubator/sirona/trunk/src/site/markdown/configuration.md Fri Nov 15 09:31:20 2013
@@ -18,7 +18,7 @@ under the License.
-->
## Configuration features
### Location
-Configuration relies on `sirona.properties` file which should be found in the commons-monitoring-core classloader.
+Configuration relies on `sirona.properties` file which should be found in the sirona-core classloader.
Note: you can change the file name using `org.apache.sirona.configuration` system property.
@@ -33,7 +33,7 @@ Using `org.apache.sirona.configuration.i
decorate your class methods with `org.apache.sirona.configuration.Configuration.Created`
and `org.apache.sirona.configuration.ioc.Destroying` to get lifecycle hooks.
-`Destroying` is called when the monitoring is stopped. Generally since commons-monitoring-core is deployed in the
+`Destroying` is called when the monitoring is stopped. Generally since sirona-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.sirona.web.lifecycle.SironaLifecycle` from reporting module
@@ -46,7 +46,7 @@ You can also use `org.apache.sirona.conf
#### Core
* 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.shutdown.hook: boolean, true by default. Should be set to false when deploying sirona-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.
Modified: incubator/sirona/trunk/src/site/markdown/cube.md
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/src/site/markdown/cube.md?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/src/site/markdown/cube.md (original)
+++ incubator/sirona/trunk/src/site/markdown/cube.md Fri Nov 15 09:31:20 2013
@@ -29,7 +29,7 @@ org.apache.sirona.cube.CubeBuilder.colle
* `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:
+For instance your `sirona.properties` can look like:
<pre class="prettyprint linenums"><![CDATA[
org.apache.sirona.cube.CubeBuilder.collector = http://localhost:1234/collector/1.0/event/put
@@ -39,7 +39,7 @@ org.apache.sirona.cube.CubeBuilder.colle
To push metrics (Gauges + Counters) to Cube you can use the dedicated `DataStore`: `org.apache.sirona.cube.CubeDataStore`.
-Simply add to `commons-monitoring.properties` the line:
+Simply add to `sirona.properties` the line:
<pre class="prettyprint linenums"><![CDATA[
org.apache.sirona.store.DataStore = org.apache.sirona.cube.CubeDataStore
Modified: incubator/sirona/trunk/src/site/markdown/graphite.md
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/src/site/markdown/graphite.md?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/src/site/markdown/graphite.md (original)
+++ incubator/sirona/trunk/src/site/markdown/graphite.md Fri Nov 15 09:31:20 2013
@@ -26,7 +26,7 @@ Graphite module allows to push counters
* `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:
+For instance your `sirona.properties` can look like:
<pre class="prettyprint linenums"><![CDATA[
org.apache.sirona.graphite.GraphiteBuilder.address = localhost
@@ -37,7 +37,7 @@ org.apache.sirona.graphite.GraphiteBuild
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:
+Simply add to `sirona.properties` the line:
<pre class="prettyprint linenums"><![CDATA[
org.apache.sirona.store.DataStore = org.apache.sirona.graphite.GraphiteDataStore
Modified: incubator/sirona/trunk/src/site/markdown/index.md
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/src/site/markdown/index.md?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/src/site/markdown/index.md (original)
+++ incubator/sirona/trunk/src/site/markdown/index.md Fri Nov 15 09:31:20 2013
@@ -18,7 +18,7 @@ under the License.
-->
## Apache Sirona
-Commons-monitoring aims to provide a simple but extensible monitoring solution for Java applications.
+Sirona aims to provide a simple but extensible monitoring solution for Java applications.
How to start?
Modified: incubator/sirona/trunk/src/site/markdown/instrumentation.md
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/src/site/markdown/instrumentation.md?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/src/site/markdown/instrumentation.md (original)
+++ incubator/sirona/trunk/src/site/markdown/instrumentation.md Fri Nov 15 09:31:20 2013
@@ -18,7 +18,7 @@ under the License.
-->
# Manually (clients)
-To handle manually the interception you need to import commons-monitoring-aop.
+To handle manually the interception you need to import sirona-aop.
Then you can rely on `org.apache.sirona.aop.SironaProxyFactory`.
`org.apache.commons.proxy.ProxyFactory` key defines the proxy factory to use to create proxies For instance
Modified: incubator/sirona/trunk/src/site/markdown/jta.md
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/src/site/markdown/jta.md?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/src/site/markdown/jta.md (original)
+++ incubator/sirona/trunk/src/site/markdown/jta.md Fri Nov 15 09:31:20 2013
@@ -23,7 +23,7 @@ This module aims to monitor commits/roll
## Installation
`sirona-jta` should be added to your webapp. You need to register the jta gauges. To do it the easiest is
-to add `commons-monitoring-web` to your webapp and register the listener `org.apache.sirona.web.discovery.GaugeDiscoveryListener`:
+to add `sirona-web` to your webapp and register the listener `org.apache.sirona.web.discovery.GaugeDiscoveryListener`:
<pre class="prettyprint linenums"><![CDATA[
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
Modified: incubator/sirona/trunk/src/site/markdown/plugins.md
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/src/site/markdown/plugins.md?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/src/site/markdown/plugins.md (original)
+++ incubator/sirona/trunk/src/site/markdown/plugins.md Fri Nov 15 09:31:20 2013
@@ -21,7 +21,7 @@ under the License.
There are several kind of plugins:
* `org.apache.sirona.gauges.Gauge` and `org.apache.sirona.gauges.GaugeFactory`: you can add your own gauges
-* `org.apache.sirona.reporting.web.plugin.Plugin`: add feature to the web GUI
+* `org.apache.sirona.reporting.web.plugin.api.Plugin`: add feature to the web GUI
## Write your own gauge
@@ -45,7 +45,7 @@ public class MyGaugeFactory implements G
## Extend the reporting GUI
-To extend the reporting GUI just write your own `org.apache.sirona.reporting.web.plugin.Plugin`. Here too it
+To extend the reporting GUI just write your own `org.apache.sirona.reporting.web.plugin.api.Plugin`. Here too it
relies on java ServiceLoader (SPI) mecanism.
Here is the Plugin interface:
@@ -86,7 +86,7 @@ public class HelloPlugin implements Plug
### Define the endpoints
-The `HelloEndpoints` class defines all the urls accessible for the hello plugin. It uses the `org.apache.sirona.reporting.web.handler.api.Regex`
+The `HelloEndpoints` class defines all the urls accessible for the hello plugin. It uses the `org.apache.sirona.reporting.web.plugin.api.Regex`
annotation:
<pre class="prettyprint linenums"><![CDATA[
Modified: incubator/sirona/trunk/src/site/markdown/reporting.md
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/src/site/markdown/reporting.md?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/src/site/markdown/reporting.md (original)
+++ incubator/sirona/trunk/src/site/markdown/reporting.md Fri Nov 15 09:31:20 2013
@@ -23,14 +23,14 @@ Reporting module provides a lightweight
## Installation
### The webapp
-commons-monitoring-reporting is available as a webapp (.war) so you can just drop it in your servlet container.
+sirona-reporting is available as a webapp (.war) so you can just drop it in your servlet container.
-Note 1: commons-monitoring-core is not provided and should be in the container.
-Note 2: if you use commons-monitoring-jdbc put it in the container too.
+Note 1: sirona-core is not provided and should be in the container.
+Note 2: if you use sirona-jdbc put it in the container too.
### Embeded in your web application
-Just adding commons-monitoring-reporting jar (classifier `classes` if you use maven) in your application
+Just adding sirona-reporting jar (classifier `classes` if you use maven) in your application
you can embed it. You'll need to update your web.xml to declare the monitoring filter:
<pre class="prettyprint linenums"><![CDATA[
Modified: incubator/sirona/trunk/src/site/markdown/web.md
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/src/site/markdown/web.md?rev=1542210&r1=1542209&r2=1542210&view=diff
==============================================================================
--- incubator/sirona/trunk/src/site/markdown/web.md (original)
+++ incubator/sirona/trunk/src/site/markdown/web.md Fri Nov 15 09:31:20 2013
@@ -22,7 +22,7 @@ Reporting module provides web listener t
## Installation
-Add commons-monitoring-web to your webapp.
+Add sirona-web to your webapp.
## Monitor requests