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/24 15:14:08 UTC
svn commit: r1038611 - in /lenya/trunk/org.apache.lenya.core.repository.api:
./ src/main/java/org/apache/lenya/cms/publication/
src/main/java/org/apache/lenya/cms/rc/
src/main/java/org/apache/lenya/cms/repository/
Author: florent
Date: Wed Nov 24 14:14:07 2010
New Revision: 1038611
URL: http://svn.apache.org/viewvc?rev=1038611&view=rev
Log:
- add interfaces declaration - solve dependencies
Added:
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/publication/LockException.java
- copied, changed from r1034526, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/LockException.java
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/rc/
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/rc/RCML.java
- copied, changed from r1034526, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/rc/RCML.java
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/rc/RCMLEntry.java
- copied, changed from r1034526, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/rc/RCMLEntry.java
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/rc/RevisionControlException.java
- copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/rc/RevisionControlException.java
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/ContentHolder.java
- copied, changed from r1034526, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/ContentHolder.java
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/History.java
- copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/History.java
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/Node.java
- copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.repository.impl/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/NodeFactory.java
- copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/NodeFactory.java
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/Persistable.java
- copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/Persistable.java
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/RepositoryException.java
- copied, changed from r1034526, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/RepositoryException.java
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/RepositoryItem.java
- copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.repository.impl/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
- copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.repository.impl/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
- copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/RepositoryManager.java
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/Revision.java
- copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/Revision.java
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/SessionHolder.java
- copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/SessionHolder.java
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/SharedItemStore.java
- copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/SharedItemStore.java
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/UUIDGenerator.java
- copied unchanged from r1034526, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/UUIDGenerator.java
Removed:
lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/publication/Repository.java
Modified:
lenya/trunk/org.apache.lenya.core.repository.api/pom.xml
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=1038611&r1=1038610&r2=1038611&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.repository.api/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.repository.api/pom.xml Wed Nov 24 14:14:07 2010
@@ -18,8 +18,13 @@
<dependencies>
<dependency>
<groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-transaction</artifactId>
+ <artifactId>lenya-core-transaction-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-metadata-api</artifactId>
+ </dependency>
+
<!-- TODO : see if all theses dependencies are required -->
<dependency>
<groupId>org.apache.cocoon</groupId>
Copied: lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/publication/LockException.java (from r1034526, lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/LockException.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/publication/LockException.java?p2=lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/publication/LockException.java&p1=lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/LockException.java&r1=1034526&r2=1038611&rev=1038611&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.publication.impl/src/main/java/org/apache/lenya/cms/publication/LockException.java (original)
+++ lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/publication/LockException.java Wed Nov 24 14:14:07 2010
@@ -1,5 +1,7 @@
package org.apache.lenya.cms.publication;
+import org.apache.lenya.cms.repository.RepositoryException;
+
public class LockException extends RepositoryException {
}
Copied: lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/rc/RCML.java (from r1034526, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/rc/RCML.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/rc/RCML.java?p2=lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/rc/RCML.java&p1=lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/rc/RCML.java&r1=1034526&r2=1038611&rev=1038611&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/rc/RCML.java (original)
+++ lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/rc/RCML.java Wed Nov 24 14:14:07 2010
@@ -69,15 +69,19 @@ public interface RCML {
* @return CheckOutEntry The entry of the check out
* @throws RevisionControlException if an error occurs
*/
- CheckOutEntry getLatestCheckOutEntry() throws RevisionControlException;
+ //FLorent : modification during the 2.2 refactoring, as CheckOutEntry and CheckInEntry
+ //seems not to be "real" interfaces.
+ //Remove theses comments when working.
+ //CheckOutEntry getLatestCheckOutEntry() throws RevisionControlException;
+ RCMLEntry getLatestCheckOutEntry() throws RevisionControlException;
/**
* get the latest check in
* @return CheckInEntry The entry of the check in
* @throws RevisionControlException if an error occurs
*/
- CheckInEntry getLatestCheckInEntry() throws RevisionControlException;
-
+ //CheckInEntry getLatestCheckInEntry() throws RevisionControlException;
+ RCMLEntry getLatestCheckInEntry() throws RevisionControlException;
/**
* get the latest entry (a check out or check in)
* @return RCMLEntry The entry of the check out/in
Copied: lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/rc/RCMLEntry.java (from r1034526, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/rc/RCMLEntry.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/rc/RCMLEntry.java?p2=lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/rc/RCMLEntry.java&p1=lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/rc/RCMLEntry.java&r1=1034526&r2=1038611&rev=1038611&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/rc/RCMLEntry.java (original)
+++ lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/rc/RCMLEntry.java Wed Nov 24 14:14:07 2010
@@ -1,86 +1,28 @@
-/*
- * 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.rc;
-/* $Id$ */
+public interface RCMLEntry {
-package org.apache.lenya.cms.rc;
+ /**
+ * Get the identity of the creator (i.e. the user name)
+ * FIXME: this should be changed to an o.a.l.ac.Identity object
+ * @return the identity
+ */
+ public abstract String getIdentity();
+
+ /**
+ * Get the creation time.
+ * @return the time
+ */
+ public abstract long getTime();
+
+ /**
+ * Get the type (checkin or checkout).
+ * @see org.apache.lenya.cms.rc.RCML.ci
+ * @see org.apache.lenya.cms.rc.RCML.co
+ * @return the type
+ */
+ public abstract short getType();
-/**
- * A RCML entry
- */
-public class RCMLEntry {
-
- private String identity = null;
- private long time = 0;
- private short type = 0;
- private String sessionId;
-
- /**
- * Creates a new RCMLEntry object.
- * @param sessionId The session ID.
- * @param _identity The identity of the person for this RCML
- * @param _time The time of the checkin / checkout
- */
- public RCMLEntry(String sessionId, String _identity, long _time) {
- this.identity = _identity;
- this.time = _time;
- this.sessionId = sessionId;
- }
-
- /**
- * Get the identity of the creator (i.e. the user name)
- * FIXME: this should be changed to an o.a.l.ac.Identity object
- * @return the identity
- */
- public String getIdentity() {
- return this.identity;
- }
-
- /**
- * Get the creation time.
- * @return the time
- */
- public long getTime() {
- return this.time;
- }
-
- /**
- * Get the type (checkin or checkout).
- * @see org.apache.lenya.cms.rc.RCML.ci
- * @see org.apache.lenya.cms.rc.RCML.co
- * @return the type
- */
- public short getType() {
- return this.type;
- }
-
- /**
- * Set the type (checkin or checkout).
- * @see org.apache.lenya.cms.rc.RCML.ci
- * @see org.apache.lenya.cms.rc.RCML.co
- * @param s the type
- */
- protected void setType(short s) {
- this.type = s;
- }
-
- public String getSessionId() {
- return this.sessionId;
- }
+ public abstract String getSessionId();
-}
+}
\ No newline at end of file
Copied: lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/ContentHolder.java (from r1034526, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/ContentHolder.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/ContentHolder.java?p2=lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/ContentHolder.java&p1=lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/ContentHolder.java&r1=1034526&r2=1038611&rev=1038611&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/ContentHolder.java (original)
+++ lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/ContentHolder.java Wed Nov 24 14:14:07 2010
@@ -2,7 +2,7 @@ package org.apache.lenya.cms.repository;
import java.io.InputStream;
-import org.apache.lenya.cms.repository.metadata.MetaDataOwner;
+import org.apache.lenya.cms.metadata.MetaDataOwner;
/**
* Super interface for nodes and revisions.
Copied: lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/RepositoryException.java (from r1034526, lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/RepositoryException.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/RepositoryException.java?p2=lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/RepositoryException.java&p1=lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/RepositoryException.java&r1=1034526&r2=1038611&rev=1038611&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.repository.impl/src/main/java/org/apache/lenya/cms/repository/RepositoryException.java (original)
+++ lenya/trunk/org.apache.lenya.core.repository.api/src/main/java/org/apache/lenya/cms/repository/RepositoryException.java Wed Nov 24 14:14:07 2010
@@ -21,7 +21,6 @@ import org.apache.lenya.transaction.Tran
/**
* Repository exception.
- * @version $Id:$
*/
public class RepositoryException extends TransactionException {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org