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 2005/05/25 14:14:27 UTC
svn commit: r178423 - in /lenya/trunk/src:
java/org/apache/lenya/cms/publication/
java/org/apache/lenya/cms/publication/util/
java/org/apache/lenya/cms/usecase/ webapp/lenya/usecases/tab/
Author: andreas
Date: Wed May 25 05:14:26 2005
New Revision: 178423
URL: http://svn.apache.org/viewcvs?rev=178423&view=rev
Log:
removed info area prefix
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocument.java
lenya/trunk/src/java/org/apache/lenya/cms/publication/Document.java
lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java
lenya/trunk/src/java/org/apache/lenya/cms/publication/Publication.java
lenya/trunk/src/java/org/apache/lenya/cms/publication/PublicationImpl.java
lenya/trunk/src/java/org/apache/lenya/cms/publication/URLInformation.java
lenya/trunk/src/java/org/apache/lenya/cms/publication/util/DocumentLanguagesHelper.java
lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java
lenya/trunk/src/webapp/lenya/usecases/tab/head.jx
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocument.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocument.java?rev=178423&r1=178422&r2=178423&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocument.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocument.java Wed May 25 05:14:26 2005
@@ -228,14 +228,6 @@
}
/**
- * @see Document#getCompleteInfoURL()
- */
- public String getCompleteInfoURL() {
- return "/" + getPublication().getId() + "/" + Publication.INFO_AREA_PREFIX + getArea()
- + getCanonicalDocumentURL();
- }
-
- /**
* Sets the area.
* @param _area A string.
*/
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/Document.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/publication/Document.java?rev=178423&r1=178422&r2=178423&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/Document.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/Document.java Wed May 25 05:14:26 2005
@@ -77,13 +77,6 @@
String getCanonicalWebappURL();
/**
- * Returns the complete URL of this document in the info area:<br/>
- * /{publication-id}/info-{area}{document-id}{language-suffix}.{extension}
- * @return A string.
- */
- String getCompleteInfoURL();
-
- /**
* Returns the canonical document URL.
* @return A string.
*/
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java?rev=178423&r1=178422&r2=178423&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java Wed May 25 05:14:26 2005
@@ -225,7 +225,7 @@
public String getArea() {
if (this.area == null) {
URLInformation info = new URLInformation(this.webappUrl);
- this.area = info.getCompleteArea();
+ this.area = info.getArea();
}
return this.area;
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/Publication.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/publication/Publication.java?rev=178423&r1=178422&r2=178423&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/Publication.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/Publication.java Wed May 25 05:14:26 2005
@@ -75,10 +75,6 @@
*/
String DELETE_PATH = "delete";
/**
- * <code>INFO_AREA_PREFIX</code> The info area prefix
- */
- String INFO_AREA_PREFIX = "info-";
- /**
* <code>SEARCH_AREA_PREFIX</code> The search area prefix
*/
String SEARCH_AREA_PREFIX = "search-";
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/PublicationImpl.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/publication/PublicationImpl.java?rev=178423&r1=178422&r2=178423&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/PublicationImpl.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/PublicationImpl.java Wed May 25 05:14:26 2005
@@ -36,9 +36,7 @@
public class PublicationImpl extends AbstractLogEnabled implements Publication {
private static final String[] areas = { AUTHORING_AREA, STAGING_AREA, LIVE_AREA, ADMIN_AREA,
- ARCHIVE_AREA, TRASH_AREA, INFO_AREA_PREFIX + AUTHORING_AREA,
- INFO_AREA_PREFIX + STAGING_AREA, INFO_AREA_PREFIX + LIVE_AREA,
- INFO_AREA_PREFIX + ARCHIVE_AREA, INFO_AREA_PREFIX + TRASH_AREA };
+ ARCHIVE_AREA, TRASH_AREA };
private String id;
private File servletContext;
@@ -417,5 +415,4 @@
return getSourceURI() + "/" + CONTENT_PATH + "/" + area;
}
-
-}
+}
\ No newline at end of file
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/URLInformation.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/publication/URLInformation.java?rev=178423&r1=178422&r2=178423&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/URLInformation.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/URLInformation.java Wed May 25 05:14:26 2005
@@ -83,10 +83,7 @@
this.documentUrl = "";
}
- if (this.completeArea.startsWith(Publication.INFO_AREA_PREFIX)) {
- this.area = this.completeArea.substring(Publication.INFO_AREA_PREFIX.length());
- }
- else if (this.completeArea.startsWith(Publication.SEARCH_AREA_PREFIX)) {
+ if (this.completeArea.startsWith(Publication.SEARCH_AREA_PREFIX)) {
this.area = this.completeArea.substring(Publication.SEARCH_AREA_PREFIX.length());
}
else {
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/util/DocumentLanguagesHelper.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/publication/util/DocumentLanguagesHelper.java?rev=178423&r1=178422&r2=178423&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/util/DocumentLanguagesHelper.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/util/DocumentLanguagesHelper.java Wed May 25 05:14:26 2005
@@ -65,17 +65,6 @@
}
/**
- * Compute the info area URL for a given language and the parameters given in the contructor.
- * @param language the language
- * @return the url for the given language
- * @throws ProcessingException if the document for the given language could not be created.
- */
- public String getInfoUrl(String language) throws ProcessingException {
- Document doc = getDocument(language);
- return this.pageEnvelope.getContext() + doc.getCompleteInfoURL();
- }
-
- /**
* Create a document for a given language and the parameters given in the contructor.
* @param language the language
* @return the document with the given language
Modified: lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java?rev=178423&r1=178422&r2=178423&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java Wed May 25 05:14:26 2005
@@ -19,8 +19,6 @@
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentBuildException;
-import org.apache.lenya.cms.publication.Publication;
-import org.apache.lenya.cms.publication.URLInformation;
/**
* <p>
@@ -37,7 +35,6 @@
protected static final String DOCUMENT = "document";
protected static final String TARGET_DOCUMENT = "private.targetDocument";
- private String COMPLETE_AREA = "private.completeArea";
/**
* Ctor.
@@ -64,9 +61,6 @@
if (getDocumentIdentityMap().isDocument(url)) {
setParameter(DOCUMENT, getDocumentIdentityMap().getFromURL(url));
}
-
- URLInformation info = new URLInformation(url);
- setParameter(COMPLETE_AREA, info.getCompleteArea());
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -112,12 +106,8 @@
public String getTargetURL(boolean success) {
Document document = getTargetDocument(success);
String documentUrl = document.getCanonicalDocumentURL();
- String completeArea = getParameterAsString(COMPLETE_AREA);
- String documentArea = document.getArea();
- if (completeArea.startsWith(Publication.INFO_AREA_PREFIX)) {
- documentArea = Publication.INFO_AREA_PREFIX + documentArea;
- }
- String url = "/" + document.getPublication().getId() + "/" + documentArea + documentUrl;
+ String url = "/" + document.getPublication().getId() + "/" + document.getArea()
+ + documentUrl;
return url + getExitUsecaseQueryString();
}
Modified: lenya/trunk/src/webapp/lenya/usecases/tab/head.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/tab/head.jx?rev=178423&r1=178422&r2=178423&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/tab/head.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/tab/head.jx Wed May 25 05:14:26 2005
@@ -26,7 +26,7 @@
<page:head>
<jx:set var="pubId" value="${usecase.getParameter('document').getPublication().getId()}"/>
- <jx:set var="area" value="${usecase.getParameter('private.completeArea')}"/>
+ <jx:set var="area" value="${usecase.getParameter('document').getArea()}"/>
<jx:set var="language" value="${usecase.getParameter('document').getLanguage()}"/>
<jx:set var="incrementalLoading" value="${'false'}"/>
<script src="${request.contextPath}/${pubId}/${area}/info-sitetree/ua.js"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org