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/13 07:52:10 UTC
svn commit: r1541402 - in /incubator/sirona/trunk:
agent/performance/aop/src/main/java/org/apache/sirona/aop/
agent/performance/aop/src/test/java/org/apache/sirona/aop/
agent/performance/jdbc/src/main/java/org/apache/sirona/jdbc/
agent/performance/jdbc...
Author: rmannibucau
Date: Wed Nov 13 06:52:09 2013
New Revision: 1541402
URL: http://svn.apache.org/r1541402
Log:
some more renaming to match sirona and remove as much as possible old references to [monitoring]
Added:
incubator/sirona/trunk/agent/performance/aop/src/main/java/org/apache/sirona/aop/SironaProxyFactory.java
- copied, changed from r1540962, incubator/sirona/trunk/agent/performance/aop/src/main/java/org/apache/sirona/aop/MonitoringProxyFactory.java
incubator/sirona/trunk/agent/performance/aop/src/test/java/org/apache/sirona/aop/SironaProxyFactoryTest.java
- copied, changed from r1540962, incubator/sirona/trunk/agent/performance/aop/src/test/java/org/apache/sirona/aop/MonitoringProxyFactoryTest.java
incubator/sirona/trunk/agent/performance/jdbc/src/main/java/org/apache/sirona/jdbc/SironaDriver.java
- copied, changed from r1540962, incubator/sirona/trunk/agent/performance/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoringDriver.java
incubator/sirona/trunk/agent/performance/jpa/src/main/java/org/apache/sirona/jpa/SironaPersistence.java
- copied, changed from r1540962, incubator/sirona/trunk/agent/performance/jpa/src/main/java/org/apache/sirona/jpa/MonitoringPersistence.java
incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/registration/WebSironaInitializer.java
- copied, changed from r1540962, incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/registration/WebMonitoringInitializer.java
incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/servlet/SironaFilter.java
- copied, changed from r1540962, incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/servlet/MonitoringFilter.java
incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/session/SironaSessionListener.java
- copied, changed from r1540962, incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/session/MonitoringSessionListener.java
incubator/sirona/trunk/core/src/main/java/org/apache/sirona/SironaException.java
- copied, changed from r1540962, incubator/sirona/trunk/core/src/main/java/org/apache/sirona/MonitoringException.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/SironaController.java
- copied, changed from r1540962, incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/MonitoringController.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/registration/SironaReportingInitializer.java
- copied, changed from r1540962, incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/registration/MonitoringReportingInitializer.java
Removed:
incubator/sirona/trunk/agent/performance/aop/src/main/java/org/apache/sirona/aop/MonitoringProxyFactory.java
incubator/sirona/trunk/agent/performance/aop/src/test/java/org/apache/sirona/aop/MonitoringProxyFactoryTest.java
incubator/sirona/trunk/agent/performance/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoringDriver.java
incubator/sirona/trunk/agent/performance/jpa/src/main/java/org/apache/sirona/jpa/MonitoringPersistence.java
incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/registration/WebMonitoringInitializer.java
incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/servlet/MonitoringFilter.java
incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/session/MonitoringSessionListener.java
incubator/sirona/trunk/core/src/main/java/org/apache/sirona/MonitoringException.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/MonitoringController.java
incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/registration/MonitoringReportingInitializer.java
incubator/sirona/trunk/src/site/xdoc/
Modified:
incubator/sirona/trunk/agent/performance/aop/src/main/java/org/apache/sirona/aop/AbstractPerformanceInterceptor.java
incubator/sirona/trunk/agent/performance/jdbc/src/test/java/org/apache/sirona/jdbc/HsqlDBTest.java
incubator/sirona/trunk/agent/performance/jpa/src/main/java/org/apache/sirona/jpa/OverridePersistenceXmlClassLoader.java
incubator/sirona/trunk/agent/performance/jpa/src/main/resources/META-INF/services/javax.persistence.spi.PersistenceProvider
incubator/sirona/trunk/agent/performance/jpa/src/test/java/org/apache/sirona/jpa/EMFTest.java
incubator/sirona/trunk/agent/performance/jpa/src/test/resources/META-INF/persistence.xml
incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/discovery/GaugeDiscoveryListener.java
incubator/sirona/trunk/agent/performance/web/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
incubator/sirona/trunk/agent/performance/web/src/test/java/org/apache/sirona/test/web/RequestPerformanceTest.java
incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/CubeBuilder.java
incubator/sirona/trunk/agent/store/graphite/src/main/java/org/apache/sirona/graphite/GraphiteBuilder.java
incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/Configuration.java
incubator/sirona/trunk/core/src/main/java/org/apache/sirona/repositories/DefaultRepository.java
incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/gauge/DelegatedCollectorGaugeDataStore.java
incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/Collector.java
incubator/sirona/trunk/server/collector/src/test/java/org/apache/sirona/collector/server/RegistrationTest.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/internal/Invoker.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/report/ReportEndpoints.java
incubator/sirona/trunk/server/reporting/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
incubator/sirona/trunk/server/reporting/src/main/webapp/WEB-INF/web.xml
incubator/sirona/trunk/server/reporting/src/test/java/org/apache/sirona/reporting/template/SironaReportingTestBase.java
incubator/sirona/trunk/src/site/markdown/basis.md
incubator/sirona/trunk/src/site/markdown/instrumentation.md
incubator/sirona/trunk/src/site/markdown/jpa.md
incubator/sirona/trunk/src/site/markdown/reporting.md
incubator/sirona/trunk/src/site/markdown/web.md
Modified: incubator/sirona/trunk/agent/performance/aop/src/main/java/org/apache/sirona/aop/AbstractPerformanceInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/performance/aop/src/main/java/org/apache/sirona/aop/AbstractPerformanceInterceptor.java?rev=1541402&r1=1541401&r2=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/performance/aop/src/main/java/org/apache/sirona/aop/AbstractPerformanceInterceptor.java (original)
+++ incubator/sirona/trunk/agent/performance/aop/src/main/java/org/apache/sirona/aop/AbstractPerformanceInterceptor.java Wed Nov 13 06:52:09 2013
@@ -17,7 +17,7 @@
package org.apache.sirona.aop;
-import org.apache.sirona.MonitoringException;
+import org.apache.sirona.SironaException;
import org.apache.sirona.Role;
import org.apache.sirona.configuration.Configuration;
import org.apache.sirona.counters.Counter;
@@ -208,7 +208,7 @@ public abstract class AbstractPerformanc
declaring = declaring.getSuperclass();
}
} catch (final ClassNotFoundException e) {
- throw new MonitoringException(e);
+ throw new SironaException(e);
}
}
return realMethod;
Copied: incubator/sirona/trunk/agent/performance/aop/src/main/java/org/apache/sirona/aop/SironaProxyFactory.java (from r1540962, incubator/sirona/trunk/agent/performance/aop/src/main/java/org/apache/sirona/aop/MonitoringProxyFactory.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/performance/aop/src/main/java/org/apache/sirona/aop/SironaProxyFactory.java?p2=incubator/sirona/trunk/agent/performance/aop/src/main/java/org/apache/sirona/aop/SironaProxyFactory.java&p1=incubator/sirona/trunk/agent/performance/aop/src/main/java/org/apache/sirona/aop/MonitoringProxyFactory.java&r1=1540962&r2=1541402&rev=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/performance/aop/src/main/java/org/apache/sirona/aop/MonitoringProxyFactory.java (original)
+++ incubator/sirona/trunk/agent/performance/aop/src/main/java/org/apache/sirona/aop/SironaProxyFactory.java Wed Nov 13 06:52:09 2013
@@ -24,21 +24,21 @@ import org.apache.commons.proxy.ProxyFac
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-public final class MonitoringProxyFactory {
+public final class SironaProxyFactory {
public static <T> T monitor(final Class<T> clazz, final Object instance) {
return clazz.cast(
Configuration.findOrCreateInstance(ProxyFactory.class)
- .createInvokerProxy(ClassLoaders.current(), new MonitoringHandler(instance), new Class<?>[]{clazz}));
+ .createInvokerProxy(ClassLoaders.current(), new SironaPerformanceHandler(instance), new Class<?>[]{clazz}));
}
- private MonitoringProxyFactory() {
+ private SironaProxyFactory() {
// no-op
}
- private static class MonitoringHandler extends AbstractPerformanceInterceptor<Invocation> implements Invoker {
+ private static class SironaPerformanceHandler extends AbstractPerformanceInterceptor<Invocation> implements Invoker {
private final Object instance;
- public MonitoringHandler(final Object instance) {
+ public SironaPerformanceHandler(final Object instance) {
this.instance = instance;
}
Copied: incubator/sirona/trunk/agent/performance/aop/src/test/java/org/apache/sirona/aop/SironaProxyFactoryTest.java (from r1540962, incubator/sirona/trunk/agent/performance/aop/src/test/java/org/apache/sirona/aop/MonitoringProxyFactoryTest.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/performance/aop/src/test/java/org/apache/sirona/aop/SironaProxyFactoryTest.java?p2=incubator/sirona/trunk/agent/performance/aop/src/test/java/org/apache/sirona/aop/SironaProxyFactoryTest.java&p1=incubator/sirona/trunk/agent/performance/aop/src/test/java/org/apache/sirona/aop/MonitoringProxyFactoryTest.java&r1=1540962&r2=1541402&rev=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/performance/aop/src/test/java/org/apache/sirona/aop/MonitoringProxyFactoryTest.java (original)
+++ incubator/sirona/trunk/agent/performance/aop/src/test/java/org/apache/sirona/aop/SironaProxyFactoryTest.java Wed Nov 13 06:52:09 2013
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
-public class MonitoringProxyFactoryTest {
+public class SironaProxyFactoryTest {
@Before
@After
public void reset() {
@@ -38,7 +38,7 @@ public class MonitoringProxyFactoryTest
@Test
public void test() {
- final Foo foo = MonitoringProxyFactory.monitor(Foo.class, new FooImpl());
+ final Foo foo = SironaProxyFactory.monitor(Foo.class, new FooImpl());
foo.haveARest(2000);
final Counter perf = Repository.INSTANCE.getCounter(new Counter.Key(Role.PERFORMANCES, FooImpl.class.getName() + ".haveARest"));
Copied: incubator/sirona/trunk/agent/performance/jdbc/src/main/java/org/apache/sirona/jdbc/SironaDriver.java (from r1540962, incubator/sirona/trunk/agent/performance/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoringDriver.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/performance/jdbc/src/main/java/org/apache/sirona/jdbc/SironaDriver.java?p2=incubator/sirona/trunk/agent/performance/jdbc/src/main/java/org/apache/sirona/jdbc/SironaDriver.java&p1=incubator/sirona/trunk/agent/performance/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoringDriver.java&r1=1540962&r2=1541402&rev=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/performance/jdbc/src/main/java/org/apache/sirona/jdbc/MonitoringDriver.java (original)
+++ incubator/sirona/trunk/agent/performance/jdbc/src/main/java/org/apache/sirona/jdbc/SironaDriver.java Wed Nov 13 06:52:09 2013
@@ -29,25 +29,25 @@ import java.sql.SQLFeatureNotSupportedEx
import java.util.Properties;
import java.util.logging.Logger;
-public class MonitoringDriver implements Driver {
+public class SironaDriver implements Driver {
static {
try {
- DriverManager.registerDriver(new MonitoringDriver());
+ DriverManager.registerDriver(new SironaDriver());
} catch (final SQLException e) {
// no-op
}
}
- private static final String PREFIX = "jdbc:monitoring:";
+ private static final String PREFIX = "jdbc:sirona:";
private static final String DRIVER_SUFFIX = "delegateDriver=";
public static void load() {
- } // sexier than Class.forName("org.apache.sirona.jdbc.MonitoringDriver"); in full java
+ } // sexier than Class.forName("org.apache.sirona.jdbc.SironaDriver"); in full java
@Override
public Connection connect(final String url, final Properties info) throws SQLException {
if (!acceptsURL(url)) {
- throw new SQLException("Driver " + MonitoringDriver.class.getName() + " doesn't accept " + url + ". Pattern is jdbc:monitoring:<xxx>:<yyy>?delegateDriver=<zzz>");
+ throw new SQLException("Driver " + SironaDriver.class.getName() + " doesn't accept " + url + ". Pattern is jdbc:sirona:<xxx>:<yyy>?delegateDriver=<zzz>");
}
final int driverIndex = url.indexOf(DRIVER_SUFFIX);
Modified: incubator/sirona/trunk/agent/performance/jdbc/src/test/java/org/apache/sirona/jdbc/HsqlDBTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/performance/jdbc/src/test/java/org/apache/sirona/jdbc/HsqlDBTest.java?rev=1541402&r1=1541401&r2=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/performance/jdbc/src/test/java/org/apache/sirona/jdbc/HsqlDBTest.java (original)
+++ incubator/sirona/trunk/agent/performance/jdbc/src/test/java/org/apache/sirona/jdbc/HsqlDBTest.java Wed Nov 13 06:52:09 2013
@@ -39,12 +39,12 @@ import static org.junit.Assert.assertTru
public class HsqlDBTest {
@BeforeClass
public static void init() {
- MonitoringDriver.load();
+ SironaDriver.load();
}
@Test
public void driverMonitoring() throws Exception {
- final Connection connection = DriverManager.getConnection("jdbc:monitoring:hsqldb:mem:monitoring?delegateDriver=" + jdbcDriver.class.getName(), "SA", "");
+ final Connection connection = DriverManager.getConnection("jdbc:sirona:hsqldb:mem:monitoring?delegateDriver=" + jdbcDriver.class.getName(), "SA", "");
assertNotNull(connection);
assertTrue(Proxy.isProxyClass(connection.getClass()));
final InvocationHandler handler = Proxy.getInvocationHandler(connection);
Modified: incubator/sirona/trunk/agent/performance/jpa/src/main/java/org/apache/sirona/jpa/OverridePersistenceXmlClassLoader.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/performance/jpa/src/main/java/org/apache/sirona/jpa/OverridePersistenceXmlClassLoader.java?rev=1541402&r1=1541401&r2=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/performance/jpa/src/main/java/org/apache/sirona/jpa/OverridePersistenceXmlClassLoader.java (original)
+++ incubator/sirona/trunk/agent/performance/jpa/src/main/java/org/apache/sirona/jpa/OverridePersistenceXmlClassLoader.java Wed Nov 13 06:52:09 2013
@@ -16,7 +16,7 @@
*/
package org.apache.sirona.jpa;
-import org.apache.sirona.MonitoringException;
+import org.apache.sirona.SironaException;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -33,7 +33,7 @@ import java.util.LinkedList;
public class OverridePersistenceXmlClassLoader extends ClassLoader {
private static final String PERSISTENCE_XML = "META-INF/persistence.xml";
- private static final String PERSISTENCE_PROVIDER = MonitoringPersistence.class.getName();
+ private static final String PERSISTENCE_PROVIDER = SironaPersistence.class.getName();
public static final String NO_PROVIDER = "<provider></provider>";
private final String replacement;
@@ -95,7 +95,7 @@ public class OverridePersistenceXmlClass
}
return new String(out.toByteArray());
} catch (final IOException e) {
- throw new MonitoringException(e);
+ throw new SironaException(e);
} finally {
// no need to close out
try {
Copied: incubator/sirona/trunk/agent/performance/jpa/src/main/java/org/apache/sirona/jpa/SironaPersistence.java (from r1540962, incubator/sirona/trunk/agent/performance/jpa/src/main/java/org/apache/sirona/jpa/MonitoringPersistence.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/performance/jpa/src/main/java/org/apache/sirona/jpa/SironaPersistence.java?p2=incubator/sirona/trunk/agent/performance/jpa/src/main/java/org/apache/sirona/jpa/SironaPersistence.java&p1=incubator/sirona/trunk/agent/performance/jpa/src/main/java/org/apache/sirona/jpa/MonitoringPersistence.java&r1=1540962&r2=1541402&rev=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/performance/jpa/src/main/java/org/apache/sirona/jpa/MonitoringPersistence.java (original)
+++ incubator/sirona/trunk/agent/performance/jpa/src/main/java/org/apache/sirona/jpa/SironaPersistence.java Wed Nov 13 06:52:09 2013
@@ -32,7 +32,7 @@ import java.util.Map;
import static org.apache.sirona.jpa.JPAProxyFactory.monitor;
-public class MonitoringPersistence implements PersistenceProvider {
+public class SironaPersistence implements PersistenceProvider {
public static final Role ROLE = new Role("jpa", Unit.Time.NANOSECOND);
private static final String DELEGATE_PROVIDER_KEY = Configuration.CONFIG_PROPERTY_PREFIX + "jpa.provider";
Modified: incubator/sirona/trunk/agent/performance/jpa/src/main/resources/META-INF/services/javax.persistence.spi.PersistenceProvider
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/performance/jpa/src/main/resources/META-INF/services/javax.persistence.spi.PersistenceProvider?rev=1541402&r1=1541401&r2=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/performance/jpa/src/main/resources/META-INF/services/javax.persistence.spi.PersistenceProvider (original)
+++ incubator/sirona/trunk/agent/performance/jpa/src/main/resources/META-INF/services/javax.persistence.spi.PersistenceProvider Wed Nov 13 06:52:09 2013
@@ -1 +1 @@
-org.apache.sirona.jpa.MonitoringPersistence
+org.apache.sirona.jpa.SironaPersistence
Modified: incubator/sirona/trunk/agent/performance/jpa/src/test/java/org/apache/sirona/jpa/EMFTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/performance/jpa/src/test/java/org/apache/sirona/jpa/EMFTest.java?rev=1541402&r1=1541401&r2=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/performance/jpa/src/test/java/org/apache/sirona/jpa/EMFTest.java (original)
+++ incubator/sirona/trunk/agent/performance/jpa/src/test/java/org/apache/sirona/jpa/EMFTest.java Wed Nov 13 06:52:09 2013
@@ -51,7 +51,7 @@ public class EMFTest {
@Test
public void newEmfJavaEE() {
- final EntityManagerFactory emf = new MonitoringPersistence().createContainerEntityManagerFactory(
+ final EntityManagerFactory emf = new SironaPersistence().createContainerEntityManagerFactory(
PersistenceUnitInfo.class.cast(Proxy.newProxyInstance(getClass().getClassLoader(), new Class<?>[]{PersistenceUnitInfo.class}, new InvocationHandler() {
@Override
public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
Modified: incubator/sirona/trunk/agent/performance/jpa/src/test/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/performance/jpa/src/test/resources/META-INF/persistence.xml?rev=1541402&r1=1541401&r2=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/performance/jpa/src/test/resources/META-INF/persistence.xml (original)
+++ incubator/sirona/trunk/agent/performance/jpa/src/test/resources/META-INF/persistence.xml Wed Nov 13 06:52:09 2013
@@ -21,7 +21,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
<persistence-unit name="test-jse" transaction-type="RESOURCE_LOCAL">
- <provider>org.apache.sirona.jpa.MonitoringPersistence</provider>
+ <provider>org.apache.sirona.jpa.SironaPersistence</provider>
<class>org.apache.sirona.jpa.entity.Person</class>
<class>org.apache.sirona.jpa.entity.Address</class>
<properties>
@@ -34,7 +34,7 @@
</properties>
</persistence-unit>
<persistence-unit name="test-jta">
- <provider>org.apache.sirona.jpa.MonitoringPersistence</provider>
+ <provider>org.apache.sirona.jpa.SironaPersistence</provider>
<class>org.apache.sirona.jpa.entity.Person</class>
<class>org.apache.sirona.jpa.entity.Address</class>
<properties>
Modified: incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/discovery/GaugeDiscoveryListener.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/discovery/GaugeDiscoveryListener.java?rev=1541402&r1=1541401&r2=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/discovery/GaugeDiscoveryListener.java (original)
+++ incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/discovery/GaugeDiscoveryListener.java Wed Nov 13 06:52:09 2013
@@ -20,7 +20,7 @@ import org.apache.sirona.Role;
import org.apache.sirona.configuration.Configuration;
import org.apache.sirona.counters.Unit;
import org.apache.sirona.gauges.Gauge;
-import org.apache.sirona.web.servlet.MonitoringFilter;
+import org.apache.sirona.web.servlet.SironaFilter;
import org.apache.sirona.web.servlet.StatusGauge;
import javax.servlet.ServletContextEvent;
@@ -49,7 +49,7 @@ public class GaugeDiscoveryListener impl
public void contextInitialized(final ServletContextEvent sce) {
// init status gauges
final ConcurrentMap<Integer, StatusGauge> gauges = new ConcurrentHashMap<Integer, StatusGauge>(35);
- if ("true".equalsIgnoreCase((String) sce.getServletContext().getAttribute(MonitoringFilter.MONITOR_STATUS))) {
+ if ("true".equalsIgnoreCase((String) sce.getServletContext().getAttribute(SironaFilter.MONITOR_STATUS))) {
final String monitoredStatuses = sce.getServletContext().getInitParameter(Configuration.CONFIG_PROPERTY_PREFIX + "web.monitored-statuses");
String contextPath = sce.getServletContext().getContextPath();
Copied: incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/registration/WebSironaInitializer.java (from r1540962, incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/registration/WebMonitoringInitializer.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/registration/WebSironaInitializer.java?p2=incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/registration/WebSironaInitializer.java&p1=incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/registration/WebMonitoringInitializer.java&r1=1540962&r2=1541402&rev=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/registration/WebMonitoringInitializer.java (original)
+++ incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/registration/WebSironaInitializer.java Wed Nov 13 06:52:09 2013
@@ -21,8 +21,8 @@ import org.apache.sirona.repositories.Re
import org.apache.sirona.util.Environment;
import org.apache.sirona.web.discovery.GaugeDiscoveryListener;
import org.apache.sirona.web.lifecycle.SironaLifecycle;
-import org.apache.sirona.web.servlet.MonitoringFilter;
-import org.apache.sirona.web.session.MonitoringSessionListener;
+import org.apache.sirona.web.servlet.SironaFilter;
+import org.apache.sirona.web.session.SironaSessionListener;
import javax.servlet.DispatcherType;
import javax.servlet.FilterRegistration;
@@ -32,7 +32,7 @@ import javax.servlet.ServletException;
import java.util.EnumSet;
import java.util.Set;
-public class WebMonitoringInitializer implements ServletContainerInitializer {
+public class WebSironaInitializer implements ServletContainerInitializer {
private static final String ACTIVATED = Configuration.CONFIG_PROPERTY_PREFIX + "web.activated";
private static final String FALSE = Boolean.FALSE.toString();
@@ -47,16 +47,16 @@ public class WebMonitoringInitializer im
return;
}
- final String monStatus = Boolean.toString(!FALSE.equalsIgnoreCase(ctx.getInitParameter(MonitoringFilter.MONITOR_STATUS)));
- ctx.setAttribute(MonitoringFilter.MONITOR_STATUS, monStatus);
+ final String monStatus = Boolean.toString(!FALSE.equalsIgnoreCase(ctx.getInitParameter(SironaFilter.MONITOR_STATUS)));
+ ctx.setAttribute(SironaFilter.MONITOR_STATUS, monStatus);
- ctx.addListener(MonitoringSessionListener.class);
+ ctx.addListener(SironaSessionListener.class);
ctx.addListener(GaugeDiscoveryListener.class);
if (ctx.getClassLoader().equals(Repository.class.getClassLoader())) {
ctx.addListener(SironaLifecycle.class);
}
- String ignoredUrls = ctx.getInitParameter(MonitoringFilter.IGNORED_URLS);
+ String ignoredUrls = ctx.getInitParameter(SironaFilter.IGNORED_URLS);
String monitoredUrls = ctx.getInitParameter(Configuration.CONFIG_PROPERTY_PREFIX + "web.monitored-urls");
if (!"false".equalsIgnoreCase(monitoredUrls)) {
if (monitoredUrls == null) {
@@ -64,22 +64,22 @@ public class WebMonitoringInitializer im
}
if (ignoredUrls == null) {
- ignoredUrls = Configuration.getProperty(MonitoringFilter.IGNORED_URLS, "/monitoring");
+ ignoredUrls = Configuration.getProperty(SironaFilter.IGNORED_URLS, "/monitoring");
}
if (monitoredUrls.contains(",")) {
final String[] split = monitoredUrls.split(",");
for (int i = 0; i < split.length; i++) {
- final FilterRegistration.Dynamic filter = ctx.addFilter("monitoring-filter-" + i, MonitoringFilter.class);
+ final FilterRegistration.Dynamic filter = ctx.addFilter("monitoring-filter-" + i, SironaFilter.class);
filter.addMappingForUrlPatterns(EnumSet.allOf(DispatcherType.class), false, split[i]);
- filter.setInitParameter(MonitoringFilter.MONITOR_STATUS, monStatus);
- filter.setInitParameter(MonitoringFilter.IGNORED_URLS, ignoredUrls);
+ filter.setInitParameter(SironaFilter.MONITOR_STATUS, monStatus);
+ filter.setInitParameter(SironaFilter.IGNORED_URLS, ignoredUrls);
}
} else {
- final FilterRegistration.Dynamic filter = ctx.addFilter("monitoring-filter", MonitoringFilter.class);
+ final FilterRegistration.Dynamic filter = ctx.addFilter("monitoring-filter", SironaFilter.class);
filter.addMappingForUrlPatterns(EnumSet.allOf(DispatcherType.class), false, monitoredUrls);
- filter.setInitParameter(MonitoringFilter.MONITOR_STATUS, monStatus);
- filter.setInitParameter(MonitoringFilter.IGNORED_URLS, ignoredUrls);
+ filter.setInitParameter(SironaFilter.MONITOR_STATUS, monStatus);
+ filter.setInitParameter(SironaFilter.IGNORED_URLS, ignoredUrls);
}
}
}
Copied: incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/servlet/SironaFilter.java (from r1540962, incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/servlet/MonitoringFilter.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/servlet/SironaFilter.java?p2=incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/servlet/SironaFilter.java&p1=incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/servlet/MonitoringFilter.java&r1=1540962&r2=1541402&rev=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/servlet/MonitoringFilter.java (original)
+++ incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/servlet/SironaFilter.java Wed Nov 13 06:52:09 2013
@@ -16,7 +16,7 @@
*/
package org.apache.sirona.web.servlet;
-import org.apache.sirona.MonitoringException;
+import org.apache.sirona.SironaException;
import org.apache.sirona.Role;
import org.apache.sirona.aop.AbstractPerformanceInterceptor;
import org.apache.sirona.configuration.Configuration;
@@ -33,7 +33,7 @@ import javax.servlet.http.HttpServletRes
import java.io.IOException;
import java.util.Map;
-public class MonitoringFilter extends AbstractPerformanceInterceptor<MonitoringFilter.Invocation> implements Filter {
+public class SironaFilter extends AbstractPerformanceInterceptor<SironaFilter.Invocation> implements Filter {
public static final String MONITOR_STATUS = Configuration.CONFIG_PROPERTY_PREFIX + "web.monitored-status";
public static final String IGNORED_URLS = Configuration.CONFIG_PROPERTY_PREFIX + "web.ignored-urls";
@@ -50,7 +50,7 @@ public class MonitoringFilter extends Ab
final String monStatus = filterConfig.getInitParameter(MONITOR_STATUS);
if ((monStatus == null || "true".equalsIgnoreCase(monStatus))
&& filterConfig.getServletContext().getAttribute(GaugeDiscoveryListener.STATUS_GAUGES_ATTRIBUTE) == null) {
- throw new MonitoringException("To monitor status activate " + GaugeDiscoveryListener.class.getName());
+ throw new SironaException("To monitor status activate " + GaugeDiscoveryListener.class.getName());
}
statusGauges = (Map<Integer, StatusGauge>) filterConfig.getServletContext().getAttribute(GaugeDiscoveryListener.STATUS_GAUGES_ATTRIBUTE);
Copied: incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/session/SironaSessionListener.java (from r1540962, incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/session/MonitoringSessionListener.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/session/SironaSessionListener.java?p2=incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/session/SironaSessionListener.java&p1=incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/session/MonitoringSessionListener.java&r1=1540962&r2=1541402&rev=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/session/MonitoringSessionListener.java (original)
+++ incubator/sirona/trunk/agent/performance/web/src/main/java/org/apache/sirona/web/session/SironaSessionListener.java Wed Nov 13 06:52:09 2013
@@ -30,7 +30,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;
-public class MonitoringSessionListener implements HttpSessionListener, ServletContextListener {
+public class SironaSessionListener implements HttpSessionListener, ServletContextListener {
private final Map<String, StopWatch> watches = new ConcurrentHashMap<String, StopWatch>();
private final AtomicLong sessionNumber = new AtomicLong(0);
Modified: incubator/sirona/trunk/agent/performance/web/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/performance/web/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer?rev=1541402&r1=1541401&r2=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/performance/web/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer (original)
+++ incubator/sirona/trunk/agent/performance/web/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer Wed Nov 13 06:52:09 2013
@@ -1 +1 @@
-org.apache.sirona.web.registration.WebMonitoringInitializer
+org.apache.sirona.web.registration.WebSironaInitializer
Modified: incubator/sirona/trunk/agent/performance/web/src/test/java/org/apache/sirona/test/web/RequestPerformanceTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/performance/web/src/test/java/org/apache/sirona/test/web/RequestPerformanceTest.java?rev=1541402&r1=1541401&r2=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/performance/web/src/test/java/org/apache/sirona/test/web/RequestPerformanceTest.java (original)
+++ incubator/sirona/trunk/agent/performance/web/src/test/java/org/apache/sirona/test/web/RequestPerformanceTest.java Wed Nov 13 06:52:09 2013
@@ -23,7 +23,7 @@ import org.apache.sirona.Role;
import org.apache.sirona.counters.Counter;
import org.apache.sirona.counters.Unit;
import org.apache.sirona.repositories.Repository;
-import org.apache.sirona.web.registration.WebMonitoringInitializer;
+import org.apache.sirona.web.registration.WebSironaInitializer;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
@@ -56,7 +56,7 @@ public class RequestPerformanceTest {
.addClasses(HittableServlet.class)
.addAsLibraries(
ShrinkWrap.create(JavaArchive.class, "sci.jar")
- .addAsServiceProvider(ServletContainerInitializer.class, WebMonitoringInitializer.class));
+ .addAsServiceProvider(ServletContainerInitializer.class, WebSironaInitializer.class));
}
@ArquillianResource
Modified: incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/CubeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/CubeBuilder.java?rev=1541402&r1=1541401&r2=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/CubeBuilder.java (original)
+++ incubator/sirona/trunk/agent/store/cube/src/main/java/org/apache/sirona/cube/CubeBuilder.java Wed Nov 13 06:52:09 2013
@@ -16,7 +16,7 @@
*/
package org.apache.sirona.cube;
-import org.apache.sirona.MonitoringException;
+import org.apache.sirona.SironaException;
import org.apache.sirona.configuration.Configuration;
import javax.net.ssl.KeyManager;
@@ -69,7 +69,7 @@ public class CubeBuilder {
sslContext.init(keyManagers, trustManagers, new java.security.SecureRandom());
socketFactory = sslContext.getSocketFactory();
} catch (final Exception e) {
- throw new MonitoringException(e);
+ throw new SironaException(e);
}
} else {
socketFactory = null;
@@ -129,7 +129,7 @@ public class CubeBuilder {
tmf.init(ks);
return tmf.getTrustManagers();
} catch (final Exception e) {
- throw new MonitoringException(e);
+ throw new SironaException(e);
}
}
@@ -156,7 +156,7 @@ public class CubeBuilder {
kmf.init(ks, pwd);
return kmf.getKeyManagers();
} catch (final Exception e) {
- throw new MonitoringException(e);
+ throw new SironaException(e);
}
}
Modified: incubator/sirona/trunk/agent/store/graphite/src/main/java/org/apache/sirona/graphite/GraphiteBuilder.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/store/graphite/src/main/java/org/apache/sirona/graphite/GraphiteBuilder.java?rev=1541402&r1=1541401&r2=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/store/graphite/src/main/java/org/apache/sirona/graphite/GraphiteBuilder.java (original)
+++ incubator/sirona/trunk/agent/store/graphite/src/main/java/org/apache/sirona/graphite/GraphiteBuilder.java Wed Nov 13 06:52:09 2013
@@ -16,7 +16,7 @@
*/
package org.apache.sirona.graphite;
-import org.apache.sirona.MonitoringException;
+import org.apache.sirona.SironaException;
import org.apache.sirona.configuration.Configuration;
import javax.net.SocketFactory;
@@ -36,7 +36,7 @@ public class GraphiteBuilder {
try {
return new Graphite(SocketFactory.getDefault(), address, port, Charset.forName(charset));
} catch (final IOException e) {
- throw new MonitoringException(e);
+ throw new SironaException(e);
}
}
}
Copied: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/SironaException.java (from r1540962, incubator/sirona/trunk/core/src/main/java/org/apache/sirona/MonitoringException.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/SironaException.java?p2=incubator/sirona/trunk/core/src/main/java/org/apache/sirona/SironaException.java&p1=incubator/sirona/trunk/core/src/main/java/org/apache/sirona/MonitoringException.java&r1=1540962&r2=1541402&rev=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/MonitoringException.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/SironaException.java Wed Nov 13 06:52:09 2013
@@ -16,12 +16,12 @@
*/
package org.apache.sirona;
-public class MonitoringException extends RuntimeException {
- public MonitoringException(final Throwable e) {
+public class SironaException extends RuntimeException {
+ public SironaException(final Throwable e) {
super(e);
}
- public MonitoringException(final String s) {
+ public SironaException(final String s) {
super(s);
}
}
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/Configuration.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/Configuration.java?rev=1541402&r1=1541401&r2=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/Configuration.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/Configuration.java Wed Nov 13 06:52:09 2013
@@ -16,7 +16,7 @@
*/
package org.apache.sirona.configuration;
-import org.apache.sirona.MonitoringException;
+import org.apache.sirona.SironaException;
import org.apache.sirona.util.ClassLoaders;
import java.io.File;
@@ -94,7 +94,7 @@ public final class Configuration {
try {
array[i] = newInstance(api, split[i]);
} catch (final Exception e) {
- throw new MonitoringException(e);
+ throw new SironaException(e);
}
}
return array;
@@ -123,7 +123,7 @@ public final class Configuration {
SINGLETONS.put(clazz, t);
return t;
} catch (final Exception e) {
- throw new MonitoringException(e);
+ throw new SironaException(e);
}
}
@@ -141,7 +141,7 @@ public final class Configuration {
try {
return internalProcessInstance(instance);
} catch (final Exception e) {
- throw new MonitoringException(e);
+ throw new SironaException(e);
}
}
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/repositories/DefaultRepository.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/repositories/DefaultRepository.java?rev=1541402&r1=1541401&r2=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/repositories/DefaultRepository.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/repositories/DefaultRepository.java Wed Nov 13 06:52:09 2013
@@ -16,7 +16,7 @@
*/
package org.apache.sirona.repositories;
-import org.apache.sirona.MonitoringException;
+import org.apache.sirona.SironaException;
import org.apache.sirona.Role;
import org.apache.sirona.configuration.Configuration;
import org.apache.sirona.counters.Counter;
@@ -88,7 +88,7 @@ public class DefaultRepository implement
GaugeManager mgr;
try {
mgr = Configuration.findOrCreateInstance(GaugeManager.class);
- } catch (final MonitoringException e) {
+ } catch (final SironaException e) {
mgr = new DefaultGaugeManager();
}
manager = mgr;
@@ -102,7 +102,7 @@ public class DefaultRepository implement
NodeStatusDataStore status = null;
try {
status = Configuration.findOrCreateInstance(NodeStatusDataStore.class);
- } catch (final MonitoringException e) {
+ } catch (final SironaException e) {
// no-op
}
if (status == null) {
@@ -115,13 +115,13 @@ public class DefaultRepository implement
CommonGaugeDataStore gauge = null;
try {
gauge = Configuration.findOrCreateInstance(GaugeDataStore.class);
- } catch (final MonitoringException e) {
+ } catch (final SironaException e) {
// no-op
}
if (gauge == null) {
try {
gauge = Configuration.findOrCreateInstance(CollectorGaugeDataStore.class);
- } catch (final MonitoringException e) {
+ } catch (final SironaException e) {
// no-op
}
}
@@ -135,13 +135,13 @@ public class DefaultRepository implement
CounterDataStore counter = null;
try {
counter = Configuration.findOrCreateInstance(CounterDataStore.class);
- } catch (final MonitoringException e) {
+ } catch (final SironaException e) {
// no-op
}
if (counter == null) {
try {
counter = Configuration.findOrCreateInstance(CollectorCounterStore.class);
- } catch (final MonitoringException e) {
+ } catch (final SironaException e) {
// no-op
}
}
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/gauge/DelegatedCollectorGaugeDataStore.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/gauge/DelegatedCollectorGaugeDataStore.java?rev=1541402&r1=1541401&r2=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/gauge/DelegatedCollectorGaugeDataStore.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/gauge/DelegatedCollectorGaugeDataStore.java Wed Nov 13 06:52:09 2013
@@ -16,7 +16,7 @@
*/
package org.apache.sirona.store.gauge;
-import org.apache.sirona.MonitoringException;
+import org.apache.sirona.SironaException;
import org.apache.sirona.Role;
import org.apache.sirona.configuration.Configuration;
@@ -41,7 +41,7 @@ public class DelegatedCollectorGaugeData
DelegatedCollectorGaugeDataStore.class.getClassLoader().loadClass( // use this classloader and not TCCL to avoid issues
Configuration.getProperty(Configuration.CONFIG_PROPERTY_PREFIX + "collector.gauge.store-class", InMemoryGaugeDataStore.class.getName())));
} catch (final ClassNotFoundException e) {
- throw new MonitoringException(e);
+ throw new SironaException(e);
}
}
@@ -55,7 +55,7 @@ public class DelegatedCollectorGaugeData
}
return delegateClass.newInstance();
} catch (final Exception e) {
- throw new MonitoringException(e);
+ throw new SironaException(e);
}
}
Modified: incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/Collector.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/Collector.java?rev=1541402&r1=1541401&r2=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/Collector.java (original)
+++ incubator/sirona/trunk/server/collector/src/main/java/org/apache/sirona/collector/server/Collector.java Wed Nov 13 06:52:09 2013
@@ -19,7 +19,7 @@ package org.apache.sirona.collector.serv
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.sirona.MonitoringException;
+import org.apache.sirona.SironaException;
import org.apache.sirona.Role;
import org.apache.sirona.collector.server.api.SSLSocketFactoryProvider;
import org.apache.sirona.collector.server.api.SecurityProvider;
@@ -146,7 +146,7 @@ public class Collector extends HttpServl
try {
registerNode(url.trim());
} catch (final MalformedURLException e) {
- throw new MonitoringException(e);
+ throw new SironaException(e);
}
}
}
@@ -179,7 +179,7 @@ public class Collector extends HttpServl
final ServletInputStream inputStream = req.getInputStream();
try {
slurpEvents(inputStream);
- } catch (final MonitoringException me) {
+ } catch (final SironaException me) {
resp.setStatus(HttpURLConnection.HTTP_BAD_REQUEST);
resp.getWriter().write("{\"error\":\"" + me.getCause().getMessage().replace('\"', ' ') + "\"}");
return;
@@ -222,7 +222,7 @@ public class Collector extends HttpServl
statusDataStore.store((String) events[0].getData().get("marker"), status);
}
} catch (final Exception e) {
- throw new MonitoringException(e);
+ throw new SironaException(e);
}
}
}
Modified: incubator/sirona/trunk/server/collector/src/test/java/org/apache/sirona/collector/server/RegistrationTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/collector/src/test/java/org/apache/sirona/collector/server/RegistrationTest.java?rev=1541402&r1=1541401&r2=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/server/collector/src/test/java/org/apache/sirona/collector/server/RegistrationTest.java (original)
+++ incubator/sirona/trunk/server/collector/src/test/java/org/apache/sirona/collector/server/RegistrationTest.java Wed Nov 13 06:52:09 2013
@@ -36,7 +36,7 @@ import io.netty.handler.codec.http.HttpR
import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.handler.codec.http.HttpVersion;
import io.netty.handler.stream.ChunkedWriteHandler;
-import org.apache.sirona.MonitoringException;
+import org.apache.sirona.SironaException;
import org.apache.sirona.Role;
import org.apache.sirona.store.gauge.DelegatedCollectorGaugeDataStore;
import org.apache.sirona.configuration.Configuration;
@@ -143,12 +143,12 @@ public class RegistrationTest {
@Override
public void operationComplete(final ChannelFuture future) throws Exception {
if (!future.isSuccess()) {
- throw new MonitoringException("bind failed");
+ throw new SironaException("bind failed");
}
}
}).sync();
} catch (final InterruptedException e) {
- throw new MonitoringException(e);
+ throw new SironaException(e);
}
return this;
Copied: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/SironaController.java (from r1540962, incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/MonitoringController.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/SironaController.java?p2=incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/SironaController.java&p1=incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/MonitoringController.java&r1=1540962&r2=1541402&rev=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/MonitoringController.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/SironaController.java Wed Nov 13 06:52:09 2013
@@ -51,7 +51,7 @@ import java.util.concurrent.ConcurrentHa
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-public class MonitoringController implements Filter {
+public class SironaController implements Filter {
public static final String CONTENT_TYPE = "Content-Type";
private final Map<String, byte[]> cachedResources = new ConcurrentHashMap<String, byte[]>();
private final Map<Pattern, Invoker> invokers = new HashMap<Pattern, Invoker>();
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=1541402&r1=1541401&r2=1541402&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 Wed Nov 13 06:52:09 2013
@@ -24,14 +24,13 @@ import org.apache.velocity.runtime.Runti
import org.apache.velocity.runtime.resource.loader.ResourceLoader;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
public class FilteringEndpoints {
private static final String BOOTSTRAP_CSS = "/resources/css/bootstrap.css";
- private static final String MONITORING_CSS = "/resources/css/sirona.css";
+ private static final String SIRONA_CSS = "/resources/css/sirona.css";
private static final String RESOURCES = "/resources/.*";
private ResourceLoader rl;
@@ -44,9 +43,9 @@ public class FilteringEndpoints {
}
}
- @Regex(MONITORING_CSS)
+ @Regex(SIRONA_CSS)
public void filterCss(final TemplateHelper helper) {
- helper.renderPlain(MONITORING_CSS);
+ helper.renderPlain(SIRONA_CSS);
}
@Regex(BOOTSTRAP_CSS)
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=1541402&r1=1541401&r2=1541402&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 Wed Nov 13 06:52:09 2013
@@ -16,7 +16,7 @@
*/
package org.apache.sirona.reporting.web.handler.internal;
-import org.apache.sirona.MonitoringException;
+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;
@@ -68,9 +68,9 @@ public class Invoker {
response.getWriter().write(result.toString());
}
} catch (final InvocationTargetException e) {
- throw new MonitoringException(e.getCause());
+ throw new SironaException(e.getCause());
} catch (final Exception e) {
- throw new MonitoringException(e);
+ throw new SironaException(e);
}
}
@@ -135,7 +135,7 @@ public class Invoker {
return new TemplateHelper(response.getWriter(),
new MapBuilder<String, Object>().set( "templateId", plugin ).build());
} catch (final IOException e) {
- throw new MonitoringException(e);
+ throw new SironaException(e);
}
}
}
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=1541402&r1=1541401&r2=1541402&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 Wed Nov 13 06:52:09 2013
@@ -17,7 +17,7 @@
package org.apache.sirona.reporting.web.plugin.jmx;
import org.apache.commons.codec.binary.Base64;
-import org.apache.sirona.MonitoringException;
+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;
@@ -78,7 +78,7 @@ public class JMXEndpoints {
@Regex("/operation/([^/]*)/([^/]*)/(.*)")
public String invokeOperation(final String objectNameBase64, final String method, final String[] parameters) {
if (!METHOD_INVOCATION_ALLOWED) {
- throw new MonitoringException("Method invocation not allowed");
+ throw new SironaException("Method invocation not allowed");
}
try {
@@ -119,7 +119,7 @@ public class JMXEndpoints {
.set("operations", operations(info))
.build(), false);
} catch (final Exception e) {
- throw new MonitoringException(e);
+ throw new SironaException(e);
}
}
@@ -173,7 +173,7 @@ public class JMXEndpoints {
return tryStringConstructor(type, value);
} catch (final Exception e) {
- throw new MonitoringException(e);
+ throw new SironaException(e);
}
}
@@ -199,7 +199,7 @@ public class JMXEndpoints {
}
}
- throw new MonitoringException(value + " is not a number");
+ throw new SironaException(value + " is not a number");
}
private static Object tryStringConstructor(String type, final String value) throws Exception {
@@ -308,7 +308,7 @@ public class JMXEndpoints {
return value.toString();
} catch (final Exception e) {
- throw new MonitoringException(e);
+ throw new SironaException(e);
}
}
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=1541402&r1=1541401&r2=1541402&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 Wed Nov 13 06:52:09 2013
@@ -16,7 +16,7 @@
*/
package org.apache.sirona.reporting.web.plugin.report;
-import org.apache.sirona.MonitoringException;
+import org.apache.sirona.SironaException;
import org.apache.sirona.Role;
import org.apache.sirona.counters.AggregatedCounter;
import org.apache.sirona.counters.Counter;
@@ -94,7 +94,7 @@ public class ReportEndpoints {
try {
response.sendRedirect(request.getRequestURI().substring(0, request.getRequestURI().length() - "/clear".length()));
} catch (final IOException e) {
- throw new MonitoringException(e);
+ throw new SironaException(e);
}
}
Copied: incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/registration/SironaReportingInitializer.java (from r1540962, incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/registration/MonitoringReportingInitializer.java)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/registration/SironaReportingInitializer.java?p2=incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/registration/SironaReportingInitializer.java&p1=incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/registration/MonitoringReportingInitializer.java&r1=1540962&r2=1541402&rev=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/registration/MonitoringReportingInitializer.java (original)
+++ incubator/sirona/trunk/server/reporting/src/main/java/org/apache/sirona/reporting/web/registration/SironaReportingInitializer.java Wed Nov 13 06:52:09 2013
@@ -17,7 +17,7 @@
package org.apache.sirona.reporting.web.registration;
import org.apache.sirona.configuration.Configuration;
-import org.apache.sirona.reporting.web.MonitoringController;
+import org.apache.sirona.reporting.web.SironaController;
import javax.servlet.DispatcherType;
import javax.servlet.ServletContainerInitializer;
@@ -26,7 +26,7 @@ import javax.servlet.ServletException;
import java.util.EnumSet;
import java.util.Set;
-public class MonitoringReportingInitializer implements ServletContainerInitializer {
+public class SironaReportingInitializer implements ServletContainerInitializer {
@Override
public void onStartup(final Set<Class<?>> classes, final ServletContext ctx) throws ServletException {
final String activated = ctx.getInitParameter(Configuration.CONFIG_PROPERTY_PREFIX + "reporting.activated");
@@ -45,7 +45,7 @@ public class MonitoringReportingInitiali
mapping = mapping.substring(0, mapping.length() - 1);
}
- final MonitoringController controller = new MonitoringController();
+ final SironaController controller = new SironaController();
controller.setMapping(mapping);
ctx.addFilter("commons-monitoring-reporting", controller).addMappingForUrlPatterns(EnumSet.allOf(DispatcherType.class), true, mapping + "/*");
}
Modified: incubator/sirona/trunk/server/reporting/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer?rev=1541402&r1=1541401&r2=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer (original)
+++ incubator/sirona/trunk/server/reporting/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer Wed Nov 13 06:52:09 2013
@@ -1 +1 @@
-org.apache.sirona.reporting.web.registration.MonitoringReportingInitializer
+org.apache.sirona.reporting.web.registration.SironaReportingInitializer
Modified: incubator/sirona/trunk/server/reporting/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/src/main/webapp/WEB-INF/web.xml?rev=1541402&r1=1541401&r2=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/sirona/trunk/server/reporting/src/main/webapp/WEB-INF/web.xml Wed Nov 13 06:52:09 2013
@@ -31,7 +31,7 @@
<filter>
<filter-name>Monitoring</filter-name>
- <filter-class>org.apache.sirona.reporting.web.MonitoringController</filter-class>
+ <filter-class>org.apache.sirona.reporting.web.SironaController</filter-class>
</filter>
<filter-mapping>
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=1541402&r1=1541401&r2=1541402&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 06:52:09 2013
@@ -20,7 +20,7 @@ import com.gargoylesoftware.htmlunit.Nic
import com.gargoylesoftware.htmlunit.Page;
import com.gargoylesoftware.htmlunit.WebClient;
import org.apache.catalina.startup.Constants;
-import org.apache.sirona.reporting.web.registration.MonitoringReportingInitializer;
+import org.apache.sirona.reporting.web.registration.SironaReportingInitializer;
import org.apache.sirona.web.lifecycle.SironaLifecycle;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
@@ -53,7 +53,7 @@ public abstract class SironaReportingTes
return ShrinkWrap.create(WebArchive.class, "sirona-test.war")
.addAsLibraries(
ShrinkWrap.create(JavaArchive.class, "sci.jar") // bug in tomcat?
- .addAsServiceProvider(ServletContainerInitializer.class, MonitoringReportingInitializer.class)
+ .addAsServiceProvider(ServletContainerInitializer.class, SironaReportingInitializer.class)
.addClass(SironaLifecycle.class));
}
Modified: incubator/sirona/trunk/src/site/markdown/basis.md
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/src/site/markdown/basis.md?rev=1541402&r1=1541401&r2=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/src/site/markdown/basis.md (original)
+++ incubator/sirona/trunk/src/site/markdown/basis.md Wed Nov 13 06:52:09 2013
@@ -64,7 +64,7 @@ Map<Long, Double> sortedValueByIncreasin
## Monitor JDBC
-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`.
+To monitor JDBC just configure your DataSource replacing its `java.sql.Driver` by `org.apache.sirona.jdbc.SironaDriver`
+and updating its jdbc url from `jdbc:foo:bar` to `jdbc:sirona:foo:bar?delegateDriver=xxxxx`.
Note: delegateDriver needs to be the last parameter (if there are several).
Modified: incubator/sirona/trunk/src/site/markdown/instrumentation.md
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/src/site/markdown/instrumentation.md?rev=1541402&r1=1541401&r2=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/src/site/markdown/instrumentation.md (original)
+++ incubator/sirona/trunk/src/site/markdown/instrumentation.md Wed Nov 13 06:52:09 2013
@@ -19,7 +19,7 @@ under the License.
# Manually (clients)
To handle manually the interception you need to import commons-monitoring-aop.
-Then you can rely on `org.apache.sirona.aop.MonitoringProxyFactory`.
+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
to use javassist you set it to `org.apache.commons.proxy.factory.javassist.JavassistProxyFactory`
@@ -28,7 +28,7 @@ to use javassist you set it to `org.apac
Then the API is quite simple:
<pre class="prettyprint linenums"><![CDATA[
-final MyClient client = MonitoringProxyFactory.monitor(MyClient.class, getMyClientInstance());
+final MyClient client = SironaProxyFactory.monitor(MyClient.class, getMyClientInstance());
]]></pre>
# CDI
Modified: incubator/sirona/trunk/src/site/markdown/jpa.md
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/src/site/markdown/jpa.md?rev=1541402&r1=1541401&r2=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/src/site/markdown/jpa.md (original)
+++ incubator/sirona/trunk/src/site/markdown/jpa.md Wed Nov 13 06:52:09 2013
@@ -23,7 +23,7 @@ This module aims to monitor JPA invocati
## Installation
To use this module and get execution time of queries creation (`createNamedQuery`, ...) set
-as JPA provider `org.apache.sirona.jpa.MonitoringPersistence`.
+as JPA provider `org.apache.sirona.jpa.SironaPersistence`.
If you have in your environment a single "real" JPA provider it should be found automatically but if that's not the
case of if you want to force the implementation set the property `org.apache.sirona.jpa.provider`
Modified: incubator/sirona/trunk/src/site/markdown/reporting.md
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/src/site/markdown/reporting.md?rev=1541402&r1=1541401&r2=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/src/site/markdown/reporting.md (original)
+++ incubator/sirona/trunk/src/site/markdown/reporting.md Wed Nov 13 06:52:09 2013
@@ -45,7 +45,7 @@ you can embed it. You'll need to update
<filter>
<filter-name>Monitoring</filter-name>
- <filter-class>org.apache.sirona.reporting.web.MonitoringController</filter-class>
+ <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>
Modified: incubator/sirona/trunk/src/site/markdown/web.md
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/src/site/markdown/web.md?rev=1541402&r1=1541401&r2=1541402&view=diff
==============================================================================
--- incubator/sirona/trunk/src/site/markdown/web.md (original)
+++ incubator/sirona/trunk/src/site/markdown/web.md Wed Nov 13 06:52:09 2013
@@ -26,12 +26,12 @@ Add commons-monitoring-web to your webap
## Monitor requests
-Simply add the filter `org.apache.sirona.web.servlet.MonitoringFilter`:
+Simply add the filter `org.apache.sirona.web.servlet.SironaFilter`:
<pre class="prettyprint linenums"><![CDATA[
<filter>
<filter-name>monitoring-request</filter-name>
- <filter-class>org.apache.sirona.web.servlet.MonitoringFilter</filter-class>
+ <filter-class>org.apache.sirona.web.servlet.SironaFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>monitoring-request</filter-name>
@@ -45,11 +45,11 @@ init parameter `org.apache.sirona.web.ac
## Monitor sessions
-Simply add the listener `org.apache.sirona.web.servlet.MonitoringFilter`:
+Simply add the listener `org.apache.sirona.web.servlet.SironaFilter`:
<pre class="prettyprint linenums"><![CDATA[
<listener>
- <listener-class>org.apache.sirona.web.session.MonitoringSessionListener</listener-class>
+ <listener-class>org.apache.sirona.web.session.SironaSessionListener</listener-class>
</listener>
]]></pre>