svn commit: r232826 - in /lenya/trunk/src/publets: jcr/java/src/org/apache/lenya/cms/jcr/JCRNodeFactory.java jcr/java/src/org/apache/lenya/cms/jcr/JCRSourceNode.java sitetree/java/src/org/apache/lenya/cms/site/usecases/Nudge.java

Author: andreas
Date: Mon Aug 15 08:33:11 2005
New Revision: 232826

URL: http://svn.apache.org/viewcvs?rev=232826&view=rev
Log:
[Refactoring] Hide transaction handling below repository layer

Modified:
    
lenya/trunk/src/publets/jcr/java/src/org/apache/lenya/cms/jcr/JCRNodeFactory.java
    
lenya/trunk/src/publets/jcr/java/src/org/apache/lenya/cms/jcr/JCRSourceNode.java
    
lenya/trunk/src/publets/sitetree/java/src/org/apache/lenya/cms/site/usecases/Nudge.java

Modified: 
lenya/trunk/src/publets/jcr/java/src/org/apache/lenya/cms/jcr/JCRNodeFactory.java
URL: 
http://svn.apache.org/viewcvs/lenya/trunk/src/publets/jcr/java/src/org/apache/lenya/cms/jcr/JCRNodeFactory.java?rev=232826&r1=232825&r2=232826&view=diff
==============================================================================
--- 
lenya/trunk/src/publets/jcr/java/src/org/apache/lenya/cms/jcr/JCRNodeFactory.java
 (original)
+++ 
lenya/trunk/src/publets/jcr/java/src/org/apache/lenya/cms/jcr/JCRNodeFactory.java
 Mon Aug 15 08:33:11 2005
@@ -16,27 +16,23 @@
  */
 package org.apache.lenya.cms.jcr;
 
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
-import org.apache.lenya.cms.cocoon.source.SourceUtil;
 import org.apache.lenya.cms.repository.Node;
 import org.apache.lenya.cms.repository.NodeFactory;
-import org.apache.lenya.cms.repository.SourceNode;
+import org.apache.lenya.cms.repository.Session;
 import org.apache.lenya.transaction.Identifiable;
 import org.apache.lenya.transaction.IdentityMap;
-import org.apache.lenya.xml.DocumentHelper;
-import org.w3c.dom.Document;
 
+/**
+ * JCR node factory.
+ */
 public class JCRNodeFactory extends AbstractLogEnabled implements NodeFactory, 
Serviceable {
 
     public Identifiable build(IdentityMap map, String key) throws Exception {
-        return new JCRSourceNode(map, key, this.manager, getLogger());
+        return new JCRSourceNode(this.session, key, this.manager, getLogger());
     }
 
     public String getType() {
@@ -47,6 +43,12 @@
 
     public void service(ServiceManager manager) throws ServiceException {
         this.manager = manager;
+    }
+    
+    private Session session;
+
+    public void setSession(Session session) {
+        this.session = session;
     }
 
 }

Modified: 
lenya/trunk/src/publets/jcr/java/src/org/apache/lenya/cms/jcr/JCRSourceNode.java
URL: 
http://svn.apache.org/viewcvs/lenya/trunk/src/publets/jcr/java/src/org/apache/lenya/cms/jcr/JCRSourceNode.java?rev=232826&r1=232825&r2=232826&view=diff
==============================================================================
--- 
lenya/trunk/src/publets/jcr/java/src/org/apache/lenya/cms/jcr/JCRSourceNode.java
 (original)
+++ 
lenya/trunk/src/publets/jcr/java/src/org/apache/lenya/cms/jcr/JCRSourceNode.java
 Mon Aug 15 08:33:11 2005
@@ -21,8 +21,8 @@
 import org.apache.lenya.cms.jcr.metadata.JCRMetaDataManager;
 import org.apache.lenya.cms.metadata.MetaDataManager;
 import org.apache.lenya.cms.publication.DocumentException;
+import org.apache.lenya.cms.repository.Session;
 import org.apache.lenya.cms.repository.SourceNode;
-import org.apache.lenya.transaction.IdentityMap;
 
 /**
  * JCR based source node.
@@ -33,13 +33,13 @@
 
     /**
      * Ctor.
-     * @param map The identity map.
+     * @param session The session.
      * @param sourceURI The source URI.
      * @param manager The service manager.
      * @param logger The logger.
      */
-    public JCRSourceNode(IdentityMap map, String sourceURI, ServiceManager 
manager, Logger logger) {
-        super(map, sourceURI, manager, logger);
+    public JCRSourceNode(Session session, String sourceURI, ServiceManager 
manager, Logger logger) {
+        super(session, sourceURI, manager, logger);
         this.sourceUri = sourceURI;
     }
 

Modified: 
lenya/trunk/src/publets/sitetree/java/src/org/apache/lenya/cms/site/usecases/Nudge.java
URL: 
http://svn.apache.org/viewcvs/lenya/trunk/src/publets/sitetree/java/src/org/apache/lenya/cms/site/usecases/Nudge.java?rev=232826&r1=232825&r2=232826&view=diff
==============================================================================
--- 
lenya/trunk/src/publets/sitetree/java/src/org/apache/lenya/cms/site/usecases/Nudge.java
 (original)
+++ 
lenya/trunk/src/publets/sitetree/java/src/org/apache/lenya/cms/site/usecases/Nudge.java
 Mon Aug 15 08:33:11 2005
@@ -27,7 +27,6 @@
 import org.apache.lenya.cms.site.tree.SiteTreeNode;
 import org.apache.lenya.cms.usecase.DocumentUsecase;
 import org.apache.lenya.cms.usecase.UsecaseException;
-import org.apache.lenya.transaction.Transactionable;
 
 /**
  * Nudge a document one position up or down.
@@ -93,9 +92,9 @@
     }
 
     /**
-     * @see org.apache.lenya.cms.usecase.AbstractUsecase#getObjectsToLock()
+     * @see org.apache.lenya.cms.usecase.AbstractUsecase#getNodesToLock()
      */
-    protected Transactionable[] getObjectsToLock() throws UsecaseException {
+    protected Node[] getNodesToLock() throws UsecaseException {
         try {
             Node node = SiteUtil.getSiteStructure(this.manager, 
getSourceDocument())
                     .getRepositoryNode();