You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/12/11 23:38:26 UTC
svn commit: r603395 -
/lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/linking/LinkConverter.java
Author: andreas
Date: Tue Dec 11 14:38:26 2007
New Revision: 603395
URL: http://svn.apache.org/viewvc?rev=603395&view=rev
Log:
Consider proxy URLs in LinkConverter.
Modified:
lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/linking/LinkConverter.java
Modified: lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/linking/LinkConverter.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/linking/LinkConverter.java?rev=603395&r1=603394&r2=603395&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/linking/LinkConverter.java (original)
+++ lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/linking/LinkConverter.java Tue Dec 11 14:38:26 2007
@@ -71,10 +71,7 @@
boolean linksRewritten = false;
try {
- String prefix = "";
- if (useContextPath) {
- prefix = getContextPath();
- }
+ String prefix = useContextPath ? getContextPath() : "";
ResourceType type = examinedDocument.getResourceType();
String[] xPaths = type.getLinkAttributeXPaths();
@@ -85,7 +82,8 @@
"Convert links: No XPaths for resource type [" + type.getName() + "]");
}
} else {
- LinkRewriter rewriter = new UrlToUuidRewriter(examinedDocument.area());
+ LinkRewriter incomingRewriter = new IncomingLinkRewriter(examinedDocument.getPublication());
+ LinkRewriter urlToUuidRewriter = new UrlToUuidRewriter(examinedDocument.area());
org.w3c.dom.Document xml = DocumentHelper.readDocument(examinedDocument
.getInputStream());
@@ -108,8 +106,15 @@
getLogger().debug("Convert links: Check URL [" + url + "]");
}
final String originalUrl = url.startsWith(prefix) ? url.substring(prefix.length()) : url;
- if (rewriter.matches(originalUrl)) {
- String rewrittenUrl = rewriter.rewrite(originalUrl);
+ final String webappUrl;
+ if (incomingRewriter.matches(originalUrl)) {
+ webappUrl = incomingRewriter.rewrite(originalUrl);
+ } else {
+ webappUrl = originalUrl;
+ }
+
+ if (urlToUuidRewriter.matches(webappUrl)) {
+ String rewrittenUrl = urlToUuidRewriter.rewrite(webappUrl);
attribute.setValue(rewrittenUrl);
linksRewritten = true;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org