Author: cmailleux
Date: Mon Jul 9 12:10:40 2007
New Revision: 17919
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17919&repname=
=3Djahia
Log:
Avoid checking of container declaration in live mode, to improve performanc=
e in live browsing
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/containers/Ja=
hiaContainerSet.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/JahiaF=
ieldSet.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/declaratio=
ns/DeclareContainerListTag.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/contain=
ers/JahiaContainerSet.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/data/containers/JahiaContainerSet.java&rev=
=3D17919&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/data/containers/Ja=
hiaContainerSet.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/containers/Ja=
hiaContainerSet.java Mon Jul 9 12:10:40 2007
@@ -36,6 +36,8 @@
import org.jahia.services.pages.ContentPage;
import org.jahia.services.version.EntryLoadRequest;
import org.jahia.utils.JahiaTools;
+import org.jahia.bin.Jahia;
+import org.jahia.params.ProcessingContext;
import org.springframework.context.ApplicationContext;
=
import java.util.*;
@@ -249,6 +251,8 @@
boolean indexableField,
boolean readOnly)
throws JahiaException {
+ if(Jahia.getThreadParamBean().getOperationMode().equals(Processing=
Context.NORMAL))
+ return;
/** todo ensure that the data provided by the user has no special =
chars in it */
// we check if a field with the same name was not already declared=
, of if the field has no
// empty name or title
@@ -587,11 +591,13 @@
int containerListType,
Properties containerDefProperties)
throws JahiaException {
+ if(Jahia.getThreadParamBean().getOperationMode().equals(Processing=
Context.NORMAL))
+ return;
=
/** @todo ensure that the data provided by the user has no special=
chars in it */
// check if a container has already been declared with the same na=
me
// checks if container name and title are not empty
- // checks if a field has not the same name =
+ // checks if a field has not the same name
if (checkDeclared(containerName) || containerName.length() =3D=3D 0
|| containerTitle.length() =3D=3D 0
|| jData.fields().checkDeclared(containerName)
@@ -642,7 +648,7 @@
.toString(windowOffset));
=
}
- =
+
// added for Apache Validator Support
if (validatorKey !=3D null && validatorKey.length() >
0) {
ctnDefProperties.setProperty("validatorKey",
validatorKey);
@@ -763,7 +769,7 @@
aDef =3D
ctnDefRegistry.getDefinition(aDef.getID());
aDef.composeStructure(containerFields,
pageDefID);
ctnDefRegistry.setDefinition(aDef);
- } =
+ }
=
/*
* Hashtable subDefs =3D new
Hashtable();
@@ -808,12 +814,12 @@
}
}
}
- }
+ } =
=
/**
* enables a jahia template programmer to declare an edit view
definition=
to
* use for a given container list.
- * =
+ *
* @param containerName
* the container name
* @param editView ,
@@ -993,6 +999,8 @@
*
*/
public boolean checkDeclared(String containerName) {
+ if(Jahia.getThreadParamBean().getOperationMode().equals(Processing=
Context.NORMAL) && ! declaredContainers.contains(containerName))
+ declaredContainers.add(containerName);
return declaredContainers.contains(containerName);
=
} // end checkDeclared
@@ -1366,7 +1374,7 @@
cachedContainersFromContainerLists=3D new HashMap();
cachedContainerListsFromContainers=3D new HashMap();
}
- =
+
EntryLoadRequest ctnLoadRequest =3D jData.getProcessingCon=
text().
getEntryLoadRequest();
if (ctnLoadRequest.isVersioned()) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/=
JahiaFieldSet.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/data/fields/JahiaFieldSet.java&rev=3D17919&=
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/data/fields/JahiaF=
ieldSet.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/JahiaF=
ieldSet.java Mon Jul 9 12:10:40 2007
@@ -29,6 +29,8 @@
import org.jahia.services.pages.JahiaPage;
import org.jahia.services.version.EntryLoadRequest;
import org.jahia.utils.JahiaTools;
+import org.jahia.bin.Jahia;
+import org.jahia.params.ProcessingContext;
=
import java.util.*;
=
@@ -128,6 +130,8 @@
public void declareField(String fieldName, String fieldTitle, int fiel=
dType, String defaultValue,
String[] aliasNames, float scoreBoost, boolea=
n indexableField)
throws JahiaException {
+ if(Jahia.getThreadParamBean().getOperationMode().equals(Processing=
Context.NORMAL))
+ return;
synchronized (JahiaFieldSet.class) {
=
logger.debug("fieldName=3D" + fieldName + ", defValue=3D" + de=
faultValue);
@@ -397,6 +401,8 @@
* EV 29.12.2000
*/
public boolean checkDeclared(String fieldName) {
+ if(Jahia.getThreadParamBean().getOperationMode().equals(Processing=
Context.NORMAL) && ! declaredFields.contains(fieldName))
+ declaredFields.add(fieldName);
return declaredFields.contains(fieldName);
} // end checkDeclared
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/decl=
arations/DeclareContainerListTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/taglibs/declarations/DeclareContainerListTa=
g.java&rev=3D17919&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/taglibs/declaratio=
ns/DeclareContainerListTag.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/declaratio=
ns/DeclareContainerListTag.java Mon Jul 9 12:10:40 2007
@@ -25,6 +25,7 @@
import org.jahia.resourcebundle.ResourceBundleMarker;
import org.jahia.spring.aop.interceptor.SilentJamonPerformanceMonitorInter=
ceptor;
import org.jahia.utils.JahiaTools;
+import org.jahia.params.ProcessingContext;
=
import javax.servlet.ServletRequest;
import javax.servlet.jsp.JspException;
@@ -261,7 +262,8 @@
=
ServletRequest request =3D pageContext.getRequest();
jData =3D (JahiaData) request.getAttribute("org.jahia.data.JahiaDa=
ta");
-
+ if(jData.getProcessingContext().getOperationMode().equals(Processi=
ngContext.NORMAL))
+ return SKIP_BODY;
// but we must also test the case where this containerList is encl=
osed
// in a parent containerList in which case we just trickle down the
// state of the parent list...
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
