You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by fl...@apache.org on 2010/11/09 19:43:14 UTC
svn commit: r1033147 - in
/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms:
cocoon/components/ cocoon/components/modules/
cocoon/components/modules/input/ publication/
Author: florent
Date: Tue Nov 9 18:43:13 2010
New Revision: 1033147
URL: http://svn.apache.org/viewvc?rev=1033147&view=rev
Log:
move implementation classes from core.api to core.impl
Added:
lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/cocoon/components/
lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/cocoon/components/modules/
lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/
- copied from r1027508, lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/
Modified:
lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/AbstractPageEnvelopeModule.java
lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java
lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/SessionImpl.java
Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/AbstractPageEnvelopeModule.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/AbstractPageEnvelopeModule.java?rev=1033147&r1=1027508&r2=1033147&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/AbstractPageEnvelopeModule.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/AbstractPageEnvelopeModule.java Tue Nov 9 18:43:13 2010
@@ -29,9 +29,8 @@ import org.apache.lenya.cms.publication.
import org.apache.lenya.cms.publication.PageEnvelopeFactory;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.Session;
-import org.apache.lenya.cms.publication.URLInformation;
import org.apache.lenya.util.ServletHelper;
-
+import org.apache.lenya.utils.URLInformation;
/**
* Abstract superclass for classes which need access to the page envelope.
*
@@ -50,7 +49,8 @@ public abstract class AbstractPageEnvelo
String webappUrl = null;
Request request = ObjectModelHelper.getRequest(objectModel);
-
+ URLInformation urlInfo = new URLInformation();
+
PageEnvelope envelope = (PageEnvelope) request.getAttribute(PageEnvelope.class.getName());
if (envelope == null) {
@@ -58,7 +58,7 @@ public abstract class AbstractPageEnvelo
if (snippets.length > 1) {
webappUrl = snippets[1];
} else {
- webappUrl = ServletHelper.getWebappURI(request);
+ webappUrl = urlInfo.getWebappUrl();
}
if (getLogger().isDebugEnabled()) {
@@ -70,7 +70,7 @@ public abstract class AbstractPageEnvelo
try {
Session session = getSession();
Publication pub = null;
- String pubId = new URLInformation(webappUrl).getPublicationId();
+ String pubId = urlInfo.getPublicationId();
if (pubId != null && session.existsPublication(pubId)) {
pub = session.getPublication(pubId);
}
Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java?rev=1033147&r1=1027508&r2=1033147&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java Tue Nov 9 18:43:13 2010
@@ -29,8 +29,6 @@ import java.util.Map;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Request;
import org.apache.commons.lang.StringUtils;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentLocator;
@@ -38,7 +36,7 @@ import org.apache.lenya.cms.publication.
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.ResourceType;
import org.apache.lenya.cms.site.SiteException;
-import org.apache.lenya.util.ServletHelper;
+import org.apache.lenya.utils.URLInformation;
/**
* Input module wrapping the page envelope. This module provides publication
@@ -154,8 +152,8 @@ public class PageEnvelopeModule extends
Document doc = envelope.getDocument();
if (doc == null) {
Publication pub = envelope.getPublication();
- Request request = ObjectModelHelper.getRequest(objectModel);
- String url = ServletHelper.getWebappURI(request);
+ URLInformation info = new URLInformation();
+ String url = info.getWebappUrl();
DocumentLocator loc;
try {
loc = pub.getDocumentBuilder().getLocator(pub.getSession(), url);
Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/SessionImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/SessionImpl.java?rev=1033147&r1=1033146&r2=1033147&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/SessionImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/SessionImpl.java Tue Nov 9 18:43:13 2010
@@ -26,6 +26,9 @@ import org.apache.lenya.cms.observation.
import org.apache.lenya.cms.repository.SessionHolder;
import org.apache.lenya.transaction.UnitOfWork;
+/**
+ * @deprecated solve the concurrency beetween lenya-core-repository/o.a.l.cms.repository.SessionImpl and lenya-core-impl/o.a.l.cms.publication.SEssionImpl
+ */
public class SessionImpl implements Session, SessionHolder {
private static final Log logger = LogFactory.getLog(SessionImpl.class);
@@ -79,16 +82,14 @@ public class SessionImpl implements Sess
return ((IdentityWrapper) getRepositorySession().getIdentity()).getIdentity();
}
- private UnitOfWork unitOfWork;
-
/**
* @return The unit of work.
*/
protected UnitOfWork getUnitOfWork() {
- if (this.unitOfWork == null) {
- throw new RuntimeException("This session [" + getId() + "] is not modifiable!");
- }
- return this.unitOfWork;
+ if (repositorySession == null){
+ throw new RuntimeException("This session [" + getId() + "] is not modifiable!");
+ }
+ return repositorySession;
}
public String getId() {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org