shuber 2004/11/11 13:58:43 CET
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/java/org/jahia/data/events JahiaEventListener.java
JahiaEventListenerInterface.java
src/java/org/jahia/engines/updatecontainer
UpdateContainer_Engine.java
src/java/org/jahia/services/events
JahiaEventGeneratorBaseService.java
JahiaEventGeneratorService.java
Log:
Patch by Benjamin Papez to add update container engine events.
Revision Changes Path
1.6.4.1 +3 -0
jahia/src/java/org/jahia/data/events/JahiaEventListener.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/data/events/JahiaEventListener.java.diff?r1=1.6&r2=1.6.4.1&f=h
1.6.4.1 +3 -0
jahia/src/java/org/jahia/data/events/JahiaEventListenerInterface.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/data/events/JahiaEventListenerInterface.java.diff?r1=1.6&r2=1.6.4.1&f=h
1.62.4.3 +16 -2
jahia/src/java/org/jahia/engines/updatecontainer/UpdateContainer_Engine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/engines/updatecontainer/UpdateContainer_Engine.java.diff?r1=1.62.4.2&r2=1.62.4.3&f=h
1.8.4.1 +11 -1
jahia/src/java/org/jahia/services/events/JahiaEventGeneratorBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/events/JahiaEventGeneratorBaseService.java.diff?r1=1.8&r2=1.8.4.1&f=h
1.7.4.1 +6 -0
jahia/src/java/org/jahia/services/events/JahiaEventGeneratorService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/events/JahiaEventGeneratorService.java.diff?r1=1.7&r2=1.7.4.1&f=h
Index: JahiaEventListener.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/data/events/Attic/JahiaEventListener.java,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -u -r1.6 -r1.6.4.1
--- JahiaEventListener.java 12 Sep 2003 14:50:40 -0000 1.6
+++ JahiaEventListener.java 11 Nov 2004 12:58:42 -0000 1.6.4.1
@@ -44,6 +44,9 @@
public void addContainerEngineBeforeSave( JahiaEvent je ) { return; }
public void addContainerEngineAfterInit( JahiaEvent je ) { return; }
+ public void updateContainerEngineBeforeSave( JahiaEvent je ) { return; }
+ public void updateContainerEngineAfterInit( JahiaEvent je ) { return; }
+
public void containerAdded( JahiaEvent je ) { return; }
public void containerUpdated( JahiaEvent je ) { return; }
public void containerDeleted( JahiaEvent je ) { return; }
Index: JahiaEventListenerInterface.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/data/events/Attic/JahiaEventListenerInterface.java,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -u -r1.6 -r1.6.4.1
--- JahiaEventListenerInterface.java 12 Sep 2003 14:50:40 -0000 1.6
+++ JahiaEventListenerInterface.java 11 Nov 2004 12:58:42 -0000 1.6.4.1
@@ -44,6 +44,9 @@
public void addContainerEngineBeforeSave( JahiaEvent je );
public void addContainerEngineAfterInit( JahiaEvent je );
+ public void updateContainerEngineBeforeSave( JahiaEvent je );
+ public void updateContainerEngineAfterInit( JahiaEvent je );
+
public void containerAdded( JahiaEvent je );
public void containerUpdated( JahiaEvent je );
public void containerDeleted( JahiaEvent je );
Index: UpdateContainer_Engine.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/engines/updatecontainer/Attic/UpdateContainer_Engine.java,v
retrieving revision 1.62.4.2
retrieving revision 1.62.4.3
diff -u -r1.62.4.2 -r1.62.4.3
--- UpdateContainer_Engine.java 6 Aug 2004 17:59:40 -0000 1.62.4.2
+++ UpdateContainer_Engine.java 11 Nov 2004 12:58:43 -0000 1.62.4.3
@@ -1,4 +1,4 @@
-// $Id: UpdateContainer_Engine.java,v 1.62.4.2 2004/08/06 17:59:40 shuber
Exp $
+// $Id: UpdateContainer_Engine.java,v 1.62.4.3 2004/11/11 12:58:43 shuber
Exp $
//
//
// ____.
@@ -181,6 +181,13 @@
// #endif
flushPageCacheThatDisplayContainer (jParams,
theContainer);
+ // fire event
+ JahiaEvent theEvent = new JahiaEvent (this, jParams,
+ theContainer);
+ ServicesRegistry.getInstance ().getJahiaEventService ()
+ .fireUpdateContainerEngineAfterInit (theEvent);
+ // end fire event
+
if (!theScreen.equals ("cancel")) {
processLastScreen (jParams, engineMap);
}
@@ -420,6 +427,13 @@
// #endif
mode = JahiaEngine.SAVE_MODE;
+
+ // fire event
+ JahiaEvent theEvent = new JahiaEvent (this, jParams,
theContainer);
+ ServicesRegistry.getInstance ().getJahiaEventService ()
+ .fireUpdateContainerEngineBeforeSave (theEvent);
+ // end fire event
+
// save the container info
EntryLoadRequest loadVersion = EntryLoadRequest.CURRENT;
@@ -510,7 +524,7 @@
flushPageCacheThatDisplayContainer (jParams, theContainer);
// fire event
- JahiaEvent theEvent = new JahiaEvent (this, jParams,
theContainer);
+ theEvent = new JahiaEvent (this, jParams, theContainer);
ServicesRegistry.getInstance ().getJahiaEventService ().
fireUpdateContainer (theEvent);
// flag for subEngine: means that is a call from
updateContainer, reset the flag
Index: JahiaEventGeneratorBaseService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/events/Attic/JahiaEventGeneratorBaseService.java,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -u -r1.8 -r1.8.4.1
--- JahiaEventGeneratorBaseService.java 5 Nov 2003 16:39:59 -0000
1.8
+++ JahiaEventGeneratorBaseService.java 11 Nov 2004 12:58:43 -0000
1.8.4.1
@@ -95,6 +95,16 @@
JahiaListenersRegistry.getInstance ().wakeupListeners
("containerAdded", theEvent);
}
+ public void fireUpdateContainerEngineBeforeSave (JahiaEvent theEvent)
throws JahiaException {
+ JahiaListenersRegistry.getInstance ().wakeupListeners
("updateContainerEngineBeforeSave",
+ theEvent);
+ }
+
+ public void fireUpdateContainerEngineAfterInit (JahiaEvent theEvent)
throws JahiaException {
+ JahiaListenersRegistry.getInstance ().wakeupListeners
("updateContainerEngineAfterInit",
+ theEvent);
+ }
+
public void fireUpdateContainer (JahiaEvent theEvent) throws
JahiaException {
JahiaListenersRegistry.getInstance ().wakeupListeners
("containerUpdated", theEvent);
}
@@ -142,4 +152,4 @@
JahiaListenersRegistry.getInstance ().wakeupListeners
("templateUpdated", theEvent);
}
-}
\ No newline at end of file
+}
Index: JahiaEventGeneratorService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/events/Attic/JahiaEventGeneratorService.java,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -u -r1.7 -r1.7.4.1
--- JahiaEventGeneratorService.java 5 Nov 2003 16:39:59 -0000 1.7
+++ JahiaEventGeneratorService.java 11 Nov 2004 12:58:43 -0000 1.7.4.1
@@ -52,6 +52,12 @@
public abstract void fireAddContainer (JahiaEvent theEvent) throws
JahiaException;
+ public abstract void fireUpdateContainerEngineBeforeSave (JahiaEvent
theEvent)
+ throws JahiaException;
+
+ public abstract void fireUpdateContainerEngineAfterInit (JahiaEvent
theEvent)
+ throws JahiaException;
+
public abstract void fireUpdateContainer (JahiaEvent theEvent) throws
JahiaException;
public abstract void fireDeleteContainer (JahiaEvent theEvent) throws
JahiaException;
