svn commit: r740583 - in /lenya/trunk: ./ org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/ org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/cocoon/acting/ org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/cocoon/com...
[email protected] Wed, 04 Feb 2009 02:46:43 -0000
Newsgroups
gmane.comp.cms.lenya.cvs
Message-ID
<[email protected] >
Author: froethenbacher
Date: Wed Feb 4 02:46:41 2009
New Revision: 740583
URL: http://svn.apache.org/viewvc?rev=740583&view=rev
Log:
[MIGRATION] Added more dependencies and updated to modifications in Cocoon.
Modified:
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/DefaultAccessController.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/cocoon/acting/DelegatingAuthorizerAction.java
lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/AccessControlModule.java
lenya/trunk/org.apache.lenya.core.acusecases/src/main/java/org/apache/lenya/cms/ac/usecases/Logout.java
lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/Users.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/ac/PolicyUtil.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/publication/PageEnvelope.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/rc/RCEnvironment.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/repository/RepositoryUtil.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/workflow/WorkflowUtil.java
lenya/trunk/org.apache.lenya.core.impl/pom.xml
lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/repository/AxisUUIDGenerator.java
lenya/trunk/org.apache.lenya.core.observation/pom.xml
lenya/trunk/org.apache.lenya.core.sitemanagement/pom.xml
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ClipboardHelper.java
lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Create.java
lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseCronJob.java
lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.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/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/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/Submit.java
lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/WorkflowableWrapper.java
lenya/trunk/org.apache.lenya.optional.jcrsource/pom.xml
lenya/trunk/pom.xml
Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/DefaultAccessController.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/DefaultAccessController.java?rev=740583&r1=740582&r2=740583&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/DefaultAccessController.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/DefaultAccessController.java Wed Feb 4 02:46:41 2009
@@ -137,7 +137,7 @@
protected void resolveRoles(Request request) throws AccessControlException {
String webappUrl = ServletHelper.getWebappURI(request);
- Session session = request.getSession(true);
+ Session session = request.getCocoonSession(true);
Identity identity = (Identity) session.getAttribute(Identity.class.getName());
Role[] roles;
@@ -404,7 +404,7 @@
* @see org.apache.lenya.ac.AccessController#setupIdentity(org.apache.cocoon.environment.Request)
*/
public void setupIdentity(Request request) throws AccessControlException {
- Session session = request.getSession(true);
+ Session session = request.getCocoonSession(true);
if (!hasValidIdentity(session)) {
Identity identity = new Identity(getLogger());
identity.initialize();
Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/cocoon/acting/DelegatingAuthorizerAction.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/cocoon/acting/DelegatingAuthorizerAction.java?rev=740583&r1=740582&r2=740583&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/cocoon/acting/DelegatingAuthorizerAction.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/cocoon/acting/DelegatingAuthorizerAction.java Wed Feb 4 02:46:41 2009
@@ -87,7 +87,7 @@
* @param request The request.
*/
protected void setHistory(Request request) {
- Session session = request.getSession(true);
+ Session session = request.getCocoonSession(true);
Stack history = (Stack) session.getAttribute(HISTORY);
Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/AccessControlModule.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/AccessControlModule.java?rev=740583&r1=740582&r2=740583&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/AccessControlModule.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/AccessControlModule.java Wed Feb 4 02:46:41 2009
@@ -129,7 +129,7 @@
throws ConfigurationException {
Request request = ObjectModelHelper.getRequest(objectModel);
- Session session = request.getSession();
+ Session session = request.getCocoonSession();
Object value = null;
String[] parameters = attribute.split(":", 2);
Modified: lenya/trunk/org.apache.lenya.core.acusecases/src/main/java/org/apache/lenya/cms/ac/usecases/Logout.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.acusecases/src/main/java/org/apache/lenya/cms/ac/usecases/Logout.java?rev=740583&r1=740582&r2=740583&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.acusecases/src/main/java/org/apache/lenya/cms/ac/usecases/Logout.java (original)
+++ lenya/trunk/org.apache.lenya.core.acusecases/src/main/java/org/apache/lenya/cms/ac/usecases/Logout.java Wed Feb 4 02:46:41 2009
@@ -41,7 +41,7 @@
super.initParameters();
Map objectModel = ContextHelper.getObjectModel(getContext());
Request request = ObjectModelHelper.getRequest(objectModel);
- Session session = request.getSession(false);
+ Session session = request.getCocoonSession(false);
if (session != null) {
Vector history = (Vector) session
@@ -57,7 +57,7 @@
Map objectModel = ContextHelper.getObjectModel(getContext());
Request request = ObjectModelHelper.getRequest(objectModel);
- Session session = request.getSession(false);
+ Session session = request.getCocoonSession(false);
if (session != null) {
session.removeAttribute(Identity.class.getName());
Modified: lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/Users.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/Users.java?rev=740583&r1=740582&r2=740583&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/Users.java (original)
+++ lenya/trunk/org.apache.lenya.core.administration/src/main/java/org/apache/lenya/cms/ac/usecases/Users.java Wed Feb 4 02:46:41 2009
@@ -49,7 +49,7 @@
setParameter(USERS, userList);
Request request = ContextHelper.getRequest(getContext());
- Session session = request.getSession(false);
+ Session session = request.getCocoonSession(false);
if (session != null) {
Identity identity = (Identity) session.getAttribute(Identity.class.getName());
if (identity != null) {
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/ac/PolicyUtil.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/ac/PolicyUtil.java?rev=740583&r1=740582&r2=740583&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/ac/PolicyUtil.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/ac/PolicyUtil.java Wed Feb 4 02:46:41 2009
@@ -28,6 +28,7 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.ServiceSelector;
import org.apache.cocoon.environment.Request;
+import org.apache.commons.logging.Log;
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.AccessController;
import org.apache.lenya.ac.AccessControllerResolver;
@@ -78,7 +79,7 @@
* @throws AccessControlException if an error occurs.
*/
public static final User getUser(ServiceManager manager, String webappUrl,
- String userId, Logger logger) throws AccessControlException {
+ String userId, Log logger) throws AccessControlException {
ServiceSelector selector = null;
AccessControllerResolver resolver = null;
AccessController controller = null;
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java?rev=740583&r1=740582&r2=740583&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java Wed Feb 4 02:46:41 2009
@@ -105,7 +105,7 @@
this.backupDirectory = publicationPath + File.separator + this.backupDirectory;
// Get session
- Session session = request.getSession(false);
+ Session session = request.getCocoonSession(false);
if (session == null) {
getLogger().error(".act(): No session object");
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/publication/PageEnvelope.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/publication/PageEnvelope.java?rev=740583&r1=740582&r2=740583&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/publication/PageEnvelope.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/publication/PageEnvelope.java Wed Feb 4 02:46:41 2009
@@ -24,6 +24,8 @@
import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.cocoon.environment.Request;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.lenya.cms.rc.RCEnvironment;
/**
@@ -31,6 +33,7 @@
* document.
*/
public class PageEnvelope {
+ private final static Log logger = LogFactory.getLog(PageEnvelope.class);
/**
* The names of the page envelope parameters.
*/
@@ -260,7 +263,7 @@
*/
public RCEnvironment getRCEnvironment() {
return RCEnvironment.getInstance(getPublication().getServletContext().getAbsolutePath(),
- new ConsoleLogger());
+ logger);
}
/**
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/rc/RCEnvironment.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/rc/RCEnvironment.java?rev=740583&r1=740582&r2=740583&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/rc/RCEnvironment.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/rc/RCEnvironment.java Wed Feb 4 02:46:41 2009
@@ -31,6 +31,7 @@
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
import org.xml.sax.SAXException;
/**
@@ -62,7 +63,7 @@
* @param logger The logger.
* @return An RC environment.
*/
- public static RCEnvironment getInstance(String contextPath, Logger logger) {
+ public static RCEnvironment getInstance(String contextPath, Log logger) {
RCEnvironment instance = (RCEnvironment) instances.get(contextPath);
if (instance == null) {
instance = new RCEnvironment(contextPath, logger);
@@ -76,8 +77,7 @@
* @param contextPath The context path
* @param logger The logger.
*/
- public RCEnvironment(String contextPath, Logger logger) {
- enableLogging(logger);
+ public RCEnvironment(String contextPath, Log logger) {
getLogger().debug("context path:" + contextPath);
String configurationFilePath = contextPath + "/" + CONFIGURATION_FILE;
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/repository/RepositoryUtil.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/repository/RepositoryUtil.java?rev=740583&r1=740582&r2=740583&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/repository/RepositoryUtil.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/repository/RepositoryUtil.java Wed Feb 4 02:46:41 2009
@@ -51,7 +51,7 @@
}
protected static Identity getIdentity(Request request) {
- org.apache.cocoon.environment.Session cocoonSession = request.getSession();
+ org.apache.cocoon.environment.Session cocoonSession = request.getCocoonSession();
Identity identity = (Identity) cocoonSession.getAttribute(Identity.class.getName());
return identity;
}
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java?rev=740583&r1=740582&r2=740583&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java Wed Feb 4 02:46:41 2009
@@ -31,6 +31,7 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.commons.logging.Log;
import org.apache.lenya.ac.Identity;
import org.apache.lenya.ac.User;
import org.apache.lenya.cms.metadata.MetaData;
@@ -59,14 +60,13 @@
* @param logger The logger.
*/
public DocumentWorkflowable(ServiceManager manager, Session session, Document document,
- Logger logger) {
+ Log logger) {
if (session.getIdentity() == null) {
throw new IllegalArgumentException("The session must have an identity.");
}
this.document = document;
this.session = session;
this.manager = manager;
- ContainerUtil.enableLogging(this, logger);
}
private Session session;
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/workflow/WorkflowUtil.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/workflow/WorkflowUtil.java?rev=740583&r1=740582&r2=740583&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/workflow/WorkflowUtil.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/workflow/WorkflowUtil.java Wed Feb 4 02:46:41 2009
@@ -20,6 +20,7 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.commons.logging.Log;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.util.DocumentSet;
import org.apache.lenya.cms.repository.Session;
@@ -45,7 +46,7 @@
* @param event The name of the event.
* @throws WorkflowException if the event could not be invoked in the current situation.
*/
- public static void invoke(ServiceManager manager, Session session, Logger logger,
+ public static void invoke(ServiceManager manager, Session session, Log logger,
Document document, String event) throws WorkflowException {
WorkflowManager wfManager = null;
try {
@@ -74,7 +75,7 @@
* set to <code>false</code>, non-supporting documents are ignored.
* @throws WorkflowException if the event could not be invoked in the current situation.
*/
- public static void invoke(ServiceManager manager, Session session, Logger logger,
+ public static void invoke(ServiceManager manager, Session session, Log logger,
Document document, String event, boolean force) throws WorkflowException {
WorkflowManager wfManager = null;
try {
@@ -227,7 +228,7 @@
* @throws WorkflowException if an error occurs.
*/
public static Workflow getWorkflowSchema(ServiceManager manager, Session session,
- Logger logger, Document document) throws WorkflowException {
+ Log logger, Document document) throws WorkflowException {
WorkflowManager wfManager = null;
try {
wfManager = (WorkflowManager) manager.lookup(WorkflowManager.ROLE);
@@ -255,7 +256,7 @@
* @return A workflowable.
*/
public static Workflowable getWorkflowable(ServiceManager manager, Session session,
- Logger logger, Document document) {
+ Log logger, Document document) {
Workflowable workflowable = new DocumentWorkflowable(manager, session, document, logger);
return workflowable;
}
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=740583&r1=740582&r2=740583&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.impl/pom.xml Wed Feb 4 02:46:41 2009
@@ -14,5 +14,17 @@
<packaging>jar</packaging>
<name>Apache Lenya Core Implementation</name>
<dependencies>
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-api</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/repository/AxisUUIDGenerator.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/repository/AxisUUIDGenerator.java?rev=740583&r1=740582&r2=740583&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/repository/AxisUUIDGenerator.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/repository/AxisUUIDGenerator.java Wed Feb 4 02:46:41 2009
@@ -27,6 +27,7 @@
*/
public class AxisUUIDGenerator extends AbstractLogEnabled implements UUIDGenerator, ThreadSafe {
+ // FIXME Get rid of this absurd dependency on Axis!! - fr
private UUIDGen delegate;
protected UUIDGen getDelegate() {
Modified: lenya/trunk/org.apache.lenya.core.observation/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.observation/pom.xml?rev=740583&r1=740582&r2=740583&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.observation/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.observation/pom.xml Wed Feb 4 02:46:41 2009
@@ -13,4 +13,18 @@
<artifactId>lenya-core-observation</artifactId>
<packaging>jar</packaging>
<name>Apache Lenya Core Observation</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-api</artifactId>
+ </dependency>
+ </dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/pom.xml?rev=740583&r1=740582&r2=740583&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/pom.xml Wed Feb 4 02:46:41 2009
@@ -15,8 +15,25 @@
<name>Apache Lenya Core Site Management</name>
<dependencies>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-usecase</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-workflow</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-monitoring</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ClipboardHelper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ClipboardHelper.java?rev=740583&r1=740582&r2=740583&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ClipboardHelper.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/ClipboardHelper.java Wed Feb 4 02:46:41 2009
@@ -58,7 +58,7 @@
protected Session getSession(Context context) {
Map objectModel = ContextHelper.getObjectModel(context);
Request request = ObjectModelHelper.getRequest(objectModel);
- Session session = request.getSession(true);
+ Session session = request.getCocoonSession(true);
return session;
}
Modified: lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Create.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Create.java?rev=740583&r1=740582&r2=740583&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Create.java (original)
+++ lenya/trunk/org.apache.lenya.core.sitemanagement/src/main/java/org/apache/lenya/cms/site/usecases/Create.java Wed Feb 4 02:46:41 2009
@@ -290,7 +290,7 @@
Map objectModel = ContextHelper.getObjectModel(getContext());
Request request = ObjectModelHelper.getRequest(objectModel);
- Session session = request.getSession(false);
+ Session session = request.getCocoonSession(false);
Identity identity = (Identity) session.getAttribute(Identity.class.getName());
User user = identity.getUser();
if (user != null) {
Modified: lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseCronJob.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseCronJob.java?rev=740583&r1=740582&r2=740583&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseCronJob.java (original)
+++ lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseCronJob.java Wed Feb 4 02:46:41 2009
@@ -174,7 +174,7 @@
Request request = ContextHelper.getRequest(this.context);
controller.setupIdentity(request);
- Session session = request.getSession(false);
+ Session session = request.getCocoonSession(false);
Identity identity = (Identity) session.getAttribute(Identity.class.getName());
Identifiable[] identifiables = identity.getIdentifiables();
for (int i = 0; i < identifiables.length; i++) {
Modified: lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java?rev=740583&r1=740582&r2=740583&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.usecase/src/main/java/org/apache/lenya/cms/usecase/scheduling/impl/UsecaseSchedulerImpl.java Wed Feb 4 02:46:41 2009
@@ -88,7 +88,7 @@
String userId = "";
Request request = ContextHelper.getRequest(this.context);
- Session session = request.getSession(false);
+ Session session = request.getCocoonSession(false);
if (session != null) {
Identity identity = (Identity) session.getAttribute(Identity.class.getName());
if (identity != null) {
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=740583&r1=740582&r2=740583&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 Wed Feb 4 02:46:41 2009
@@ -27,6 +27,8 @@
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;
@@ -43,6 +45,7 @@
* @version $Id$
*/
public class WorkflowModule extends AbstractPageEnvelopeModule {
+ private static final Log logger = LogFactory.getLog(WorkflowModule.class);
/**
* <code>STATE</code> The state
@@ -87,7 +90,7 @@
ObjectModelHelper.getRequest(objectModel));
Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager,
session,
- getLogger(),
+ logger,
document);
if (wfManager.hasWorkflow(workflowable)) {
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=740583&r1=740582&r2=740583&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 Wed Feb 4 02:46:41 2009
@@ -17,6 +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;
@@ -28,6 +30,7 @@
* @version $Id$
*/
public class History extends DocumentUsecase {
+ private static final Log logger = LogFactory.getLog(History.class);
/**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#initParameters() TODO
@@ -38,7 +41,7 @@
if (getSourceDocument() != null) {
Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager, getSession(),
- getLogger(), getSourceDocument());
+ logger, getSourceDocument());
Version[] versions = workflowable.getVersions();
setParameter("versions", versions);
}
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=740583&r1=740582&r2=740583&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 Wed Feb 4 02:46:41 2009
@@ -17,6 +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.repository.Node;
import org.apache.lenya.cms.usecase.UsecaseException;
import org.apache.lenya.cms.workflow.WorkflowUtil;
@@ -36,6 +38,7 @@
* @version $Id$
*/
public class InvokeWorkflow extends CheckWorkflow {
+ private static final Log logger = LogFactory.getLog(InvokeWorkflow.class);
/**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#getNodesToLock()
@@ -53,7 +56,7 @@
*/
protected void doExecute() throws Exception {
super.doExecute();
- WorkflowUtil.invoke(this.manager, getSession(), getLogger(), getSourceDocument(),
+ WorkflowUtil.invoke(this.manager, getSession(), logger, getSourceDocument(),
getEvent());
}
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=740583&r1=740582&r2=740583&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 Wed Feb 4 02:46:41 2009
@@ -32,6 +32,8 @@
import org.apache.avalon.framework.service.ServiceSelector;
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;
@@ -60,6 +62,7 @@
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;
@@ -73,6 +76,7 @@
* @version $Id$
*/
public class Publish extends InvokeWorkflow {
+ private static final Log logger = LogFactory.getLog(Publish.class);
/**
* If the usecase should check for missing live ancestors in {@link #checkPreconditions()}.
@@ -123,7 +127,7 @@
boolean shallNotifySubmitter = false;
Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager, getSession(),
- getLogger(), getSourceDocument());
+ logger, getSourceDocument());
Version versions[] = workflowable.getVersions();
// consider the case that there was no submit transition
@@ -383,7 +387,7 @@
}
Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager, getSession(),
- getLogger(), authoringDocument);
+ logger, authoringDocument);
Version versions[] = workflowable.getVersions();
// obtain submitted version
@@ -391,7 +395,7 @@
String userId = version.getUserId();
User user = PolicyUtil.getUser(this.manager, authoringDocument.getCanonicalWebappURL(),
- userId, getLogger());
+ userId, logger);
Identifiable[] recipients = { user };
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=740583&r1=740582&r2=740583&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 Wed Feb 4 02:46:41 2009
@@ -19,6 +19,8 @@
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;
@@ -31,6 +33,7 @@
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;
@@ -42,6 +45,7 @@
* Reject usecase handler.
*/
public class Reject extends InvokeWorkflow {
+ private static final Log logger = LogFactory.getLog(Reject.class);
/**
* The reason for rejection.
@@ -77,7 +81,7 @@
String reason = getParameterAsString(PARAM_REJECT_REASON);
Workflowable workflowable = WorkflowUtil.getWorkflowable(this.manager, getSession(),
- getLogger(), authoringDocument);
+ logger, authoringDocument);
Version versions[] = workflowable.getVersions();
// current version is reject, want originating submit
Version version = versions[versions.length - 2];
@@ -88,7 +92,7 @@
String userId = version.getUserId();
User user = PolicyUtil.getUser(this.manager, authoringDocument.getCanonicalWebappURL(),
- userId, getLogger());
+ userId, logger);
Identifiable[] recipients = { user };
Modified: lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Submit.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Submit.java?rev=740583&r1=740582&r2=740583&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Submit.java (original)
+++ lenya/trunk/org.apache.lenya.core.workflow/src/main/java/org/apache/lenya/cms/workflow/usecases/Submit.java Wed Feb 4 02:46:41 2009
@@ -28,10 +28,11 @@
import org.apache.lenya.cms.publication.DocumentException;
import org.apache.lenya.cms.publication.Proxy;
import org.apache.lenya.cms.publication.Publication;
-import org.apache.lenya.notification.NotificationException;
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;
import org.apache.lenya.notification.Text;
/**
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=740583&r1=740582&r2=740583&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 Wed Feb 4 02:46:41 2009
@@ -23,6 +23,8 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceManager;
+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;
@@ -35,7 +37,8 @@
* Wrap a workflowable for easy evaluation in JX template.
*/
public class WorkflowableWrapper extends AbstractLogEnabled {
-
+ private static final Log logger = LogFactory.getLog(WorkflowableWrapper.class);
+
private MultiWorkflow usecase;
private Workflowable workflowable;
private ServiceManager manager;
@@ -62,7 +65,7 @@
protected Workflowable getWorkflowable() {
if (this.workflowable == null) {
this.workflowable = WorkflowUtil.getWorkflowable(this.manager, this.session,
- getLogger(), this.document);
+ logger, this.document);
}
return this.workflowable;
}
@@ -91,7 +94,7 @@
}
protected Workflow getWorkflowSchema() throws WorkflowException {
- Workflow workflow = WorkflowUtil.getWorkflowSchema(this.manager, this.session, getLogger(),
+ Workflow workflow = WorkflowUtil.getWorkflowSchema(this.manager, this.session, logger,
this.document);
return workflow;
}
@@ -137,9 +140,9 @@
* @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, this.session, logger, this.document);
if (workflowable.getVersions().length == 0) {
- Workflow workflow = WorkflowUtil.getWorkflowSchema(this.manager, this.session, getLogger(), this.document);
+ Workflow workflow = WorkflowUtil.getWorkflowSchema(this.manager, this.session, logger, this.document);
return workflow.getInitialValue(variable);
}
else {
Modified: lenya/trunk/org.apache.lenya.optional.jcrsource/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.optional.jcrsource/pom.xml?rev=740583&r1=740582&r2=740583&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.optional.jcrsource/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.optional.jcrsource/pom.xml Wed Feb 4 02:46:41 2009
@@ -13,4 +13,46 @@
<artifactId>lenya-optional-jcrsource</artifactId>
<packaging>jar</packaging>
<name>Apache Lenya Optional JCR Source</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>${jcr.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-api</artifactId>
+ <version>${jackrabbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ <version>${jackrabbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-jcr-impl</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-metadata</artifactId>
+ </dependency>
+ </dependencies>
+ <properties>
+ <jcr.version>1.0</jcr.version>
+ <jackrabbit.version>1.5.0</jackrabbit.version>
+ </properties>
</project>
Modified: lenya/trunk/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/pom.xml?rev=740583&r1=740582&r2=740583&view=diff
==============================================================================
--- lenya/trunk/pom.xml (original)
+++ lenya/trunk/pom.xml Wed Feb 4 02:46:41 2009
@@ -159,6 +159,16 @@
</dependency>
<dependency>
<groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-metadata</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-monitoring</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-usecase</artifactId>
<version>${project.version}</version>
</dependency>