Author: tdraier
Date: Mon Sep 24 12:10:30 2007
New Revision: 18625
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18625&repname=
=3Djahia
Log:
restored 404 errors, handle special case for export engine (JAHIA-2338)
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ParamBean.j=
ava
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ProcessingC=
ontext.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/Param=
Bean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/params/ParamBean.java&rev=3D18625&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ParamBean.j=
ava (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ParamBean.j=
ava Mon Sep 24 12:10:30 2007
@@ -380,15 +380,11 @@
setSiteInfoFromSiteFound();
=
if (isContentPageLoadedWhileTryingToFindSiteByPageID() =3D=3D =
false) {
- try {
- if (isPageRequestedByID()) {
- setContentPageToPageWithID();
- } else if (isPageRequestedByKey()) {
- setContentPageToPageWithURLKey();
- } else {
- setContentPage(getSite().getHomeContentPage());
- }
- } catch (JahiaPageNotFoundException e) {
+ if (isPageRequestedByID()) {
+ setContentPageToPageWithID();
+ } else if (isPageRequestedByKey()) {
+ setContentPageToPageWithURLKey();
+ } else {
setContentPage(getSite().getHomeContentPage());
}
}
@@ -1217,7 +1213,7 @@
/**
* Used internally by authorization pipeline. Do not call this method =
from somewhere else (such as templates)
* =
- * @param theUser
+ * @param user
* JahiaUser
*/
public void setTheUser(final JahiaUser user) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/Proce=
ssingContext.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/params/ProcessingContext.java&rev=3D18625&r=
epname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ProcessingC=
ontext.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ProcessingC=
ontext.java Mon Sep 24 12:10:30 2007
@@ -101,6 +101,7 @@
import org.jahia.bin.Jahia;
import org.jahia.bin.JahiaInterface;
import org.jahia.content.ContentPageKey;
+import org.jahia.engines.importexport.ExportEngine;
import org.jahia.engines.login.Login_Engine;
import org.jahia.exceptions.*;
import org.jahia.pipelines.Pipeline;
@@ -123,8 +124,8 @@
import org.jahia.services.version.EntryLoadRequest;
import org.jahia.services.version.StateModificationContext;
import org.jahia.settings.SettingsBean;
-import org.jahia.utils.LanguageCodeConverters;
import org.jahia.taglibs.esi.JesiConst;
+import org.jahia.utils.LanguageCodeConverters;
=
import javax.servlet.http.HttpServletRequest;
import java.io.File;
@@ -337,11 +338,11 @@
* =
* @param jSettings
* the Jahia settings
- * @param startTime
+ * @param aStartTime
* the start time in milliseconds
- * @param site
+ * @param aSite
* @param user
- * @param contentPage
+ * @param aContentPage
* @throws JahiaSessionExpirationException
* when the user session expired
* @throws JahiaSiteNotFoundException
@@ -722,7 +723,7 @@
* set to false if the ProcessingContext should add ESI-specific marke=
rs, such as "/jesi/user_dklfjsljf/", to the generated urls. true
* by default.
* =
- * @param ignoreEsiParams
+ * @param ignoreEsiParamsFlag
*/
public void setIgnoreEsiParams(boolean ignoreEsiParamsFlag) {
this.ignoreEsiParams =3D ignoreEsiParamsFlag;
@@ -928,7 +929,7 @@
* The purpose of this method is to quickly test if the localeList is =
empty, and in that case to insert a "default" locale so that we
* never return an empty list.
* =
- * @param localeList
+ * @param locales
*/
protected void testLocaleList(List locales,
final boolean isMixLanguageActive) throws JahiaException {
@@ -1412,7 +1413,7 @@
String[] paramValues =3D new String[1];
paramValues[0] =3D st.nextToken();
getCustomParameters().put(token, paramValues);
- } else {
+ } else if (!ExportEngine.ENGINE_NAME.equals(getParamet=
er("engineName")) || st.hasMoreTokens()) {
getPageURLKeys().add(token);
}
}
@@ -1610,7 +1611,7 @@
=
/**
* =
- * @param serverName
+ * @param aServerName
* @return true if servername supplied is valid.
*/
private boolean isValidServerName(final String aServerName) {
@@ -3067,7 +3068,7 @@
/**
* Sets the current page's cache expiration date.
* =
- * @param cacheExpirationDate
+ * @param aCacheExpirationDate
* a date which is the expiration date at which the pag=
e cache will expire. If set to null or never set, the page cache
* will never expire on a basis of time (but may be flu=
sh upon content changes or other events).
*/
@@ -3078,7 +3079,7 @@
/**
* Sets the current page's cache expiration delay, starting from the c=
urrent locale time.
* =
- * @param delayFromNow
+ * @param aDelayFromNow
* an long value specifying the delay in milliseconds f=
rom now for the expiration of the current page's cache.
*/
final public void setCacheExpirationDelay(long aDelayFromNow) {
@@ -3542,7 +3543,7 @@
/**
* Used internally by authorization pipeline. Do not call this method =
from somewhere else (such as templates)
* =
- * @param theUser
+ * @param aUser
* JahiaUser
*/
public void setTheUser(final JahiaUser aUser) {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
