svn commit: r1096979 - in /lenya/trunk/org.apache.lenya.core.repository.api: ./ src/main/java/org/apache/lenya/cms/observation/ src/main/java/org/apache/lenya/cms/publication/ src/main/java/org/apache/lenya/cms/repository/
[email protected] Wed, 27 Apr 2011 01:54:03 -0000
| Newsgroups | gmane.comp.cms.lenya.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: florent
Date: Wed Apr 27 01:54:03 2011
New Revision: 1096979
URL: http://svn.apache.org/viewvc?rev=1096979&view=rev
Log:
clean the repository api module
Added:
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/SharedItemStore.java
Removed:
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/Session.java
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/SessionHolder.java
Modified:
lenya/trunk/org.apache.lenya.core.repository.api/pom.xml
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/observation/RepositoryEvent.java
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/publication/Repository.java
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/Node.java
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/RepositoryItem.java
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/RepositoryItemFactory.java
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/RepositoryManager.java
Modified: lenya/trunk/org.apache.lenya.core.repository.api/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.repository.api/pom.xml?rev=1096979&r1=1096978&r2=1096979&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.repository.api/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.repository.api/pom.xml Wed Apr 27 01:54:03 2011
@@ -12,45 +12,22 @@
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-repository-api</artifactId>
<packaging>jar</packaging>
- <name>Apache Lenya repository API</name>
+ <name>Apache Lenya Repository API</name>
<description>API that define a repository</description>
<dependencies>
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-transaction-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-metadata-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-identity</artifactId>
- </dependency>
-
- <!-- TODO : see if all theses dependencies are required -->
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-servlet-service-components</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-template-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-flowscript-impl</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-transaction-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-metadata-api</artifactId>
+ </dependency>
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/observation/RepositoryEvent.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/observation/RepositoryEvent.java?rev=1096979&r1=1096978&r2=1096979&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/observation/RepositoryEvent.java (original)
+++ lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/observation/RepositoryEvent.java Wed Apr 27 01:54:03 2011
@@ -1,13 +1,13 @@
package org.apache.lenya.cms.observation;
-import org.apache.lenya.cms.repository.Session;
+//florent remove session import org.apache.lenya.cms.repository.Session;
public interface RepositoryEvent {
/**
* @return The session.
*/
- public abstract Session getSession();
+ //public abstract Session getSession();
/**
* @return The descriptor.
Modified: lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/publication/Repository.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/publication/Repository.java?rev=1096979&r1=1096978&r2=1096979&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/publication/Repository.java (original)
+++ lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/publication/Repository.java Wed Apr 27 01:54:03 2011
@@ -20,19 +20,19 @@ package org.apache.lenya.cms.publication
import javax.servlet.http.HttpServletRequest;
//florent : changed cause of module change of this class
//import org.apache.lenya.cms.publication.Session;
-import org.apache.lenya.cms.repository.Session;
+//import org.apache.lenya.cms.repository.Session;
//import org.apache.lenya.ac.Identity;
public interface Repository {
- Session getSession(HttpServletRequest request);
+ //Session getSession(HttpServletRequest request);
//florent : remove as it create cycliq dependencies.
//note : can be re-enable now as identity is in lenya-core-identity
// suppress this comment when ok
//Session startSession(Identity identity, boolean modifiable);
- void removeSession(HttpServletRequest request);
+ //void removeSession(HttpServletRequest request);
}
Modified: lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/Node.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/Node.java?rev=1096979&r1=1096978&r2=1096979&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/Node.java (original)
+++ lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/Node.java Wed Apr 27 01:54:03 2011
@@ -30,7 +30,7 @@ public interface Node extends Repository
/**
* @return The session this node belongs to.
*/
- Session getRepositorySession();
+ //Session getRepositorySession();
/**
* The protocol with which to find Lenya nodes
Modified: lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/RepositoryItem.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/RepositoryItem.java?rev=1096979&r1=1096978&r2=1096979&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/RepositoryItem.java (original)
+++ lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/RepositoryItem.java Wed Apr 27 01:54:03 2011
@@ -25,6 +25,6 @@ public interface RepositoryItem {
/**
* @return The session this item belongs to.
*/
- Session getRepositorySession();
+ //Session getRepositorySession();
}
Modified: lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/RepositoryItemFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/RepositoryItemFactory.java?rev=1096979&r1=1096978&r2=1096979&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/RepositoryItemFactory.java (original)
+++ lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/RepositoryItemFactory.java Wed Apr 27 01:54:03 2011
@@ -33,6 +33,8 @@ public interface RepositoryItemFactory {
* @return A repository item.
* @throws RepositoryException if an error occurs.
*/
- RepositoryItem buildItem(Session session, String key) throws RepositoryException;
+ //florent : remove session
+ //RepositoryItem buildItem(Session session, String key) throws RepositoryException;
+ RepositoryItem buildItem(String key) throws RepositoryException;
}
Modified: lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/RepositoryManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/RepositoryManager.java?rev=1096979&r1=1096978&r2=1096979&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/RepositoryManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/RepositoryManager.java Wed Apr 27 01:54:03 2011
@@ -18,7 +18,7 @@
package org.apache.lenya.cms.repository;
//florent import org.apache.lenya.transaction.Identity;
-import org.apache.lenya.ac.Identity;
+//import org.apache.lenya.ac.Identity;
/**
* Repository manager.
@@ -36,6 +36,6 @@ public interface RepositoryManager {
* @return A session.
* @throws RepositoryException if an error occurs.
*/
- Session createSession(Identity identity, boolean modifiable) throws RepositoryException;
+ //Session createSession(Identity identity, boolean modifiable) throws RepositoryException;
}
Added: lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/SharedItemStore.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/SharedItemStore.java?rev=1096979&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/SharedItemStore.java (added)
+++ lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/SharedItemStore.java Wed Apr 27 01:54:03 2011
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.lenya.cms.repository;
+
+//import org.apache.lenya.transaction.IdentityMap;
+
+/**
+ * Store for read-only items which are shared by all sessions for performance reasons.
+ */
+public interface SharedItemStore extends Session {
+
+ /**
+ * The service role.
+ */
+ String ROLE = SharedItemStore.class.getName();
+
+ /**
+ * Clears the store when a session has been committed.
+ */
+ //void clear();
+
+ //Session getSession();
+
+}