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 2008/02/27 01:44:56 UTC
svn commit: r631442 - in
/lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms:
cocoon/transformation/ProxyTransformer.java linking/OutgoingLinkRewriter.java
Author: andreas
Date: Tue Feb 26 16:44:54 2008
New Revision: 631442
URL: http://svn.apache.org/viewvc?rev=631442&view=rev
Log:
Use webapp URL instead of request URL in OutgoingLinkRewriter.
Modified:
lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/ProxyTransformer.java
lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/linking/OutgoingLinkRewriter.java
Modified: lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/ProxyTransformer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/ProxyTransformer.java?rev=631442&r1=631441&r2=631442&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/ProxyTransformer.java (original)
+++ lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/ProxyTransformer.java Tue Feb 26 16:44:54 2008
@@ -31,6 +31,7 @@
import org.apache.lenya.cms.linking.OutgoingLinkRewriter;
import org.apache.lenya.cms.repository.RepositoryUtil;
import org.apache.lenya.cms.repository.Session;
+import org.apache.lenya.util.ServletHelper;
import org.xml.sax.SAXException;
/**
@@ -65,18 +66,19 @@
private boolean relativeUrls = false;
private LinkRewriter rewriter;
- public void setup(SourceResolver _resolver, Map _objectModel, String _source,
- Parameters _parameters) throws ProcessingException, SAXException, IOException {
- super.setup(_resolver, _objectModel, _source, _parameters);
- Request _request = ObjectModelHelper.getRequest(_objectModel);
+ public void setup(SourceResolver resolver, Map objectModel, String source,
+ Parameters parameters) throws ProcessingException, SAXException, IOException {
+ super.setup(resolver, objectModel, source, parameters);
+ Request request = ObjectModelHelper.getRequest(objectModel);
try {
- if (_parameters.isParameter(PARAMETER_URLS)) {
- setUrlType(_parameters.getParameter(PARAMETER_URLS));
+ if (parameters.isParameter(PARAMETER_URLS)) {
+ setUrlType(parameters.getParameter(PARAMETER_URLS));
}
- Session session = RepositoryUtil.getSession(this.manager, _request);
- this.rewriter = new OutgoingLinkRewriter(this.manager, session, _request
- .getRequestURI(), request.isSecure(), false, this.relativeUrls);
+ Session session = RepositoryUtil.getSession(this.manager, request);
+ String webappUrl = ServletHelper.getWebappURI(request);
+ this.rewriter = new OutgoingLinkRewriter(this.manager, session, webappUrl,
+ request.isSecure(), false, this.relativeUrls);
} catch (final Exception e) {
throw new RuntimeException(e);
}
Modified: lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/linking/OutgoingLinkRewriter.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/linking/OutgoingLinkRewriter.java?rev=631442&r1=631441&r2=631442&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/linking/OutgoingLinkRewriter.java (original)
+++ lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/linking/OutgoingLinkRewriter.java Tue Feb 26 16:44:54 2008
@@ -65,7 +65,8 @@
/**
* @param manager The service manager to use.
* @param session The current session.
- * @param requestUrl The request URL where the links should be rewritten.
+ * @param requestUrl The requested web application URL (without servlet context path) where
+ * the links should be rewritten.
* @param ssl If the current page is SSL-encrypted.
* @param considerSslPolicies If the SSL protection of policies should be considered when
* resolving the corresponding proxy. Setting this to <code>true</code> leads to a
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org