shuber 2005/02/15 15:31:09 CET
Modified files:
core/src/java/org/jahia/params ParamBean.java
core/src/java/org/jahia/services/webdav/listeners
CMSSlideContentListener.java
Log:
Ok directory creation should work properly now. All folder names are mapped
to FIRST language in site... Site language ranking changes will probably
corrupt the system for the moment, so please avoid.
Revision Changes Path
1.16 +4 -0 jahia/core/src/java/org/jahia/params/ParamBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/params/ParamBean.java.diff?r1=1.15&r2=1.16&f=h
1.11 +8 -15
jahia/core/src/java/org/jahia/services/webdav/listeners/CMSSlideContentListener.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/webdav/listeners/CMSSlideContentListener.java.diff?r1=1.10&r2=1.11&f=h
Index: ParamBean.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/params/ParamBean.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ParamBean.java 14 Feb 2005 11:59:43 -0000 1.15
+++ ParamBean.java 15 Feb 2005 14:31:08 -0000 1.16
@@ -733,6 +733,10 @@
}
}
+ public void setEntryLoadRequest(EntryLoadRequest entryLoadRequest) {
+ this.entryLoadRequest = entryLoadRequest;
+ }
+
public void setSubstituteEntryLoadRequest (EntryLoadRequest
entryLoadRequest) {
this.substituteEntryLoadRequest = entryLoadRequest;
Index: CMSSlideContentListener.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/webdav/listeners/CMSSlideContentListener.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CMSSlideContentListener.java 15 Feb 2005 13:36:53 -0000 1.10
+++ CMSSlideContentListener.java 15 Feb 2005 14:31:08 -0000 1.11
@@ -42,18 +42,11 @@
import org.jahia.urls.URI;
/**
- * Created by IntelliJ IDEA.
- * User: toto
- * Date: 2 nov. 2004
- * Time: 15:23:17
- * <p/>
- * $Author: shuber $
- * $Date: 2005/02/15 13:36:53 $
- * $Id: CMSSlideContentListener.java,v 1.10 2005/02/15 13:36:53 shuber Exp $
- * $RCSfile: CMSSlideContentListener.java,v $
- * $Revision: 1.10 $
- * $Source:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/webdav/listeners/CMSSlideContentListener.java,v
$
- * $State: Exp $
+ * A WebDAV listener that creates pages and containers for folder and files
+ * uploaded.
+ *
+ * @author Serge Huber
+ * @version 1.0
*/
public class CMSSlideContentListener implements ContentListener,
MacroListener,
WebdavListener {
@@ -113,7 +106,7 @@
System.currentTimeMillis(), site, user);
EntryLoadRequest loadRequest = new
EntryLoadRequest(EntryLoadRequest.STAGING_WORKFLOW_STATE, 0,
jParams.getLocales());
logger.debug("Using locales for site " + jParams.getLocales());
- jParams.setSubstituteEntryLoadRequest(loadRequest);
+ jParams.setEntryLoadRequest(loadRequest);
Jahia.setThreadParamBean(jParams);
JahiaContainersService jahiaContainersService = ServicesRegistry.
getInstance().getJahiaContainersService();
@@ -202,7 +195,7 @@
while (childEnum.hasMoreElements()) {
JahiaPage curJahiaPage = (JahiaPage) childEnum.nextElement();
logger.debug("Current page title=" +
curJahiaPage.getTitle());
- if (curJahiaPage.getTitle().equals(curPageTitle)) {
+ if ((curJahiaPage.getTitle() != null) &&
(curJahiaPage.getTitle().equals(curPageTitle))) {
curPage = curJahiaPage;
foundChild = true;
break;
@@ -492,7 +485,7 @@
System.currentTimeMillis(), site, user);
EntryLoadRequest loadRequest = new
EntryLoadRequest(EntryLoadRequest.STAGING_WORKFLOW_STATE, 0,
jParams.getLocales());
logger.debug("Using locales for site " + jParams.getLocales());
- jParams.setSubstituteEntryLoadRequest(loadRequest);
+ jParams.setEntryLoadRequest(loadRequest);
Jahia.setThreadParamBean(jParams);
JahiaContainersService jahiaContainersService = ServicesRegistry.
getInstance().getJahiaContainersService();
