Author: cmailleux
Date: Mon Jul 9 12:11:03 2007
New Revision: 17921
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17921&repname=
=3Djahia
Log:
Try to send a 404 as quick as possible and avoir big trace in log for 404
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/Jahia.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/JahiaAction.ja=
va
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/bin/Jahia.ja=
va
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/bin/Jahia.java&rev=3D17921&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/bin/Jahia.java (or=
iginal)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/Jahia.java Mon=
Jul 9 12:11:03 2007
@@ -953,7 +953,7 @@
} catch (JahiaPageNotFoundException ex) {
// PAGE NOT FOUND EXCEPTION
logger.debug(ex.getJahiaErrorMsg(), ex);
- logger.error(ex.getJahiaErrorMsg());
+// logger.error(ex.getJahiaErrorMsg());
String requestURI =3D request.getRequestURI();
JahiaSite site =3D (JahiaSite) request.getSession().getAttribu=
te("org.jahia.services.sites.jahiasite");
if (site !=3D null && requestURI.indexOf("/op/edit") > 0) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/JahiaAct=
ion.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/bin/JahiaAction.java&rev=3D17921&repname=3D=
jahia
=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/bin/JahiaAction.ja=
va (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/JahiaAction.ja=
va Mon Jul 9 12:11:03 2007
@@ -74,7 +74,7 @@
} catch (JahiaPageNotFoundException ex) {
// PAGE NOT FOUND EXCEPTION
logger.debug(ex.getJahiaErrorMsg(), ex);
- logger.error(ex.getJahiaErrorMsg());
+// logger.error(ex.getJahiaErrorMsg());
String requestURI =3D request.getRequestURI();
JahiaSite site =3D (JahiaSite) request.getSession().getAttribu=
te("org.jahia.services.sites.jahiasite");
if (site !=3D null && requestURI.indexOf("/op/edit") > 0) {
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=3D17921&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 Jul 9 12:11:03 2007
@@ -278,7 +278,7 @@
final JahiaSite site,
final JahiaUser user,
final ContentPage contentPage)
- throws JahiaPageNotFoundException, JahiaSessionExpirationExcep=
tion,
+ throws JahiaSessionExpirationException,
JahiaSiteNotFoundException, JahiaException {
=
this.context =3D context;
@@ -344,6 +344,7 @@
if (contentPage !=3D null) {
thePage =3D contentPage.getPage(this.getEntryLoadRequest(),
this.getOperationMode(), this.ge=
tUser());
+ if(getPage()=3D=3Dnull) throw new JahiaPageNotFoundException(c=
ontentPage.getPageID());
}
}
=
@@ -361,8 +362,7 @@
final SettingsBean jSettings,
final long startTime,
final int httpMethod)
- throws JahiaPageNotFoundException,
- JahiaSessionExpirationException,
+ throws JahiaSessionExpirationException,
JahiaSiteNotFoundException,
JahiaException {
this(request, response, context, jSettings, startTime, httpMethod,=
null);
@@ -388,8 +388,7 @@
final long startTime,
final int httpMethod,
final String extraParams)
- throws JahiaPageNotFoundException,
- JahiaSessionExpirationException,
+ throws JahiaSessionExpirationException,
JahiaSiteNotFoundException,
JahiaException {
try {
@@ -522,7 +521,9 @@
resolveCacheStatus();
=
processActivationAction();
-
+ if(contentPage!=3Dnull) {
+ if(getPage()=3D=3Dnull) throw new JahiaPageNotFoundException(c=
ontentPage.getPageID());
+ }
//////////////////////////////////////////////////////////////=
/////////////////////////
// FIXME -Fulco-
//
@@ -1965,8 +1966,36 @@
}
theUrl.append(strutsAction);
=
+ theUrl.append(getSiteAndModeAndPageAsURLParams("?"));
+ String paramSep =3D "&";
+ String paramValue;
+ final Enumeration propertyNames =3D extraJahiaParams.propertyNames=
();
+ while (propertyNames.hasMoreElements()) {
+ final String propertyName =3D (String) propertyNames.nextEleme=
nt();
+ final String propertyValue =3D extraJahiaParams.getProperty(pr=
opertyName);
+ paramValue =3D condAppendURL(propertyName, propertyValue);
+ if (paramValue !=3D null && !paramValue.trim().equals("")) {
+ theUrl.append(paramSep);
+ theUrl.append(paramValue);
+ paramSep =3D "&";
+ }
+ }
+
+ appendParams(theUrl, params);
+
+ appendAnchor(theUrl);
+
+ this.setUseQueryStringParameterUrl(false);
+
+ return encodeURL(theUrl.toString());
+ }
+
+ public String getSiteAndModeAndPageAsURLParams(String paramSepFirst) {
+ boolean old =3D useQueryStringParameterUrl;
+ useQueryStringParameterUrl =3D true;
+ StringBuffer theUrl =3D new StringBuffer();
String paramValue =3D getSiteURLPart();
- String paramSep =3D "?";
+ String paramSep =3D paramSepFirst;
if (paramValue !=3D null && !paramValue.trim().equals("")) {
theUrl.append(paramSep);
theUrl.append(paramValue);
@@ -1986,25 +2015,8 @@
paramSep =3D "&";
}
}
- final Enumeration propertyNames =3D extraJahiaParams.propertyNames=
();
- while (propertyNames.hasMoreElements()) {
- final String propertyName =3D (String) propertyNames.nextEleme=
nt();
- final String propertyValue =3D extraJahiaParams.getProperty(pr=
opertyName);
- paramValue =3D condAppendURL(propertyName, propertyValue);
- if (paramValue !=3D null && !paramValue.trim().equals("")) {
- theUrl.append(paramSep);
- theUrl.append(paramValue);
- paramSep =3D "&";
- }
- }
-
- appendParams(theUrl, params);
-
- appendAnchor(theUrl);
-
- this.setUseQueryStringParameterUrl(false);
-
- return encodeURL(theUrl.toString());
+ useQueryStringParameterUrl=3Dold;
+ return theUrl.toString();
}
=
// @author Khue Nguyen
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=3D17921&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 Jul 9 12:11:03 2007
@@ -347,7 +347,7 @@
final JahiaSite site,
final JahiaUser user,
final ContentPage contentPage)
- throws JahiaPageNotFoundException, JahiaSessionExpirationExcep=
tion,
+ throws JahiaSessionExpirationException,
JahiaSiteNotFoundException, JahiaException {
this(jSettings, startTime, site, user, contentPage, new EntryLoadR=
equest(EntryLoadRequest.STAGED));
}
@@ -358,7 +358,7 @@
final JahiaUser user,
final ContentPage contentPage,
final EntryLoadRequest loadRequest)
- throws JahiaPageNotFoundException, JahiaSessionExpirationExcep=
tion,
+ throws JahiaSessionExpirationException,
JahiaSiteNotFoundException, JahiaException {
Jahia.setThreadParamBean(this);
// default vars
@@ -384,6 +384,7 @@
setThePage(contentPage.getPage(this.getEntryLoadRequest(),
this.getOperationMode(), this.getUser()));
setContentPage(contentPage);
+ //if(getPage()=3D=3Dnull) throw new JahiaPageNotFoundException=
(contentPage.getPageID());
}
}
=
@@ -3182,7 +3183,7 @@
if (getContentPage().getJahiaID() !=3D this.getSiteID()) {
setContentPage(this.getSite().getHomeContentPage());
}
-
+ if(getPage()=3D=3Dnull) throw new JahiaPageNotFoundException(pageI=
D);
// last requested page
Integer lrpID =3D (Integer) getSessionState().getAttribute(
SESSION_LAST_REQUESTED_PAGE_ID);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
