You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2009/02/05 16:40:45 UTC
svn commit: r741146 [1/2] - in /lenya/trunk:
org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/
org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/
org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/us...
Author: andreas
Date: Thu Feb 5 15:40:42 2009
New Revision: 741146
URL: http://svn.apache.org/viewvc?rev=741146&view=rev
Log:
Added missing dependencies, resolved compilation errors.
Modified:
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileGroupManager.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileIPRange.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileIPRangeManager.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileItemManager.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileRoleManager.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUser.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUserManager.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractAccreditableManager.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractItem.java
lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/AddIPRange.java
lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/AddUser.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/ac/Identity.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/ac/Item.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/net/InetAddressUtil.java
lenya/trunk/org.apache.lenya.core.impl/pom.xml
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/metadata/usecases/Metadata.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeLabel.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeVisibility.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/MoveSubsite.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Overview.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Restore.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Revisions.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Rollback.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/SiteOverview.java
lenya/trunk/org.apache.lenya.core.usecase/pom.xml
lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/AbstractUsecase.java
lenya/trunk/org.apache.lenya.core.workflow/pom.xml
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/WorkflowModule.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/transformation/WorkflowMenuTransformer.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/CheckWorkflow.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/History.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/InvokeWorkflow.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/MultiWorkflow.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Publish.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Reject.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/UsecaseWorkflowHelper.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/WorkflowableWrapper.java
lenya/trunk/org.apache.lenya.module.blog/pom.xml
lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Deactivate.java
lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Delete.java
lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Publish.java
lenya/trunk/org.apache.lenya.module.cforms/pom.xml
lenya/trunk/org.apache.lenya.module.editors/pom.xml
lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/EditDocument.java
lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/forms/FormsEditor.java
lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/forms/OneFormEditor.java
lenya/trunk/org.apache.lenya.module.export/src/main/java/org/apache/lenya/cms/export/Importer.java
lenya/trunk/org.apache.lenya.module.fckeditor/pom.xml
lenya/trunk/org.apache.lenya.module.fckeditor/src/main/java/org/apache/lenya/cms/editors/fckeditor/Fckeditor.java
lenya/trunk/org.apache.lenya.module.lucene/pom.xml
lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/analyzer/ConfigurableAnalyzer.java
lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/analyzer/ConfigurableStopwordAnalyzer.java
lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AbstractIndexer.java
lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AbstractSearcher.java
lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/AnalyzerManagerImpl.java
lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/cocoon/components/search/components/impl/IndexManagerImpl.java
lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/cms/lucene/IndexUpdaterImpl.java
lenya/trunk/org.apache.lenya.module.lucene/src/main/java/org/apache/lenya/modules/lucene/impl/MetaDataFieldRegistryImpl.java
lenya/trunk/org.apache.lenya.module.menubar/pom.xml
lenya/trunk/org.apache.lenya.module.notification/pom.xml
lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/inbox/xml/XmlSourceInbox.java
lenya/trunk/org.apache.lenya.module.notification/src/main/java/org/apache/lenya/notification/AbstractNotifier.java
lenya/trunk/org.apache.lenya.module.opendocument/pom.xml
lenya/trunk/org.apache.lenya.module.opendocument/src/main/java/org/apache/lenya/cms/publication/OpenDocumentWrapper.java
lenya/trunk/org.apache.lenya.module.sitetree/pom.xml
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/cocoon/transformation/AccessControlSitetreeTransformer.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeFactory.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree/SiteTreeNodeImpl.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SaxTreeBuilder.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SaxTreeWriter.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeFactory.java
lenya/trunk/org.apache.lenya.module.sitetree/src/main/java/org/apache/lenya/cms/site/tree2/SiteTreeImpl.java
lenya/trunk/org.apache.lenya.module.svg/pom.xml
lenya/trunk/org.apache.lenya.module.svg/src/main/java/org/apache/lenya/modules/svg/ProtocolHandler.java
lenya/trunk/org.apache.lenya.module.tinymce/pom.xml
lenya/trunk/org.apache.lenya.module.tinymce/src/main/java/org/apache/lenya/cms/editors/tinymce/TinyMce.java
lenya/trunk/org.apache.lenya.module.webdav/pom.xml
lenya/trunk/org.apache.lenya.module.webdav/src/main/java/org/apache/lenya/cms/usecases/webdav/Put.java
lenya/trunk/org.apache.lenya.optional.jcrsource/pom.xml
lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/JCRNodeFactory.java
lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/LenyaRepository.java
lenya/trunk/org.apache.lenya.optional.jcrsource/src/main/java/org/apache/lenya/cms/jcr/metadata/JCRMetaData.java
lenya/trunk/org.apache.lenya.parent/ (props changed)
lenya/trunk/org.apache.lenya.parent/pom.xml
Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileGroupManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileGroupManager.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileGroupManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileGroupManager.java Thu Feb 5 15:40:42 2009
@@ -61,6 +61,7 @@
if (!instances.containsKey(configurationDirectory)) {
FileGroupManager manager = new FileGroupManager(mgr);
+ manager.setLogger(logger);
manager.configure(configurationDirectory);
instances.put(configurationDirectory, manager);
}
Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileIPRange.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileIPRange.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileIPRange.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileIPRange.java Thu Feb 5 15:40:42 2009
@@ -30,6 +30,7 @@
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.configuration.DefaultConfigurationSerializer;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.impl.SimpleLog;
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.ItemManager;
import org.apache.lenya.ac.Machine;
@@ -63,7 +64,7 @@
InetAddress subnetMask = InetAddress.getByName(args[1]);
Machine machine = new Machine(args[2]);
- InetAddressUtil util = new InetAddressUtil(getLogger());
+ InetAddressUtil util = new InetAddressUtil(new SimpleLog(FileIPRange.class.getName()));
if (util.contains(networkAddress, subnetMask, machine.getAddress())) {
System.out.println("true");
} else {
Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileIPRangeManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileIPRangeManager.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileIPRangeManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileIPRangeManager.java Thu Feb 5 15:40:42 2009
@@ -74,6 +74,7 @@
if (!instances.containsKey(configurationDirectory)) {
FileIPRangeManager manager = new FileIPRangeManager(mgr);
+ manager.setLogger(logger);
manager.configure(configurationDirectory);
instances.put(configurationDirectory, manager);
}
Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileItemManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileItemManager.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileItemManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileItemManager.java Thu Feb 5 15:40:42 2009
@@ -81,6 +81,7 @@
this.configurationDirectory = _configurationDirectory;
this.notifier = new DirectoryChangeNotifier(_configurationDirectory, getFileFilter());
+ this.notifier.setLogger(getLogger());
loadItems();
}
Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileRoleManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileRoleManager.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileRoleManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileRoleManager.java Thu Feb 5 15:40:42 2009
@@ -58,6 +58,7 @@
throws AccessControlException {
if (!instances.containsKey(configurationDirectory)) {
FileRoleManager manager = new FileRoleManager(mgr);
+ manager.setLogger(logger);
manager.configure(configurationDirectory);
instances.put(configurationDirectory, manager);
}
Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUser.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUser.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUser.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUser.java Thu Feb 5 15:40:42 2009
@@ -26,6 +26,7 @@
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.configuration.DefaultConfigurationSerializer;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.Log;
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.Group;
import org.apache.lenya.ac.GroupManager;
Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUserManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUserManager.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUserManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUserManager.java Thu Feb 5 15:40:42 2009
@@ -76,6 +76,7 @@
if (!instances.containsKey(configurationDirectory)) {
FileUserManager manager = new FileUserManager(mgr, userTypes);
+ manager.setLogger(logger);
manager.configure(configurationDirectory);
instances.put(configurationDirectory, manager);
}
Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractAccreditableManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractAccreditableManager.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractAccreditableManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractAccreditableManager.java Thu Feb 5 15:40:42 2009
@@ -24,7 +24,6 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.commons.logging.Log;
import org.apache.lenya.ac.AccessControlException;
@@ -47,6 +46,7 @@
* @param logger The logger.
*/
public AbstractAccreditableManager(Log logger) {
+ setLogger(logger);
}
private UserManager userManager = null;
Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractItem.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractItem.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractItem.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractItem.java Thu Feb 5 15:40:42 2009
@@ -45,6 +45,8 @@
* @param logger The logger.
*/
public AbstractItem(ItemManager itemManager, Log logger) {
+ Assert.notNull("logger", logger);
+ setLogger(logger);
Assert.notNull("item manager", itemManager);
this.itemManager = itemManager;
}
Modified: lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/AddIPRange.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/AddIPRange.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/AddIPRange.java (original)
+++ lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/AddIPRange.java Thu Feb 5 15:40:42 2009
@@ -21,7 +21,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.lenya.ac.IPRange;
import org.apache.lenya.ac.ItemUtil;
import org.apache.lenya.cms.ac.usecases.IPRangeProfile.Part;
@@ -60,7 +60,7 @@
String description = getParameterAsString(IPRangeProfile.DESCRIPTION);
IPRange ipRange = getIpRangeManager().add(id);
-
+ ((AbstractLogEnabled) ipRange).setLogger(getLogger());
ipRange.setName(name);
ipRange.setDescription(description);
Modified: lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/AddUser.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/AddUser.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/AddUser.java (original)
+++ lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/AddUser.java Thu Feb 5 15:40:42 2009
@@ -17,7 +17,7 @@
*/
package org.apache.lenya.cms.ac.usecases;
-import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.ItemUtil;
import org.apache.lenya.ac.User;
@@ -69,7 +69,7 @@
if (className.equals(LDAPUser.class.getName())) {
LDAPUser ldapUser = new LDAPUser(getUserManager(), getLogger());
-
+ ldapUser.setLogger(getLogger());
try {
if (!ldapUser.existsUser(ldapId)) {
addErrorMessage("ldap_no_such_user", new String[]{ldapId});
@@ -117,6 +117,7 @@
user.setName(fullName);
user.setPassword(password);
}
+ ((AbstractLogEnabled) user).setLogger(getLogger());
user.setDescription(description);
user.save();
getUserManager().add(user);
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/ac/Identity.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/ac/Identity.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/ac/Identity.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/ac/Identity.java Thu Feb 5 15:40:42 2009
@@ -28,6 +28,8 @@
import java.io.ObjectOutputStream;
import java.io.Serializable;
+import javax.servlet.http.HttpSession;
+
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.commons.logging.Log;
@@ -47,6 +49,7 @@
* @param logger The logger.
*/
public Identity(Log logger) {
+ setLogger(logger);
}
/**
@@ -198,7 +201,7 @@
* @param session The session.
* @return An identity.
*/
- public static Identity getIdentity(Session session) {
+ public static Identity getIdentity(HttpSession session) {
Identity identity = (Identity) session.getAttribute(Identity.class.getName());
return identity;
}
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/ac/Item.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/ac/Item.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/ac/Item.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/ac/Item.java Thu Feb 5 15:40:42 2009
@@ -22,13 +22,12 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.LogEnabled;
/**
* An item can be initialized from a configuration.
*/
-public interface Item extends LogEnabled {
+public interface Item {
/**
* Returns the ID.
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/net/InetAddressUtil.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/net/InetAddressUtil.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/net/InetAddressUtil.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/net/InetAddressUtil.java Thu Feb 5 15:40:42 2009
@@ -36,6 +36,7 @@
* @param logger The logger.
*/
public InetAddressUtil(Log logger) {
+ setLogger(logger);
}
/**
Modified: lenya/trunk/org.apache.lenya.core.impl/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/pom.xml?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.impl/pom.xml Thu Feb 5 15:40:42 2009
@@ -27,5 +27,9 @@
<groupId>org.apache.axis</groupId>
<artifactId>axis</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/metadata/usecases/Metadata.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/metadata/usecases/Metadata.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/metadata/usecases/Metadata.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/metadata/usecases/Metadata.java Thu Feb 5 15:40:42 2009
@@ -108,7 +108,7 @@
MetaDataRegistry registry = null;
try {
- boolean canChange = WorkflowUtil.canInvoke(this.manager, getSession(), getLogger(), doc, "edit");
+ boolean canChange = WorkflowUtil.canInvoke(this.manager, getLogger(), doc, "edit");
if (!canChange) {
addInfoMessage("cannot-change-metadata");
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeLabel.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeLabel.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeLabel.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeLabel.java Thu Feb 5 15:40:42 2009
@@ -112,7 +112,7 @@
String label = getParameterAsString(LABEL).trim();
document.getLink().setLabel(label);
- WorkflowUtil.invoke(this.manager, getSession(), getLogger(), document, getEvent());
+ WorkflowUtil.invoke(this.manager, getLogger(), document, getEvent());
}
}
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeVisibility.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeVisibility.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeVisibility.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ChangeVisibility.java Thu Feb 5 15:40:42 2009
@@ -86,7 +86,7 @@
String[] languages = doc.getLanguages();
for (int i = 0; i < languages.length; i++) {
Document version = doc.getTranslation(languages[i]);
- WorkflowUtil.invoke(this.manager, getSession(), getLogger(), version, getEvent());
+ WorkflowUtil.invoke(this.manager, getLogger(), version, getEvent());
}
}
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/MoveSubsite.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/MoveSubsite.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/MoveSubsite.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/MoveSubsite.java Thu Feb 5 15:40:42 2009
@@ -139,11 +139,11 @@
targetLoc = SiteUtil.getAvailableLocator(this.manager, getDocumentFactory(), targetLoc);
for (int i = 0; i < sources.length; i++) {
- WorkflowUtil.invoke(this.manager, getSession(), getLogger(), sources[i], getEvent(),
+ WorkflowUtil.invoke(this.manager, getLogger(), sources[i], getEvent(),
true);
if (this.getClass().getName().equals(Restore.class.getName())) {
- Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager, getSession(),
+ Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager,
getLogger(), sources[i]);
String state = workflowable.getLatestVersion().getState();
if (!state.equals("authoring")) {
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Overview.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Overview.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Overview.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Overview.java Thu Feb 5 15:40:42 2009
@@ -90,7 +90,7 @@
setParameter(VISIBLE_IN_NAVIGATION, Boolean.valueOf(visible));
Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager,
- getSession(), getLogger(), doc);
+ getLogger(), doc);
resolver = (WorkflowManager) this.manager.lookup(WorkflowManager.ROLE);
if (resolver.hasWorkflow(workflowable)) {
Workflow workflow = resolver.getWorkflowSchema(workflowable);
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Restore.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Restore.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Restore.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Restore.java Thu Feb 5 15:40:42 2009
@@ -76,7 +76,7 @@
super.doCheckPostconditions();
Document doc = getTargetDocument(true);
- Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager, getSession(),
+ Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager,
getLogger(), doc);
String state = workflowable.getLatestVersion().getState();
if (!state.equals("authoring")) {
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Revisions.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Revisions.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Revisions.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Revisions.java Thu Feb 5 15:40:42 2009
@@ -51,19 +51,19 @@
setParameter("revisions", revisions);
Boolean canRollback = Boolean.valueOf(WorkflowUtil.canInvoke(this.manager,
- getDocumentFactory().getSession(), getLogger(), sourceDoc, getEvent()));
+ getLogger(), sourceDoc, getEvent()));
setParameter("canRollback", canRollback);
- if (WorkflowUtil.hasWorkflow(this.manager, getSession(), getLogger(), sourceDoc)) {
+ if (WorkflowUtil.hasWorkflow(this.manager, getLogger(), sourceDoc)) {
Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager,
- getSession(), getLogger(), sourceDoc);
+ getLogger(), sourceDoc);
Version latestVersion = workflowable.getLatestVersion();
String state;
if (latestVersion != null) {
state = latestVersion.getState();
} else {
Workflow workflow = WorkflowUtil.getWorkflowSchema(this.manager,
- getSession(), getLogger(), sourceDoc);
+ getLogger(), sourceDoc);
state = workflow.getInitialState();
}
setParameter("workflowState", state);
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Rollback.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Rollback.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Rollback.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Rollback.java Thu Feb 5 15:40:42 2009
@@ -57,9 +57,8 @@
Document document = getSourceDocument();
Node node = document.getRepositoryNode();
node.rollback(revision);
-
- WorkflowUtil.invoke(this.manager, getSession(), getLogger(), getSourceDocument(),
- getEvent());
+
+ WorkflowUtil.invoke(this.manager, getLogger(), getSourceDocument(), getEvent());
}
protected String getEvent() {
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/SiteOverview.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/SiteOverview.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/SiteOverview.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/SiteOverview.java Thu Feb 5 15:40:42 2009
@@ -140,16 +140,16 @@
String lastModified = format.format(new Date(doc.getLastModified()));
entry.setValue(KEY_LAST_MODIFIED, lastModified);
- if (WorkflowUtil.hasWorkflow(this.manager, getSession(), getLogger(), doc)) {
+ if (WorkflowUtil.hasWorkflow(this.manager, getLogger(), doc)) {
Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager,
- getSession(), getLogger(), doc);
+ getLogger(), doc);
Version latestVersion = workflowable.getLatestVersion();
String state;
if (latestVersion != null) {
state = latestVersion.getState();
} else {
Workflow workflow = WorkflowUtil.getWorkflowSchema(this.manager,
- getSession(), getLogger(), doc);
+ getLogger(), doc);
state = workflow.getInitialState();
}
entry.setValue(KEY_WORKFLOW_STATE, state);
Modified: lenya/trunk/org.apache.lenya.core.usecase/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.usecase/pom.xml?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.usecase/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.usecase/pom.xml Thu Feb 5 15:40:42 2009
@@ -18,7 +18,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -36,12 +35,10 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-sitemap-impl</artifactId>
- <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-cron-impl</artifactId>
- <version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/AbstractUsecase.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/AbstractUsecase.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/AbstractUsecase.java (original)
+++ lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/AbstractUsecase.java Thu Feb 5 15:40:42 2009
@@ -35,6 +35,7 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
+import org.apache.cocoon.components.ContextHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.servlet.multipart.Part;
import org.apache.cocoon.util.AbstractLogEnabled;
Modified: lenya/trunk/org.apache.lenya.core.workflow/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/pom.xml?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/pom.xml Thu Feb 5 15:40:42 2009
@@ -16,6 +16,11 @@
<name>Apache Lenya Core Workflow</name>
<dependencies>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
</dependency>
@@ -32,6 +37,10 @@
<artifactId>lenya-core-linking</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-module-notification</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-core</artifactId>
</dependency>
Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java Thu Feb 5 15:40:42 2009
@@ -103,7 +103,7 @@
if (getLogger().isDebugEnabled()) {
getLogger().debug(" Invoking workflow event");
}
- WorkflowUtil.invoke(this.manager, session, getLogger(), document, eventName);
+ WorkflowUtil.invoke(this.manager, getLogger(), document, eventName);
return Collections.EMPTY_MAP;
}
Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/WorkflowModule.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/WorkflowModule.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/WorkflowModule.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/WorkflowModule.java Thu Feb 5 15:40:42 2009
@@ -27,8 +27,6 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.PageEnvelope;
import org.apache.lenya.cms.repository.RepositoryUtil;
@@ -45,7 +43,6 @@
* @version $Id$
*/
public class WorkflowModule extends AbstractPageEnvelopeModule {
- private static final Log logger = LogFactory.getLog(WorkflowModule.class);
/**
* <code>STATE</code> The state
@@ -89,8 +86,7 @@
Session session = RepositoryUtil.getSession(this.manager,
ObjectModelHelper.getRequest(objectModel));
Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager,
- session,
- logger,
+ getLogger(),
document);
if (wfManager.hasWorkflow(workflowable)) {
Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/transformation/WorkflowMenuTransformer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/transformation/WorkflowMenuTransformer.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/transformation/WorkflowMenuTransformer.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/cocoon/transformation/WorkflowMenuTransformer.java Thu Feb 5 15:40:42 2009
@@ -146,7 +146,6 @@
if (hasWorkflow()) {
Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager,
- session,
getLogger(),
document);
Workflow workflow = workflowManager.getWorkflowSchema(workflowable);
Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/CheckWorkflow.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/CheckWorkflow.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/CheckWorkflow.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/CheckWorkflow.java Thu Feb 5 15:40:42 2009
@@ -60,7 +60,7 @@
}
Document doc = getSourceDocument();
- if (!WorkflowUtil.canInvoke(this.manager, getSession(), getLogger(), doc, getEvent())) {
+ if (!WorkflowUtil.canInvoke(this.manager, getLogger(), doc, getEvent())) {
UsecaseWorkflowHelper.addWorkflowError(this, getEvent(), doc);
}
}
Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/History.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/History.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/History.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/History.java Thu Feb 5 15:40:42 2009
@@ -17,11 +17,8 @@
*/
package org.apache.lenya.cms.workflow.usecases;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.lenya.cms.usecase.DocumentUsecase;
import org.apache.lenya.cms.workflow.WorkflowUtil;
-import org.apache.lenya.workflow.Version;
import org.apache.lenya.workflow.Workflowable;
/**
@@ -32,17 +29,16 @@
public class History extends DocumentUsecase {
/**
- * @see org.apache.lenya.cms.usecase.AbstractUsecase#initParameters() TODO
- * get wf variables, get date and machine ip for versions
+ * @see org.apache.lenya.cms.usecase.AbstractUsecase#initParameters() TODO get wf variables, get
+ * date and machine ip for versions
*/
protected void initParameters() {
super.initParameters();
if (getSourceDocument() != null) {
- Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager, getSession(),
- getLogger(), getSourceDocument());
- Version[] versions = workflowable.getVersions();
- setParameter("versions", versions);
+ Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager, getLogger(),
+ getSourceDocument());
+ setParameter("versions", workflowable.getVersions());
}
}
}
\ No newline at end of file
Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/InvokeWorkflow.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/InvokeWorkflow.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/InvokeWorkflow.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/InvokeWorkflow.java Thu Feb 5 15:40:42 2009
@@ -17,8 +17,6 @@
*/
package org.apache.lenya.cms.workflow.usecases;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.usecase.UsecaseException;
import org.apache.lenya.cms.workflow.WorkflowUtil;
@@ -38,14 +36,13 @@
* @version $Id$
*/
public class InvokeWorkflow extends CheckWorkflow {
- private static final Log logger = LogFactory.getLog(InvokeWorkflow.class);
/**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#getNodesToLock()
*/
protected Node[] getNodesToLock() throws UsecaseException {
Node[] objects = new Node[0];
- if(getSourceDocument() != null) {
+ if (getSourceDocument() != null) {
objects = new Node[] { getSourceDocument().getRepositoryNode() };
}
return objects;
@@ -56,8 +53,7 @@
*/
protected void doExecute() throws Exception {
super.doExecute();
- WorkflowUtil.invoke(this.manager, getSession(), logger, getSourceDocument(),
- getEvent());
+ WorkflowUtil.invoke(this.manager, getLogger(), getSourceDocument(), getEvent());
}
}
Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/MultiWorkflow.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/MultiWorkflow.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/MultiWorkflow.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/MultiWorkflow.java Thu Feb 5 15:40:42 2009
@@ -53,8 +53,8 @@
SortedSet states = new TreeSet();
for (Iterator i = preOrder.iterator(); i.hasNext();) {
Document doc = (Document) i.next();
- WorkflowableWrapper wrapper = new WorkflowableWrapper(this, this.manager,
- getDocumentFactory().getSession(), doc, getLogger());
+ WorkflowableWrapper wrapper = new WorkflowableWrapper(this, this.manager, doc,
+ getLogger());
wrappers.add(wrapper);
states.addAll(Arrays.asList(wrapper.getStates()));
}
@@ -68,7 +68,8 @@
}
}
- protected List getNodes() throws DocumentBuildException, DocumentException, PublicationException {
+ protected List getNodes() throws DocumentBuildException, DocumentException,
+ PublicationException {
List preOrder;
String sourceUrl = getSourceURL();
DocumentFactory factory = getDocumentFactory();
Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Publish.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Publish.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Publish.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Publish.java Thu Feb 5 15:40:42 2009
@@ -41,7 +41,6 @@
import org.apache.lenya.cms.linking.LinkManager;
import org.apache.lenya.cms.linking.LinkResolver;
import org.apache.lenya.cms.linking.LinkTarget;
-import org.apache.lenya.cms.metadata.MetaDataException;
import org.apache.lenya.cms.metadata.dublincore.DublinCoreHelper;
import org.apache.lenya.cms.observation.RepositoryEvent;
import org.apache.lenya.cms.observation.RepositoryEventFactory;
@@ -61,8 +60,6 @@
import org.apache.lenya.cms.usecase.UsecaseException;
import org.apache.lenya.cms.usecase.scheduling.UsecaseScheduler;
import org.apache.lenya.cms.workflow.WorkflowUtil;
-import org.apache.lenya.cms.workflow.usecases.InvokeWorkflow;
-// FIXME Dependency on non-core module.
import org.apache.lenya.notification.Message;
import org.apache.lenya.notification.NotificationEventDescriptor;
import org.apache.lenya.notification.NotificationException;
@@ -76,7 +73,7 @@
* @version $Id$
*/
public class Publish extends InvokeWorkflow {
- private static final Log logger = LogFactory.getLog(Publish.class);
+ private static final Log logger = LogFactory.getLog(Publish.class);
/**
* If the usecase should check for missing live ancestors in {@link #checkPreconditions()}.
@@ -100,7 +97,7 @@
protected static final String SCHEDULE_TIME = "schedule.time";
protected static final String CAN_SEND_NOTIFICATION = "canSendNotification";
protected static final String UNPUBLISHED_LINKS = "unpublishedLinks";
-
+
/**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#initParameters()
*/
@@ -118,22 +115,22 @@
Boolean canSendNotification = Boolean.valueOf(canNotifySubmitter());
setParameter(CAN_SEND_NOTIFICATION, canSendNotification);
setParameter(PARAM_SEND_NOTIFICATION, canSendNotification);
-
+
setParameter(UNPUBLISHED_LINKS, new LinkList(this.manager, getSourceDocument()));
-
+
}
-
+
protected boolean canNotifySubmitter() {
-
+
boolean shallNotifySubmitter = false;
- Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager, getSession(),
- logger, getSourceDocument());
+ Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager, logger,
+ getSourceDocument());
Version versions[] = workflowable.getVersions();
-
+
// consider the case that there was no submit transition
if (versions.length > 0) {
Version version = versions[versions.length - 1];
-
+
// we check if the document has been submitted, otherwise we do nothing
if (version.getEvent().equals("submit")) {
shallNotifySubmitter = true;
@@ -141,7 +138,7 @@
}
return shallNotifySubmitter;
}
-
+
protected boolean hasBrokenLinks() {
LinkManager linkMgr = null;
LinkResolver resolver = null;
@@ -167,7 +164,7 @@
}
return false;
}
-
+
/**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#getNodesToLock()
*/
@@ -176,15 +173,16 @@
List nodes = new ArrayList();
Document doc = getSourceDocument();
- if(doc != null) {
+ if (doc != null) {
nodes.add(doc.getRepositoryNode());
-
+
// lock the authoring site to avoid having live nodes for which no corresponding
// authoring node exists
nodes.add(doc.area().getSite().getRepositoryNode());
-
+
// lock the live site to avoid overriding changes made by others
- SiteStructure liveSite = doc.getPublication().getArea(Publication.LIVE_AREA).getSite();
+ SiteStructure liveSite = doc.getPublication().getArea(Publication.LIVE_AREA)
+ .getSite();
nodes.add(liveSite.getRepositoryNode());
}
@@ -197,8 +195,8 @@
}
/**
- * Checks if the workflow event is supported and the parent of the document
- * exists in the live area.
+ * Checks if the workflow event is supported and the parent of the document exists in the live
+ * area.
*
* @see org.apache.lenya.cms.usecase.AbstractUsecase#doCheckPreconditions()
*/
@@ -213,7 +211,7 @@
}
checkMissingAncestors();
-
+
if (hasBrokenLinks()) {
addInfoMessage("publish-broken-links");
}
@@ -225,11 +223,11 @@
* @throws Exception if an error occurs.
*/
protected void checkMissingAncestors() throws Exception {
-
+
if (!getParameterAsBoolean(PARAM_CHECK_MISSING_ANCESTORS, true)) {
return;
}
-
+
Document document = getSourceDocument();
Publication publication = document.getPublication();
DocumentFactory map = document.getFactory();
@@ -246,8 +244,7 @@
if (!liveSite.contains(document.getPath())) {
DocumentLocator liveLoc = document.getLocator().getAreaVersion(
Publication.LIVE_AREA);
- DocumentLocator[] requiredNodes = siteManager
- .getRequiredResources(map, liveLoc);
+ DocumentLocator[] requiredNodes = siteManager.getRequiredResources(map, liveLoc);
for (int i = 0; i < requiredNodes.length; i++) {
String path = requiredNodes[i].getPath();
if (!liveSite.contains(path)) {
@@ -275,10 +272,9 @@
for (Iterator i = missingDocuments.iterator(); i.hasNext();) {
Document doc = (Document) i.next();
/*
- * This doesn't work yet, see
- * https://issues.apache.org/jira/browse/COCOON-2057
- * String[] params = { doc.getCanonicalWebappURL(),
- * doc.getPath() + " (" + doc.getLanguage() + ")" };
+ * This doesn't work yet, see https://issues.apache.org/jira/browse/COCOON-2057
+ * String[] params = { doc.getCanonicalWebappURL(), doc.getPath() + " (" +
+ * doc.getLanguage() + ")" };
*/
String[] params = { doc.getPath() + ":" + doc.getLanguage(),
DublinCoreHelper.getTitle(doc, true) };
@@ -288,8 +284,8 @@
}
/**
- * Returns a link of a certain node, preferably in the document's language,
- * or <code>null</code> if the node has no links.
+ * Returns a link of a certain node, preferably in the document's language, or <code>null</code>
+ * if the node has no links.
* @param path The path of the node.
* @param document The document.
* @return A link or <code>null</code>.
@@ -379,20 +375,21 @@
protected void sendNotification(Document authoringDocument) throws NotificationException,
DocumentException, AccessControlException {
-
+
if (!getParameterAsBoolean(CAN_SEND_NOTIFICATION, false)) {
- getLogger().error("Can't notify submitter of document [" + authoringDocument +
- "] because it hasn't been submitted.");
+ getLogger().error(
+ "Can't notify submitter of document [" + authoringDocument
+ + "] because it hasn't been submitted.");
return;
}
- Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager, getSession(),
- logger, authoringDocument);
+ Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager, logger,
+ authoringDocument);
Version versions[] = workflowable.getVersions();
-
+
// obtain submitted version
Version version = versions[versions.length - 2];
-
+
String userId = version.getUserId();
User user = PolicyUtil.getUser(this.manager, authoringDocument.getCanonicalWebappURL(),
userId, logger);
@@ -404,10 +401,10 @@
url = getWebUrl(liveVersion);
User sender = getSession().getIdentity().getUser();
-
+
Text[] subjectParams = { new Text(getEvent(), true) };
Text subject = new Text(MESSAGE_SUBJECT, subjectParams);
-
+
String userMessage = getParameterAsString(PARAM_USER_NOTIFICATION_MESSAGE, "");
Text[] params = { new Text(url, false), new Text(userMessage, false) };
Text body = new Text(MESSAGE_DOCUMENT_PUBLISHED, params);
@@ -452,16 +449,16 @@
s++;
}
}
-
+
/**
* A list of links originating from a document. Allows lazy loading from the usecase view.
*/
public static class LinkList {
-
+
private Document document;
private Document[] documents;
private ServiceManager manager;
-
+
/**
* @param manager The manager.
* @param doc The document to resolve the links from.
@@ -470,7 +467,7 @@
this.manager = manager;
this.document = doc;
}
-
+
/**
* @return The link documents.
*/
@@ -480,7 +477,7 @@
}
return this.documents;
}
-
+
protected Document[] getUnpublishedLinks() {
Set docs = new HashSet();
LinkManager linkMgr = null;
Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Reject.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Reject.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Reject.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Reject.java Thu Feb 5 15:40:42 2009
@@ -19,8 +19,6 @@
import org.apache.cocoon.components.ContextHelper;
import org.apache.cocoon.environment.Request;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.Identifiable;
import org.apache.lenya.ac.User;
@@ -32,11 +30,9 @@
import org.apache.lenya.cms.publication.Proxy;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.workflow.WorkflowUtil;
-import org.apache.lenya.cms.workflow.usecases.InvokeWorkflow;
-// FIXME Dependency on non-core module.
import org.apache.lenya.notification.Message;
-import org.apache.lenya.notification.NotificationException;
import org.apache.lenya.notification.NotificationEventDescriptor;
+import org.apache.lenya.notification.NotificationException;
import org.apache.lenya.notification.Text;
import org.apache.lenya.workflow.Version;
import org.apache.lenya.workflow.Workflowable;
@@ -45,15 +41,14 @@
* Reject usecase handler.
*/
public class Reject extends InvokeWorkflow {
- private static final Log logger = LogFactory.getLog(Reject.class);
-
+
/**
* The reason for rejection.
*/
public static final String PARAM_REJECT_REASON = "rejectReason";
-
+
/**
- * If a notification message shall be sent.
+ * If a notification message shall be sent.
*/
public static final String PARAM_SEND_NOTIFICATION = "sendNotification";
@@ -80,8 +75,8 @@
User sender = getSession().getIdentity().getUser();
String reason = getParameterAsString(PARAM_REJECT_REASON);
- Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager, getSession(),
- logger, authoringDocument);
+ Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager, getLogger(),
+ authoringDocument);
Version versions[] = workflowable.getVersions();
// current version is reject, want originating submit
Version version = versions[versions.length - 2];
@@ -92,7 +87,7 @@
String userId = version.getUserId();
User user = PolicyUtil.getUser(this.manager, authoringDocument.getCanonicalWebappURL(),
- userId, logger);
+ userId, getLogger());
Identifiable[] recipients = { user };
@@ -110,7 +105,7 @@
final String webappUrl = authoringVersion.getCanonicalWebappURL();
url = serverUrl + request.getContextPath() + webappUrl;
}
-
+
Text[] subjectParams = { new Text(getEvent(), true) };
Text[] params = { new Text(reason, false), new Text(url, false) };
Text subject = new Text(MESSAGE_SUBJECT, subjectParams);
Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/UsecaseWorkflowHelper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/UsecaseWorkflowHelper.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/UsecaseWorkflowHelper.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/UsecaseWorkflowHelper.java Thu Feb 5 15:40:42 2009
@@ -32,14 +32,13 @@
public class UsecaseWorkflowHelper {
/**
- * The error message that an event can not be invoked on a document. It
- * takes two parameters: the event name and the document title.
+ * The error message that an event can not be invoked on a document. It takes two parameters:
+ * the event name and the document title.
*/
protected static final String ERROR_CANNOT_INVOKE_EVENT = "error-workflow-document";
/**
- * Adds an error message to a usecase that an event cannot be invoked on a
- * document.
+ * Adds an error message to a usecase that an event cannot be invoked on a document.
* @param usecase The usecase.
* @param event The event.
* @param doc The document.
@@ -67,7 +66,7 @@
public static final void checkWorkflow(ServiceManager manager, AbstractUsecase usecase,
String event, Document doc, Log logger) {
try {
- if (!WorkflowUtil.canInvoke(manager, usecase.getSession(), logger, doc, event)) {
+ if (!WorkflowUtil.canInvoke(manager, logger, doc, event)) {
UsecaseWorkflowHelper.addWorkflowError(usecase, event, doc);
}
} catch (WorkflowException e) {
Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/WorkflowableWrapper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/WorkflowableWrapper.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/WorkflowableWrapper.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/WorkflowableWrapper.java Thu Feb 5 15:40:42 2009
@@ -19,14 +19,11 @@
import java.util.Arrays;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentException;
-import org.apache.lenya.cms.repository.Session;
import org.apache.lenya.cms.workflow.WorkflowUtil;
import org.apache.lenya.workflow.Workflow;
import org.apache.lenya.workflow.WorkflowException;
@@ -36,33 +33,31 @@
* Wrap a workflowable for easy evaluation in JX template.
*/
public class WorkflowableWrapper extends AbstractLogEnabled {
-
+
private MultiWorkflow usecase;
private Workflowable workflowable;
private ServiceManager manager;
private Document document;
- private Session session;
/**
* Ctor.
* @param usecase The usecase.
* @param manager The service manager.
- * @param session The session.
* @param document The document to wrap.
* @param logger The logger.
*/
- public WorkflowableWrapper(MultiWorkflow usecase, ServiceManager manager, Session session,
- Document document, Log logger) {
+ public WorkflowableWrapper(MultiWorkflow usecase, ServiceManager manager, Document document,
+ Log logger) {
+ setLogger(logger);
this.usecase = usecase;
this.document = document;
this.manager = manager;
- this.session = session;
}
protected Workflowable getWorkflowable() {
if (this.workflowable == null) {
- this.workflowable = WorkflowUtil.getWorkflowable(this.manager, this.session,
- getLogger(), this.document);
+ this.workflowable = WorkflowUtil.getWorkflowable(this.manager, getLogger(),
+ this.document);
}
return this.workflowable;
}
@@ -91,15 +86,14 @@
}
protected Workflow getWorkflowSchema() throws WorkflowException {
- Workflow workflow = WorkflowUtil.getWorkflowSchema(this.manager, this.session, getLogger(),
- this.document);
+ Workflow workflow = WorkflowUtil
+ .getWorkflowSchema(this.manager, getLogger(), this.document);
return workflow;
}
/**
* @return The path of the document.
- * @throws DocumentException If the document is not referenced in the site
- * structure.
+ * @throws DocumentException If the document is not referenced in the site structure.
*/
public String getPath() throws DocumentException {
return this.document.getPath();
@@ -126,30 +120,30 @@
*/
public boolean canInvoke(String usecaseName) throws WorkflowException {
String event = this.usecase.getEvent(usecaseName);
- return WorkflowUtil.canInvoke(this.manager, this.session, getLogger(), this.document,
- event);
+ return WorkflowUtil.canInvoke(this.manager, getLogger(), this.document, event);
}
-
+
/**
* Returns the current value of a workflow variable.
* @param variable The name of the variable.
* @return The value.
- * @throws WorkflowException if an error occurs.
+ * @throws WorkflowException if an error occurs.
*/
public boolean getValue(String variable) throws WorkflowException {
- Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager, this.session, getLogger(), this.document);
+ Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager, getLogger(),
+ this.document);
if (workflowable.getVersions().length == 0) {
- Workflow workflow = WorkflowUtil.getWorkflowSchema(this.manager, this.session, getLogger(), this.document);
+ Workflow workflow = WorkflowUtil.getWorkflowSchema(this.manager, getLogger(),
+ this.document);
return workflow.getInitialValue(variable);
- }
- else {
+ } else {
return workflowable.getLatestVersion().getValue(variable);
}
}
-
+
/**
* @return The languages of the document in alphabetical order.
- * @throws DocumentException
+ * @throws DocumentException
*/
public String[] getLanguages() throws DocumentException {
String[] languages = this.document.getLanguages();
Modified: lenya/trunk/org.apache.lenya.module.blog/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.blog/pom.xml?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.blog/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.blog/pom.xml Thu Feb 5 15:40:42 2009
@@ -35,5 +35,9 @@
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-workflow</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Deactivate.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Deactivate.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Deactivate.java (original)
+++ lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Deactivate.java Thu Feb 5 15:40:42 2009
@@ -49,7 +49,6 @@
}
String event = getEvent();
if (!WorkflowUtil.canInvoke(this.manager,
- getSession(),
getLogger(),
getSourceDocument(),
event)) {
@@ -101,7 +100,6 @@
documentManager.delete(liveDocument);
WorkflowUtil.invoke(this.manager,
- getSession(),
getLogger(),
authoringDocument,
getEvent());
Modified: lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Delete.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Delete.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Delete.java (original)
+++ lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Delete.java Thu Feb 5 15:40:42 2009
@@ -54,7 +54,6 @@
}
String event = getEvent();
if (!WorkflowUtil.canInvoke(this.manager,
- getSession(),
getLogger(),
getSourceDocument(),
event)) {
@@ -98,7 +97,6 @@
documentManager = (DocumentManager) this.manager.lookup(DocumentManager.ROLE);
documentManager.delete(document);
WorkflowUtil.invoke(this.manager,
- getSession(),
getLogger(),
document,
getEvent());
Modified: lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Publish.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Publish.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Publish.java (original)
+++ lenya/trunk/org.apache.lenya.module.blog/src/main/java/org/apache/lenya/blog/cms/usecases/Publish.java Thu Feb 5 15:40:42 2009
@@ -111,7 +111,7 @@
updateFeed();
documentManager = (DocumentManager) this.manager.lookup(DocumentManager.ROLE);
documentManager.copyToArea(authoringDocument, Publication.LIVE_AREA);
- WorkflowUtil.invoke(this.manager, getSession(), getLogger(), authoringDocument,
+ WorkflowUtil.invoke(this.manager, getLogger(), authoringDocument,
getEvent());
} catch (Exception e) {
throw new RuntimeException(e);
@@ -173,7 +173,7 @@
DocumentHelper.setSimpleElementText(element, datestr);
// set issued date on first time publish
- Workflowable dw = WorkflowUtil.getWorkflowable(this.manager, this.getSession(), this
+ Workflowable dw = WorkflowUtil.getWorkflowable(this.manager, this
.getLogger(), doc);
Version versions[] = dw.getVersions();
boolean wasLive = false;
Modified: lenya/trunk/org.apache.lenya.module.cforms/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.cforms/pom.xml?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.cforms/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.cforms/pom.xml Thu Feb 5 15:40:42 2009
@@ -27,5 +27,13 @@
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-workflow</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.module.editors/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.editors/pom.xml?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.editors/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.module.editors/pom.xml Thu Feb 5 15:40:42 2009
@@ -23,5 +23,29 @@
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-linking</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-workflow</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-module-resource</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xindice</groupId>
+ <artifactId>xindice</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xmldb</groupId>
+ <artifactId>xmldb-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xmldb</groupId>
+ <artifactId>xmldb-xupdate</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/EditDocument.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/EditDocument.java?rev=741146&r1=741145&r2=741146&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/EditDocument.java (original)
+++ lenya/trunk/org.apache.lenya.module.editors/src/main/java/org/apache/lenya/cms/editors/EditDocument.java Thu Feb 5 15:40:42 2009
@@ -30,16 +30,16 @@
/**
* <p>
- * You can use this usecase to save a document. It reads XML data from a source
- * and saves as the content of the current document.
+ * You can use this usecase to save a document. It reads XML data from a source and saves as the
+ * content of the current document.
* </p>
* <ul>
- * <li>If the document's resource type supports validation, the XML document is
- * validated and not saved if validation errors occur.</li>
- * <li>All URL-based internal links in the XML source are converted to
- * UUID-based links before saving.</li>
- * <li>A workflow event is invoked. The event defaults to "edit", you can
- * override it using the <em>event</em> parameter.</li>
+ * <li>If the document's resource type supports validation, the XML document is validated and not
+ * saved if validation errors occur.</li>
+ * <li>All URL-based internal links in the XML source are converted to UUID-based links before
+ * saving.</li>
+ * <li>A workflow event is invoked. The event defaults to "edit", you can override it using the
+ * <em>event</em> parameter.</li>
* </ul>
* <p>
* Parameters:
@@ -49,9 +49,8 @@
* <li><em>event</em> - the workflow event to invoke</li>
* </ul>
* <p>
- * A typical usage scenario is to save XML data entered in a form. In this case,
- * the <em>sourceUri</em> parameter refers to a Cocoon pipeline featuring the
- * stream generator.
+ * A typical usage scenario is to save XML data entered in a form. In this case, the
+ * <em>sourceUri</em> parameter refers to a Cocoon pipeline featuring the stream generator.
* </p>
*
* @version $Id$
@@ -84,8 +83,7 @@
if (!hasErrors()) {
SourceUtil.writeDOM(xmlDoc, sourceDoc.getOutputStream());
String event = getParameterAsString(EVENT, DEFAULT_EVENT);
- WorkflowUtil
- .invoke(this.manager, getSession(), getLogger(), getSourceDocument(), event);
+ WorkflowUtil.invoke(this.manager, getLogger(), getSourceDocument(), event);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org