Author: cmailleux
Date: Thu Jul 12 19:05:26 2007
New Revision: 17987
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17987&repname=
=3Djahia
Log:
Port [17919] Avoid check of declaration in live
Modified:
trunk/core/src/java/org/jahia/data/containers/JahiaContainerSet.java
trunk/core/src/java/org/jahia/data/fields/JahiaFieldSet.java
trunk/core/src/java/org/jahia/taglibs/declarations/DeclareContainerList=
Tag.java
Modified: trunk/core/src/java/org/jahia/data/containers/JahiaContainerSet.j=
ava
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/data/containers/JahiaContainerSet.java&rev=3D17987&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
--- trunk/core/src/java/org/jahia/data/containers/JahiaContainerSet.java (o=
riginal)
+++ trunk/core/src/java/org/jahia/data/containers/JahiaContainerSet.java Th=
u Jul 12 19:05:26 2007
@@ -40,6 +40,7 @@
import org.jahia.services.version.EntryLoadRequest;
import org.jahia.utils.JahiaTools;
import org.jahia.params.ProcessingContext;
+import org.jahia.bin.Jahia;
import org.springframework.context.ApplicationContext;
=
import java.util.*;
@@ -273,6 +274,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
@@ -616,7 +619,8 @@
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 spec=
ial chars in it */
// check if a container has already been declared with the same na=
me
if (checkDeclared(containerName)
@@ -970,6 +974,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
Modified: trunk/core/src/java/org/jahia/data/fields/JahiaFieldSet.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/data/fields/JahiaFieldSet.java&rev=3D17987&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
--- trunk/core/src/java/org/jahia/data/fields/JahiaFieldSet.java (original)
+++ trunk/core/src/java/org/jahia/data/fields/JahiaFieldSet.java Thu Jul 12=
19:05:26 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: trunk/core/src/java/org/jahia/taglibs/declarations/DeclareContain=
erListTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/taglibs/declarations/DeclareContainerListTag.java&rev=3D17987&repn=
ame=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
--- trunk/core/src/java/org/jahia/taglibs/declarations/DeclareContainerList=
Tag.java (original)
+++ trunk/core/src/java/org/jahia/taglibs/declarations/DeclareContainerList=
Tag.java Thu Jul 12 19:05:26 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
