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/24 17:31:25 UTC
svn commit: r757885 - in /labs/magma/trunk:
foundation-website/src/main/java/org/apache/magma/website/utils/
website-administration-inline/src/main/java/org/apache/magma/website/admin/
Author: simoneg
Date: Tue Mar 24 16:31:23 2009
New Revision: 757885
URL: http://svn.apache.org/viewvc?rev=757885&view=rev
Log:
LABS-321 : fixes in the URL rewriting system to support correct inline admin rewriting.
Modified:
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/utils/MakeURLRewritingContextBased.aj
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/utils/URLRewritingStream.java
labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/InterceptWebMethods.aj
Modified: labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/utils/MakeURLRewritingContextBased.aj
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/utils/MakeURLRewritingContextBased.aj?rev=757885&r1=757884&r2=757885&view=diff
==============================================================================
--- labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/utils/MakeURLRewritingContextBased.aj (original)
+++ labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/utils/MakeURLRewritingContextBased.aj Tue Mar 24 16:31:23 2009
@@ -3,6 +3,8 @@
import org.apache.magma.basics.startup.CycleThreadLocal;
import org.apache.magma.website.Producer;
import org.apache.magma.website.HtmlProducer;
+
+import java.io.IOException;
import java.io.OutputStream;
import java.io.Writer;
import org.apache.magma.website.Head;
@@ -31,6 +33,21 @@
return;
}
}
+
+ after(Producer prod, Writer writer) : producing(prod) && args(writer) {
+ try {
+ writer.flush();
+ } catch (IOException e) {
+ }
+ }
+
+ after(Producer prod, OutputStream stream) : producing(prod) && args(stream) {
+ if (stream instanceof URLRewritingStream) return;
+ try {
+ stream.flush();
+ } catch (IOException e) {
+ }
+ }
after(Producer prod) : producing(prod) {
try {
Modified: labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/utils/URLRewritingStream.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/utils/URLRewritingStream.java?rev=757885&r1=757884&r2=757885&view=diff
==============================================================================
--- labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/utils/URLRewritingStream.java (original)
+++ labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/utils/URLRewritingStream.java Tue Mar 24 16:31:23 2009
@@ -216,7 +216,11 @@
}
public void popBaseUrl() {
- String pop = this.baseurlStack.pop();
+ this.baseurlStack.pop();
+ String pop = null;
+ if (this.baseurlStack.size() > 0) {
+ pop = this.baseurlStack.peek();
+ }
this.setBaseUrl(pop);
}
Modified: labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/InterceptWebMethods.aj
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/InterceptWebMethods.aj?rev=757885&r1=757884&r2=757885&view=diff
==============================================================================
--- labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/InterceptWebMethods.aj (original)
+++ labs/magma/trunk/website-administration-inline/src/main/java/org/apache/magma/website/admin/InterceptWebMethods.aj Tue Mar 24 16:31:23 2009
@@ -16,6 +16,7 @@
import org.apache.magma.website.Producer;
import org.apache.magma.website.producers.ParametrizableProducer;
import org.apache.magma.website.producers.ProducerParameters;
+import org.apache.magma.website.producers.ParametrizeHtmlProducer;
import org.aspectj.lang.reflect.MethodSignature;
public aspect InterceptWebMethods percflow(HandlerSetup.inRequest()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org