tdraier 2005/02/23 13:21:40 CET
Modified files:
core/src/java/org/apache/slide/common JahiaDomain.java
core/src/java/org/jahia/services/webdav
JahiaMacroListener.java
core/src/webapp/WEB-INF/etc/slide domain.xml
Log:
fixed copy listener on rename - keep display name only if it was modified
Revision Changes Path
1.5 +17 -5
jahia/core/src/java/org/apache/slide/common/JahiaDomain.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/apache/slide/common/JahiaDomain.java.diff?r1=1.4&r2=1.5&f=h
1.3 +4 -8
jahia/core/src/java/org/jahia/services/webdav/JahiaMacroListener.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/webdav/JahiaMacroListener.java.diff?r1=1.2&r2=1.3&f=h
1.6 +1 -0 jahia/core/src/webapp/WEB-INF/etc/slide/domain.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/slide/domain.xml.diff?r1=1.5&r2=1.6&f=h
Index: JahiaDomain.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/apache/slide/common/JahiaDomain.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JahiaDomain.java 21 Feb 2005 17:49:14 -0000 1.4
+++ JahiaDomain.java 23 Feb 2005 12:21:39 -0000 1.5
@@ -17,10 +17,10 @@
* Time: 17:23:47
* <p/>
* $Author: tdraier $
- * $Date: 2005/02/21 17:49:14 $
- * $Id: JahiaDomain.java,v 1.4 2005/02/21 17:49:14 tdraier Exp $
+ * $Date: 2005/02/23 12:21:39 $
+ * $Id: JahiaDomain.java,v 1.5 2005/02/23 12:21:39 tdraier Exp $
* $RCSfile: JahiaDomain.java,v $
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
* $Source:
/home/cvs/repository/jahia/core/src/java/org/apache/slide/common/JahiaDomain.java,v
$
* $State: Exp $
*/
@@ -52,8 +52,20 @@
try {
Domain.init(configuration);
} catch (DomainInitializationFailedError e) {
+ Enumeration extractorConfigurations =
configuration.getConfigurations("extractors");
+ if ( extractorConfigurations.hasMoreElements() ) {
+ Configuration extractorConfiguration =
(Configuration)extractorConfigurations.nextElement();
+
ExtractorManager.getInstance().configure(extractorConfiguration);
+ }
+
+ Enumeration eventConfigurations =
configuration.getConfigurations("events");
+ if ( eventConfigurations.hasMoreElements() ) {
+ Configuration eventConfiguration =
(Configuration)eventConfigurations.nextElement();
+ EventDispatcher.getInstance().configure(eventConfiguration);
+ }
+ Domain.setInitialized(true);
+
}
-// Domain.setInitialized(true);
}
/**
Index: JahiaMacroListener.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/webdav/JahiaMacroListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JahiaMacroListener.java 17 Sep 2004 10:14:51 -0000 1.2
+++ JahiaMacroListener.java 23 Feb 2005 12:21:39 -0000 1.3
@@ -6,15 +6,10 @@
import org.apache.slide.content.*;
import org.apache.slide.structure.Structure;
import org.apache.slide.structure.StructureImpl;
-import org.apache.slide.structure.ObjectNotFoundException;
-import org.apache.slide.structure.LinkedObjectNotFoundException;
import org.apache.slide.security.Security;
import org.apache.slide.security.ACLSecurityImpl;
-import org.apache.slide.security.AccessDeniedException;
import org.apache.slide.lock.Lock;
import org.apache.slide.lock.LockImpl;
-import org.apache.slide.lock.ObjectLockedException;
-import org.apache.slide.common.ServiceAccessException;
import org.apache.log4j.Logger;
/**
@@ -24,10 +19,10 @@
* Time: 16:30:34
* <p/>
* $Author: tdraier $
- * $Date: 2004/09/17 10:14:51 $
- * $Id: JahiaMacroListener.java,v 1.2 2004/09/17 10:14:51 tdraier Exp $
+ * $Date: 2005/02/23 12:21:39 $
+ * $Id: JahiaMacroListener.java,v 1.3 2005/02/23 12:21:39 tdraier Exp $
* $RCSfile: JahiaMacroListener.java,v $
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
* $Source:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/webdav/JahiaMacroListener.java,v
$
* $State: Exp $
*/
@@ -53,6 +48,7 @@
if (getFilename(event.getSourceURI()).equals(srcNrd.getName())) {
if (!displayName.equals(destNrd.getName())) {
destNrd.setName(displayName);
+ helper.store(event.getToken(), event.getTargetURI(),
destNrd, null);
}
}
} catch (Exception e) {
Index: domain.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/slide/domain.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- domain.xml 16 Feb 2005 18:52:56 -0000 1.5
+++ domain.xml 23 Feb 2005 12:21:40 -0000 1.6
@@ -11,6 +11,7 @@
<events>
<event classname="org.apache.slide.event.MacroEvent" method="move"
enable="true"></event>
+ <event classname="org.apache.slide.event.MacroEvent" method="copy"
enable="true"></event>
<event classname="org.apache.slide.event.ContentEvent"
method="create" enable="true"></event>
<event classname="org.apache.slide.event.ContentEvent"
method="remove" enable="true"></event>
<event classname="org.apache.slide.webdav.event.WebdavEvent"
method="move" enable="true"></event>
