You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by sg...@apache.org on 2007/09/09 19:26:43 UTC
svn commit: r574036 - in /turbine/fulcrum/trunk/yaafi: project.xml
src/java/org/apache/fulcrum/yaafi/interceptor/jamon/Jamon1PerformanceMonitorImpl.java
src/java/org/apache/fulcrum/yaafi/interceptor/jamon/JamonPerformanceMonitor.java
Author: sgoeschl
Date: Sun Sep 9 10:26:43 2007
New Revision: 574036
URL: http://svn.apache.org/viewvc?rev=574036&view=rev
Log:
Fixed broken compilation - JAMon is now a compile time dependency ... :-(
Modified:
turbine/fulcrum/trunk/yaafi/project.xml
turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/jamon/Jamon1PerformanceMonitorImpl.java
turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/jamon/JamonPerformanceMonitor.java
Modified: turbine/fulcrum/trunk/yaafi/project.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/project.xml?rev=574036&r1=574035&r2=574036&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/project.xml (original)
+++ turbine/fulcrum/trunk/yaafi/project.xml Sun Sep 9 10:26:43 2007
@@ -36,8 +36,7 @@
</versions>
<dependencies>
- <!-- you need to download the JAMON library manually to enable the interceptor -->
- <!--
+ <!-- compile time dependency on JAMon for interceptors -->
<dependency>
<groupId>jamon</groupId>
<artifactId>jamon</artifactId>
@@ -48,7 +47,6 @@
<ear.bundle>true</ear.bundle>
</properties>
</dependency>
- -->
</dependencies>
<build>
Modified: turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/jamon/Jamon1PerformanceMonitorImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/jamon/Jamon1PerformanceMonitorImpl.java?rev=574036&r1=574035&r2=574036&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/jamon/Jamon1PerformanceMonitorImpl.java (original)
+++ turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/jamon/Jamon1PerformanceMonitorImpl.java Sun Sep 9 10:26:43 2007
@@ -70,7 +70,17 @@
/**
* Create a performance report
*/
- public String createReport() {
- return MonitorFactory.getRootMonitor().getReport();
+ public String createReport() throws Exception
+ {
+ String result = "";
+ try
+ {
+ result = MonitorFactory.getRootMonitor().getReport();
+ }
+ catch (Exception e)
+ {
+
+ }
+ return result;
}
}
Modified: turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/jamon/JamonPerformanceMonitor.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/jamon/JamonPerformanceMonitor.java?rev=574036&r1=574035&r2=574036&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/jamon/JamonPerformanceMonitor.java (original)
+++ turbine/fulcrum/trunk/yaafi/src/java/org/apache/fulcrum/yaafi/interceptor/jamon/JamonPerformanceMonitor.java Sun Sep 9 10:26:43 2007
@@ -24,6 +24,7 @@
/**
* Create a performance report
* @return the textual performance report
+ * @throws Exception generating the report failed
*/
- public String createReport();
+ public String createReport() throws Exception;
}