svn commit: r1541419 - in /incubator/sirona/trunk: agent/performance/web/src/main/java/org/apache/sirona/web/registration/ server/reporting/ server/reporting/src/main/java/org/apache/sirona/reporting/web/registration/ server/reporting/src/test/java/org...

[rm...@apache.org]

Author: rmannibucau
Date: Wed Nov 13 08:24:10 2013
New Revision: 1541419

URL: http://svn.apache.org/r1541419
Log:
using /sirona instead of /monitoring by default

Modified:
    incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/registration/WebSironaInitializer.java
    incubator/sirona/trunk/server/reporting/pom.xml
    incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/registration/SironaReportingInitializer.java
    incubator/sirona/trunk/server/reporting/src/test/java/org/apache/sirona/reporting/template/GaugesTest.java
    incubator/sirona/trunk/server/reporting/src/test/java/org/apache/sirona/reporting/template/ReportTest.java
    incubator/sirona/trunk/server/reporting/src/test/java/org/apache/sirona/reporting/template/SironaReportingTestBase.java
    incubator/sirona/trunk/src/site/markdown/reporting.md

Modified: incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/registration/WebSironaInitializer.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/registration/WebSironaInitializer.java?rev=1541419&r1=1541418&r2=1541419&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/registration/WebSironaInitializer.java (original)
+++ incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/registration/WebSironaInitializer.java Wed Nov 13 08:24:10 2013
@@ -64,7 +64,7 @@ public class WebSironaInitializer implem
             }
 
             if (ignoredUrls == null) {
-                ignoredUrls = Configuration.getProperty(SironaFilter.IGNORED_URLS, "/monitoring");
+                ignoredUrls = Configuration.getProperty(SironaFilter.IGNORED_URLS, "/sirona");
             }
 
             if (monitoredUrls.contains(",")) {

Modified: incubator/sirona/trunk/server/reporting/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/pom.xml?rev=1541419&r1=1541418&r2=1541419&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/pom.xml (original)
+++ incubator/sirona/trunk/server/reporting/pom.xml Wed Nov 13 08:24:10 2013
@@ -31,7 +31,7 @@
 
   <properties>
     <tomcatRunPort>8080</tomcatRunPort>
-    <tomcatRunPath>/monitoring</tomcatRunPath>
+    <tomcatRunPath>/sirona</tomcatRunPath>
   </properties>
 
   <dependencies>

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=1541419&r1=1541418&r2=1541419&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 Wed Nov 13 08:24:10 2013
@@ -36,7 +36,7 @@ public class SironaReportingInitializer 
 
         String mapping = ctx.getInitParameter(Configuration.CONFIG_PROPERTY_PREFIX + "reporting.mapping");
         if (mapping == null) {
-            mapping = "/monitoring";
+            mapping = "/sirona";
         }
         if (mapping.endsWith("*")) {
             mapping = mapping.substring(0, mapping.length() - 1);

Modified: incubator/sirona/trunk/server/reporting/src/test/java/org/apache/sirona/reporting/template/GaugesTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/test/java/org/apache/sirona/reporting/template/GaugesTest.java?rev=1541419&r1=1541418&r2=1541419&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/test/java/org/apache/sirona/reporting/template/GaugesTest.java (original)
+++ incubator/sirona/trunk/server/reporting/src/test/java/org/apache/sirona/reporting/template/GaugesTest.java Wed Nov 13 08:24:10 2013
@@ -32,7 +32,7 @@ public class GaugesTest extends SironaRe
     public void checkGaugesAreListed() throws IOException {
         final HtmlPage page = page("gauges");
         final String content = page.getWebResponse().getContentAsString();
-        assertThat(content, containsString("<a href=\"/sirona-test/monitoring/gauges/" + CPU_GAUGE_ENCODED + "\">"));
+        assertThat(content, containsString("<a href=\"/sirona-test/sirona/gauges/" + CPU_GAUGE_ENCODED + "\">"));
         assertThat(content, containsString("CPU"));
     }
 

Modified: incubator/sirona/trunk/server/reporting/src/test/java/org/apache/sirona/reporting/template/ReportTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/test/java/org/apache/sirona/reporting/template/ReportTest.java?rev=1541419&r1=1541418&r2=1541419&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/test/java/org/apache/sirona/reporting/template/ReportTest.java (original)
+++ incubator/sirona/trunk/server/reporting/src/test/java/org/apache/sirona/reporting/template/ReportTest.java Wed Nov 13 08:24:10 2013
@@ -67,7 +67,7 @@ public class ReportTest extends SironaRe
     @Test
     public void generalList() throws IOException {
         final WebClient client = newClient();
-        final HtmlPage page = client.getPage(base.toExternalForm() + "monitoring/report");
+        final HtmlPage page = client.getPage(base.toExternalForm() + "sirona/report");
         WebAssert.assertElementPresent(page, "report-table");
 
         final String text = page.getElementById("report-table").asText();
@@ -78,7 +78,7 @@ public class ReportTest extends SironaRe
     @Test
     public void detail() throws IOException {
         final WebClient client = newClient();
-        final HtmlPage page = client.getPage(base.toExternalForm() + "monitoring/report/counter/" + MapFormat.generateCounterKeyString(key));
+        final HtmlPage page = client.getPage(base.toExternalForm() + "sirona/report/counter/" + MapFormat.generateCounterKeyString(key));
         WebAssert.assertElementPresent(page, "counter");
 
         final String text = page.getElementById("counter").asText();

Modified: incubator/sirona/trunk/server/reporting/src/test/java/org/apache/sirona/reporting/template/SironaReportingTestBase.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/test/java/org/apache/sirona/reporting/template/SironaReportingTestBase.java?rev=1541419&r1=1541418&r2=1541419&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/test/java/org/apache/sirona/reporting/template/SironaReportingTestBase.java (original)
+++ incubator/sirona/trunk/server/reporting/src/test/java/org/apache/sirona/reporting/template/SironaReportingTestBase.java Wed Nov 13 08:24:10 2013
@@ -61,7 +61,7 @@ public abstract class SironaReportingTes
     protected URL base;
 
     protected <P extends Page> P page(final String path) throws IOException {
-        return newClient().getPage(base.toExternalForm() + "monitoring/" + path);
+        return newClient().getPage(base.toExternalForm() + "sirona/" + path);
     }
 
     protected static WebClient newClient() {

Modified: incubator/sirona/trunk/src/site/markdown/reporting.md
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/src/site/markdown/reporting.md?rev=1541419&r1=1541418&r2=1541419&view=diff
==============================================================================
--- incubator/sirona/trunk/src/site/markdown/reporting.md (original)
+++ incubator/sirona/trunk/src/site/markdown/reporting.md Wed Nov 13 08:24:10 2013
@@ -44,17 +44,17 @@ you can embed it. You'll need to update 
   </listener>
 
   <filter>
-    <filter-name>Monitoring</filter-name>
+    <filter-name>Sirona</filter-name>
     <filter-class>org.apache.sirona.reporting.web.SironaController</filter-class>
     <init-param> <!-- should match your filter mapping base -->
       <param-name>monitoring-mapping</param-name>
-      <param-value>/monitoring/</param-value>
+      <param-value>/sirona/</param-value>
     </init-param>
   </filter>
 
   <filter-mapping>
-    <filter-name>Monitoring</filter-name>
-    <url-pattern>/monitoring/*</url-pattern>
+    <filter-name>Sirona</filter-name>
+    <url-pattern>/sirona/*</url-pattern>
   </filter-mapping>
 
 </web-app>