You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2009/03/22 20:02:52 UTC
svn commit: r757237 - in /labs/magma/trunk/website-developer/src/main:
java/org/apache/magma/website/developer/
resources/org/apache/magma/website/developer/
Author: simoneg
Date: Sun Mar 22 19:02:51 2009
New Revision: 757237
URL: http://svn.apache.org/viewvc?rev=757237&view=rev
Log: (empty)
Added:
labs/magma/trunk/website-developer/src/main/resources/org/apache/magma/website/developer/traceComment.vm
Modified:
labs/magma/trunk/website-developer/src/main/java/org/apache/magma/website/developer/DeveloperHandler.java
labs/magma/trunk/website-developer/src/main/java/org/apache/magma/website/developer/InstallDeveloperBoxInDefaultTemplate.aj
labs/magma/trunk/website-developer/src/main/resources/org/apache/magma/website/developer/panel.vm
Modified: labs/magma/trunk/website-developer/src/main/java/org/apache/magma/website/developer/DeveloperHandler.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-developer/src/main/java/org/apache/magma/website/developer/DeveloperHandler.java?rev=757237&r1=757236&r2=757237&view=diff
==============================================================================
--- labs/magma/trunk/website-developer/src/main/java/org/apache/magma/website/developer/DeveloperHandler.java (original)
+++ labs/magma/trunk/website-developer/src/main/java/org/apache/magma/website/developer/DeveloperHandler.java Sun Mar 22 19:02:51 2009
@@ -36,21 +36,21 @@
import org.apache.magma.basics.utils.GenericClass;
import org.apache.magma.settings.Settings;
import org.apache.magma.website.HtmlProducer;
-import org.apache.magma.website.Producer;
import org.apache.magma.website.RootWebHandler;
import org.apache.magma.website.WebHandler;
-import org.apache.magma.website.developer.uris.HandlerDescription;
-import org.apache.magma.website.producers.StringHtmlProducer;
-import org.apache.magma.website.velocity.VelocityHtmlProducer;
-
import org.apache.magma.website.developer.basictracing.BasicTracer;
import org.apache.magma.website.developer.basictracing.TracingRequests;
import org.apache.magma.website.developer.i18n.I18nHandler;
+import org.apache.magma.website.developer.uris.HandlerDescription;
+import org.apache.magma.website.producers.StringHtmlProducer;
+import org.apache.magma.website.producers.TemplatingProducer;
+import org.apache.magma.website.velocity.VelocityHtmlProducer;
public class DeveloperHandler extends WebHandler {
private String paramUrl = null;
private Map<Long, BasicTracer> sessionTraces;
+ private Long requestMyTraceId;
public I18nHandler handleI18n() {
return new I18nHandler();
@@ -130,15 +130,23 @@
}
public HtmlProducer doPanel() {
- long traceid = installTrace();
- VelocityHtmlProducer ret = new VelocityHtmlProducer();
- ret.addParameter("traceid", traceid);
+ installTrace();
+ TemplatingProducer ret = new TemplatingProducer();
+ ret.addParameter("traceid", requestMyTraceId);
return ret;
}
- protected long installTrace() {
+ public HtmlProducer doTraceComment() {
+ installTrace();
+ TemplatingProducer ret = new TemplatingProducer();
+ ret.addParameter("traceid", requestMyTraceId);
+ return ret;
+ }
+
+ protected void installTrace() {
+ if (this.requestMyTraceId != null) return;
TracingRequests tr = TracingRequests.aspectOf();
- if (tr == null) return 0;
+ if (tr == null) return;
BasicTracer tracer = tr.getTracer();
if (this.sessionTraces == null) {
this.sessionTraces = new HashMap<Long, BasicTracer>();
@@ -154,7 +162,7 @@
this.sessionTraces.remove(id);
}
}
- return handle;
+ this.requestMyTraceId = handle;
}
public HtmlProducer doShowTrace(long id) {
Modified: labs/magma/trunk/website-developer/src/main/java/org/apache/magma/website/developer/InstallDeveloperBoxInDefaultTemplate.aj
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-developer/src/main/java/org/apache/magma/website/developer/InstallDeveloperBoxInDefaultTemplate.aj?rev=757237&r1=757236&r2=757237&view=diff
==============================================================================
--- labs/magma/trunk/website-developer/src/main/java/org/apache/magma/website/developer/InstallDeveloperBoxInDefaultTemplate.aj (original)
+++ labs/magma/trunk/website-developer/src/main/java/org/apache/magma/website/developer/InstallDeveloperBoxInDefaultTemplate.aj Sun Mar 22 19:02:51 2009
@@ -25,4 +25,9 @@
tpl.always(tpl.root().handleDevel().doPanel());
}
+ after(Template tpl) : execution(* Template.layoutExtraContent()) && this(tpl) {
+ tpl.always(tpl.root().handleDevel().doTraceComment());
+ }
+
+
}
Modified: labs/magma/trunk/website-developer/src/main/resources/org/apache/magma/website/developer/panel.vm
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-developer/src/main/resources/org/apache/magma/website/developer/panel.vm?rev=757237&r1=757236&r2=757237&view=diff
==============================================================================
--- labs/magma/trunk/website-developer/src/main/resources/org/apache/magma/website/developer/panel.vm (original)
+++ labs/magma/trunk/website-developer/src/main/resources/org/apache/magma/website/developer/panel.vm Sun Mar 22 19:02:51 2009
@@ -16,7 +16,7 @@
limitations under the License.
-->
<div>
-#if ($traceid > 0)
+#if ($traceid && $traceid > 0)
<b><a href="showTrace!$traceid">Show this page trace</a></b>
#end
<ul>
Added: labs/magma/trunk/website-developer/src/main/resources/org/apache/magma/website/developer/traceComment.vm
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-developer/src/main/resources/org/apache/magma/website/developer/traceComment.vm?rev=757237&view=auto
==============================================================================
--- labs/magma/trunk/website-developer/src/main/resources/org/apache/magma/website/developer/traceComment.vm (added)
+++ labs/magma/trunk/website-developer/src/main/resources/org/apache/magma/website/developer/traceComment.vm Sun Mar 22 19:02:51 2009
@@ -0,0 +1,7 @@
+<!--
+
+#if ($traceid && $traceid > 0)
+ <a href="showTrace!$traceid">This page has been traced</a>
+#end
+
+-->
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org