You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ru...@apache.org on 2013/01/03 12:02:32 UTC
svn commit: r1428275 -
/lenya/branches/BRANCH_2_1_X/src/impl/java/org/apache/lenya/cms/publication/DocumentImpl.java
Author: rudolf
Date: Thu Jan 3 11:02:32 2013
New Revision: 1428275
URL: http://svn.apache.org/viewvc?rev=1428275&view=rev
Log:
revert r1305170
Modified:
lenya/branches/BRANCH_2_1_X/src/impl/java/org/apache/lenya/cms/publication/DocumentImpl.java
Modified: lenya/branches/BRANCH_2_1_X/src/impl/java/org/apache/lenya/cms/publication/DocumentImpl.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/impl/java/org/apache/lenya/cms/publication/DocumentImpl.java?rev=1428275&r1=1428274&r2=1428275&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/impl/java/org/apache/lenya/cms/publication/DocumentImpl.java (original)
+++ lenya/branches/BRANCH_2_1_X/src/impl/java/org/apache/lenya/cms/publication/DocumentImpl.java Thu Jan 3 11:02:32 2013
@@ -389,14 +389,9 @@ public class DocumentImpl extends Abstra
public String getCanonicalDocumentURL() {
try {
DocumentBuilder builder = getPublication().getDocumentBuilder();
- final String webappUrl = builder.buildCanonicalUrl(getFactory(), getLocator());
- final String prefix = "/" + getPublication().getId() + "/" + getArea();
- String url = webappUrl.substring(prefix.length());
- final String sourceExt = getSourceExtension();
- if (!sourceExt.equals("xml") && !sourceExt.equals("")) {
- url = url + "." + sourceExt;
- }
- return url;
+ String webappUrl = builder.buildCanonicalUrl(getFactory(), getLocator());
+ String prefix = "/" + getPublication().getId() + "/" + getArea();
+ return webappUrl.substring(prefix.length());
} catch (Exception e) {
throw new RuntimeException(e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org