shuber 2005/04/20 15:50:22 CEST
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/java/org/jahia/admin/categories ManageCategories.java
src/java/org/jahia/bin JahiaConfigurationWizard.java
src/java/org/jahia/content ContentObject.java
src/java/org/jahia/data/events JahiaEventListener.java
JahiaEventListenerInterface.java
src/java/org/jahia/services/events JSPEventListener.java
JahiaEventGeneratorBaseService.java
JahiaEventGeneratorService.java
src/java/org/jahia/services/pages ContentPage.java
Added files: (Branch: JAHIA-4-0-BRANCH)
src/java/org/jahia/content/events ContentActivationEvent.java
Log:
- Backported content activation event from 4.5
- Modified MySQL script to use INTEGER instead of MEDIUMINT(9) numbers
- Fixed problem in ConfigurationWizard that assumed that all DB script lines
start with "create table" to allow use of ALTER TABLE statements.
Revision Changes Path
1.8.4.2 +25 -23
jahia/src/java/org/jahia/admin/categories/ManageCategories.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/admin/categories/ManageCategories.java.diff?r1=1.8.4.1&r2=1.8.4.2&f=h
1.55.2.3 +12 -8
jahia/src/java/org/jahia/bin/JahiaConfigurationWizard.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/bin/JahiaConfigurationWizard.java.diff?r1=1.55.2.2&r2=1.55.2.3&f=h
1.35.4.8 +29 -0 jahia/src/java/org/jahia/content/ContentObject.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/content/ContentObject.java.diff?r1=1.35.4.7&r2=1.35.4.8&f=h
1.1.4.1 +80 -0
jahia/src/java/org/jahia/content/events/ContentActivationEvent.java (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/content/events/ContentActivationEvent.java?rev=1.1.4.1&content-type=text/plain
1.6.4.2 +2 -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.4.1&r2=1.6.4.2&f=h
1.6.4.2 +1 -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.4.1&r2=1.6.4.2&f=h
1.9.4.1 +10 -5
jahia/src/java/org/jahia/services/events/JSPEventListener.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/events/JSPEventListener.java.diff?r1=1.9&r2=1.9.4.1&f=h
1.8.4.2 +11 -0
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.4.1&r2=1.8.4.2&f=h
1.7.4.2 +9 -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.4.1&r2=1.7.4.2&f=h
1.72.2.20 +7 -0 jahia/src/java/org/jahia/services/pages/ContentPage.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/pages/ContentPage.java.diff?r1=1.72.2.19&r2=1.72.2.20&f=h
Index: ManageCategories.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/admin/categories/Attic/ManageCategories.java,v
retrieving revision 1.8.4.1
retrieving revision 1.8.4.2
diff -u -r1.8.4.1 -r1.8.4.2
--- ManageCategories.java 13 Apr 2005 16:41:20 -0000 1.8.4.1
+++ ManageCategories.java 20 Apr 2005 13:50:20 -0000 1.8.4.2
@@ -1,38 +1,40 @@
package org.jahia.admin.categories;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TreeMap;
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
+
+import javax.swing.JTree;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.MutableTreeNode;
+
+import org.jahia.bin.Jahia;
+import org.jahia.bin.JahiaAdministration;
import org.jahia.data.JahiaData;
+import org.jahia.data.beans.RequestBean;
+import org.jahia.exceptions.JahiaException;
+import org.jahia.gui.GuiBean;
import org.jahia.params.ParamBean;
import org.jahia.registries.ServicesRegistry;
+import org.jahia.resourcebundle.JahiaResourceBundle;
+import org.jahia.security.license.License;
+import org.jahia.services.categories.Category;
import org.jahia.services.sites.JahiaSite;
-import org.jahia.services.usermanager.JahiaUser;
import org.jahia.services.sites.JahiaSiteTools;
-import org.jahia.resourcebundle.JahiaResourceBundle;
-import org.jahia.bin.JahiaAdministration;
-import java.io.IOException;
-import javax.servlet.ServletException;
-import java.util.Set;
import org.jahia.services.sites.SiteLanguagesPersistance;
-import org.jahia.exceptions.JahiaException;
-import java.util.Locale;
-import org.jahia.bin.Jahia;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.JTree;
-import org.jahia.services.categories.Category;
-import java.util.ArrayList;
+import org.jahia.services.usermanager.JahiaUser;
import org.jahia.utils.GUITreeTools;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.Iterator;
import org.jahia.utils.LanguageCodeConverters;
-import javax.swing.tree.MutableTreeNode;
-import java.util.Properties;
-import org.jahia.security.license.License;
-import org.jahia.data.beans.RequestBean;
-import org.jahia.gui.GuiBean;
/**
* <p>Title: Category administration user interface</p>
@@ -883,4 +885,4 @@
currentCategory.delete();
}
-}
\ No newline at end of file
+}
Index: JahiaConfigurationWizard.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/bin/Attic/JahiaConfigurationWizard.java,v
retrieving revision 1.55.2.2
retrieving revision 1.55.2.3
diff -u -r1.55.2.2 -r1.55.2.3
--- JahiaConfigurationWizard.java 8 Sep 2004 11:59:52 -0000 1.55.2.2
+++ JahiaConfigurationWizard.java 20 Apr 2005 13:50:20 -0000 1.55.2.3
@@ -1,4 +1,4 @@
-// $Id: JahiaConfigurationWizard.java,v 1.55.2.2 2004/09/08 11:59:52 shuber
Exp $
+// $Id: JahiaConfigurationWizard.java,v 1.55.2.3 2005/04/20 13:50:20 shuber
Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -1596,13 +1596,17 @@
line = (String) runtime.nextElement();
String lowerCaseLine = line.toLowerCase();
int tableNamePos = lowerCaseLine.indexOf("create table");
- String tableName = line.substring("create table".length() +
tableNamePos, line.indexOf("(")).trim();
- logger.debug("Creating table [" + tableName + "] ...");
- try {
- db.query( "DROP TABLE " + tableName );
- } catch (Exception e) {
- // nothing to do...... i don't care if the drop doesn't work.
- // simply because table might not have ever existed...
+ if (tableNamePos != -1) {
+ String tableName = line.substring("create table".length() +
+ tableNamePos,
+ line.indexOf("(")).trim();
+ logger.debug("Creating table [" + tableName + "] ...");
+ try {
+ db.query("DROP TABLE " + tableName);
+ } catch (Exception e) {
+ // nothing to do...... i don't care if the drop doesn't
work.
+ // simply because table might not have ever existed...
+ }
}
try {
db.query( line );
Index: ContentObject.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/content/Attic/ContentObject.java,v
retrieving revision 1.35.4.7
retrieving revision 1.35.4.8
diff -u -r1.35.4.7 -r1.35.4.8
--- ContentObject.java 27 Oct 2004 17:48:16 -0000 1.35.4.7
+++ ContentObject.java 20 Apr 2005 13:50:20 -0000 1.35.4.8
@@ -19,6 +19,8 @@
import org.jahia.services.acl.*;
import org.jahia.services.usermanager.*;
import org.jahia.services.version.*;
+import org.jahia.content.events.ContentActivationEvent;
+import org.jahia.registries.ServicesRegistry;
/**
* This class is the main content model class, from which all the other
@@ -1057,4 +1059,31 @@
public abstract int getAclID();
private ObjectKeySet references;
+
+ /**
+ * Must be called by Subclasses activate method.
+ *
+ * @param languageCodes Set
+ * @param versioningActive boolean
+ * @param saveVersion JahiaSaveVersion
+ * @param jParams ParamBean
+ * @param stateModifContext StateModificationContext
+ * @throws JahiaException
+ */
+ public void fireContentActivationEvent (Set languageCodes,
+ boolean versioningActive,
+ JahiaSaveVersion saveVersion,
+ ParamBean jParams,
+ StateModificationContext
stateModifContext,
+ ActivationTestResults result)
+ throws JahiaException {
+
+ ContentActivationEvent event = new
ContentActivationEvent(this,this.getObjectKey(),
+
jParams.getUser(),languageCodes,versioningActive,saveVersion,jParams,stateModifContext,result);
+
+ ServicesRegistry.getInstance().getJahiaEventService()
+ .fireContentActivation(event);
+
+ }
+
}
Index: JahiaEventListener.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/data/events/Attic/JahiaEventListener.java,v
retrieving revision 1.6.4.1
retrieving revision 1.6.4.2
diff -u -r1.6.4.1 -r1.6.4.2
--- JahiaEventListener.java 11 Nov 2004 12:58:42 -0000 1.6.4.1
+++ JahiaEventListener.java 20 Apr 2005 13:50:21 -0000 1.6.4.2
@@ -17,6 +17,7 @@
package org.jahia.data.events;
+import org.jahia.content.events.ContentActivationEvent;
public class JahiaEventListener implements JahiaEventListenerInterface
@@ -64,5 +65,6 @@
public void userLoggedIn( JahiaEvent je ) { return; }
public void userLoggedOut( JahiaEvent je ) { return; }
+ public void contentActivation (ContentActivationEvent theEvent) {
return; }
} // end JahiaEventListener
Index: JahiaEventListenerInterface.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/data/events/Attic/JahiaEventListenerInterface.java,v
retrieving revision 1.6.4.1
retrieving revision 1.6.4.2
diff -u -r1.6.4.1 -r1.6.4.2
--- JahiaEventListenerInterface.java 11 Nov 2004 12:58:42 -0000 1.6.4.1
+++ JahiaEventListenerInterface.java 20 Apr 2005 13:50:21 -0000 1.6.4.2
@@ -17,6 +17,7 @@
package org.jahia.data.events;
+import org.jahia.content.events.ContentActivationEvent;
public interface JahiaEventListenerInterface
Index: JSPEventListener.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/events/Attic/JSPEventListener.java,v
retrieving revision 1.9
retrieving revision 1.9.4.1
diff -u -r1.9 -r1.9.4.1
--- JSPEventListener.java 5 Nov 2003 16:39:59 -0000 1.9
+++ JSPEventListener.java 20 Apr 2005 13:50:21 -0000 1.9.4.1
@@ -6,6 +6,7 @@
import org.jahia.registries.ServicesRegistry;
import java.io.File;
+import org.jahia.content.events.ContentActivationEvent;
/**
* <p>Title: A Jahia Event Listener that dispatches to JSP files</p>
@@ -75,11 +76,12 @@
logger.debug ("Dispatching to JSP " + jspFileName +
" for processing of event " + eventName);
-
- paramBean.getRequest ().setAttribute ("eventName", eventName);
- paramBean.getRequest ().setAttribute ("jahiaEvent", je);
- ServicesRegistry.getInstance ().getJahiaFetcherService ()
- .fetchServlet (paramBean, jspFileName);
+ if (paramBean.getRequest() != null) {
+ paramBean.getRequest ().setAttribute ("eventName",
eventName);
+ paramBean.getRequest ().setAttribute ("jahiaEvent", je);
+ ServicesRegistry.getInstance ().getJahiaFetcherService ()
+ .fetchServlet (paramBean, jspFileName);
+ }
/*
paramBean.getRequest().getRequestDispatcher(jspFileName).include(
paramBean.getRequest(), paramBean.getResponse());
@@ -185,4 +187,7 @@
dispatchToJSP ("userLoggedOut", je);
}
+ public void contentActivation (ContentActivationEvent theEvent) {
+ dispatchToJSP ("contentActivation", theEvent);
+ }
}
\ No newline at end of file
Index: JahiaEventGeneratorBaseService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/events/Attic/JahiaEventGeneratorBaseService.java,v
retrieving revision 1.8.4.1
retrieving revision 1.8.4.2
diff -u -r1.8.4.1 -r1.8.4.2
--- JahiaEventGeneratorBaseService.java 11 Nov 2004 12:58:43 -0000
1.8.4.1
+++ JahiaEventGeneratorBaseService.java 20 Apr 2005 13:50:21 -0000
1.8.4.2
@@ -152,4 +152,15 @@
JahiaListenersRegistry.getInstance ().wakeupListeners
("templateUpdated", theEvent);
}
+ /**
+ * Event fired after ContentObject.activate(...)
+ *
+ * @param theEvent JahiaEvent
+ * @throws JahiaException
+ */
+ public void fireContentActivation (JahiaEvent theEvent) throws
JahiaException {
+ JahiaListenersRegistry.getInstance ().wakeupListeners
("contentActivation",
+ theEvent);
+ }
+
}
Index: JahiaEventGeneratorService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/events/Attic/JahiaEventGeneratorService.java,v
retrieving revision 1.7.4.1
retrieving revision 1.7.4.2
diff -u -r1.7.4.1 -r1.7.4.2
--- JahiaEventGeneratorService.java 11 Nov 2004 12:58:43 -0000 1.7.4.1
+++ JahiaEventGeneratorService.java 20 Apr 2005 13:50:21 -0000 1.7.4.2
@@ -79,4 +79,13 @@
public abstract void fireUpdateTemplate (JahiaEvent theEvent) throws
JahiaException;
+ /**
+ * Event fired after ContentObject.activate(...)
+ *
+ * @param theEvent JahiaEvent
+ * @throws JahiaException
+ */
+ public abstract void fireContentActivation (JahiaEvent theEvent)
+ throws JahiaException;
+
} // end JahiaEventGeneratorService
Index: ContentPage.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/pages/Attic/ContentPage.java,v
retrieving revision 1.72.2.19
retrieving revision 1.72.2.20
diff -u -r1.72.2.19 -r1.72.2.20
--- ContentPage.java 29 Nov 2004 13:04:05 -0000 1.72.2.19
+++ ContentPage.java 20 Apr 2005 13:50:21 -0000 1.72.2.20
@@ -2739,6 +2739,13 @@
// @todo : create a singleton for all pageInfo !!
this.commitChanges (true);
+ fireContentActivationEvent(languageCodes,
+ versioningActive,
+ saveVersion,
+ jParams,
+ stateModifContext,
+ activationResults);
+
return activationResults;
}
