You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2005/03/29 17:40:21 UTC
svn commit: r159381 - in lenya/trunk/src:
java/org/apache/lenya/cms/publication/
java/org/apache/lenya/cms/site/usecases/
webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/
Author: andreas
Date: Tue Mar 29 07:40:18 2005
New Revision: 159381
URL: http://svn.apache.org/viewcvs?view=rev&rev=159381
Log:
DocumentManager: simplified method names
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentManager.java
lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/ChangeNodeID.java
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/DeleteLanguage.java
lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Deactivate.java
lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Publish.java
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentManager.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentManager.java?view=diff&r1=159380&r2=159381
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentManager.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentManager.java Tue Mar 29 07:40:18 2005
@@ -37,7 +37,7 @@
* @throws PublicationException if a document which destinationDocument
* depends on does not exist.
*/
- void copyDocument(Document sourceDocument, Document destinationDocument)
+ void copy(Document sourceDocument, Document destinationDocument)
throws PublicationException;
/**
@@ -47,7 +47,7 @@
* @throws PublicationException if a document which the destination document
* depends on does not exist.
*/
- void copyDocumentToArea(Document sourceDocument, String destinationArea)
+ void copyToArea(Document sourceDocument, String destinationArea)
throws PublicationException;
/**
@@ -57,7 +57,7 @@
* @throws PublicationException if a document which one of the destination
* documents depends on does not exist.
*/
- void copyDocumentSetToArea(DocumentSet documentSet, String destinationArea)
+ void copyToArea(DocumentSet documentSet, String destinationArea)
throws PublicationException;
/**
@@ -65,14 +65,14 @@
* @param document The document.
* @throws PublicationException if the document is already contained.
*/
- void addDocument(Document document) throws PublicationException;
+ void add(Document document) throws PublicationException;
/**
* Deletes a document.
* @param document The document to delete.
* @throws PublicationException when something went wrong.
*/
- void deleteDocument(Document document) throws PublicationException;
+ void delete(Document document) throws PublicationException;
/**
* Moves a document from one location to another.
@@ -81,7 +81,7 @@
* @throws PublicationException if a document which the destination document
* depends on does not exist.
*/
- void moveDocument(Document sourceDocument, Document destinationDocument)
+ void move(Document sourceDocument, Document destinationDocument)
throws PublicationException;
/**
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java?view=diff&r1=159380&r2=159381
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java Tue Mar 29 07:40:18 2005
@@ -46,9 +46,9 @@
Serviceable, Contextualizable {
/**
- * @see org.apache.lenya.cms.publication.DocumentManager#addDocument(org.apache.lenya.cms.publication.Document)
+ * @see org.apache.lenya.cms.publication.DocumentManager#add(org.apache.lenya.cms.publication.Document)
*/
- public void addDocument(Document document) throws PublicationException {
+ public void add(Document document) throws PublicationException {
Publication publication = document.getPublication();
SiteManager siteManager = publication.getSiteManager();
@@ -64,10 +64,10 @@
* Template method to copy a document. Override
* {@link #copyDocumentSource(Document, Document)}to implement access to a
* custom repository.
- * @see org.apache.lenya.cms.publication.DocumentManager#copyDocument(org.apache.lenya.cms.publication.Document,
+ * @see org.apache.lenya.cms.publication.DocumentManager#copy(org.apache.lenya.cms.publication.Document,
* org.apache.lenya.cms.publication.Document)
*/
- public void copyDocument(Document sourceDocument, Document destinationDocument)
+ public void copy(Document sourceDocument, Document destinationDocument)
throws PublicationException {
Publication publication = sourceDocument.getPublication();
@@ -91,9 +91,9 @@
}
/**
- * @see org.apache.lenya.cms.publication.DocumentManager#deleteDocument(org.apache.lenya.cms.publication.Document)
+ * @see org.apache.lenya.cms.publication.DocumentManager#delete(org.apache.lenya.cms.publication.Document)
*/
- public void deleteDocument(Document document) throws PublicationException {
+ public void delete(Document document) throws PublicationException {
if (!document.exists()) {
throw new PublicationException("Document [" + document + "] does not exist!");
}
@@ -118,13 +118,13 @@
}
/**
- * @see org.apache.lenya.cms.publication.DocumentManager#moveDocument(org.apache.lenya.cms.publication.Document,
+ * @see org.apache.lenya.cms.publication.DocumentManager#move(org.apache.lenya.cms.publication.Document,
* org.apache.lenya.cms.publication.Document)
*/
- public void moveDocument(Document sourceDocument, Document destinationDocument)
+ public void move(Document sourceDocument, Document destinationDocument)
throws PublicationException {
- copyDocument(sourceDocument, destinationDocument);
- deleteDocument(sourceDocument);
+ copy(sourceDocument, destinationDocument);
+ delete(sourceDocument);
ResourcesManager resourcesManager = sourceDocument.getResourcesManager();
WorkflowManager workflowManager = null;
@@ -144,25 +144,25 @@
}
/**
- * @see org.apache.lenya.cms.publication.DocumentManager#copyDocumentToArea(org.apache.lenya.cms.publication.Document,
+ * @see org.apache.lenya.cms.publication.DocumentManager#copyToArea(org.apache.lenya.cms.publication.Document,
* java.lang.String)
*/
- public void copyDocumentToArea(Document sourceDocument, String destinationArea)
+ public void copyToArea(Document sourceDocument, String destinationArea)
throws PublicationException {
Publication publication = sourceDocument.getPublication();
Document destinationDocument = publication.getAreaVersion(sourceDocument, destinationArea);
- copyDocument(sourceDocument, destinationDocument);
+ copy(sourceDocument, destinationDocument);
}
/**
- * @see org.apache.lenya.cms.publication.DocumentManager#copyDocumentSetToArea(org.apache.lenya.cms.publication.util.DocumentSet,
+ * @see org.apache.lenya.cms.publication.DocumentManager#copyToArea(org.apache.lenya.cms.publication.util.DocumentSet,
* java.lang.String)
*/
- public void copyDocumentSetToArea(DocumentSet documentSet, String destinationArea)
+ public void copyToArea(DocumentSet documentSet, String destinationArea)
throws PublicationException {
Document[] documents = documentSet.getDocuments();
for (int i = 0; i < documents.length; i++) {
- copyDocumentToArea(documents[i], destinationArea);
+ copyToArea(documents[i], destinationArea);
}
}
@@ -292,7 +292,7 @@
target.getArea(),
target.getId(),
languages[i]);
- copyDocument(sourceVersion, targetVersion);
+ copy(sourceVersion, targetVersion);
}
}
@@ -455,7 +455,7 @@
for (int i = 0; i < languages.length; i++) {
Document version = identityMap.getFactory().getLanguageVersion(document, languages[i]);
- deleteDocument(version);
+ delete(version);
}
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/ChangeNodeID.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/ChangeNodeID.java?view=diff&r1=159380&r2=159381
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/ChangeNodeID.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/ChangeNodeID.java Tue Mar 29 07:40:18 2005
@@ -145,7 +145,7 @@
newDocumentId,
availableLanguages[i]);
- documentManager.moveDocument(languageVersion, newLanguageVersion);
+ documentManager.move(languageVersion, newLanguageVersion);
if (availableLanguages[i].equals(document.getLanguage())) {
newDocument = newLanguageVersion;
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java?view=diff&r1=159380&r2=159381
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java Tue Mar 29 07:40:18 2005
@@ -89,7 +89,7 @@
DocumentManager documentManager = null;
try {
documentManager = (DocumentManager) this.manager.lookup(DocumentManager.ROLE);
- documentManager.addDocument(document);
+ documentManager.add(document);
}
finally {
if (documentManager != null) {
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/DeleteLanguage.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/DeleteLanguage.java?view=diff&r1=159380&r2=159381
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/DeleteLanguage.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/DeleteLanguage.java Tue Mar 29 07:40:18 2005
@@ -55,7 +55,7 @@
DocumentManager documentManager = null;
try {
documentManager = (DocumentManager) this.manager.lookup(DocumentManager.ROLE);
- documentManager.deleteDocument(document);
+ documentManager.delete(document);
} finally {
if (documentManager != null) {
this.manager.release(documentManager);
Modified: lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Deactivate.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Deactivate.java?view=diff&r1=159380&r2=159381
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Deactivate.java (original)
+++ lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Deactivate.java Tue Mar 29 07:40:18 2005
@@ -100,7 +100,7 @@
Publication.LIVE_AREA);
documentManager = (DocumentManager) this.manager.lookup(DocumentManager.ROLE);
- documentManager.deleteDocument(liveDocument);
+ documentManager.delete(liveDocument);
wfManager.invoke(authoringDocument, getEvent());
success = true;
Modified: lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Publish.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Publish.java?view=diff&r1=159380&r2=159381
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Publish.java (original)
+++ lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Publish.java Tue Mar 29 07:40:18 2005
@@ -165,7 +165,7 @@
try {
wfManager = (WorkflowManager) this.manager.lookup(WorkflowManager.ROLE);
documentManager = (DocumentManager) this.manager.lookup(DocumentManager.ROLE);
- documentManager.copyDocumentToArea(authoringDocument, Publication.LIVE_AREA);
+ documentManager.copyToArea(authoringDocument, Publication.LIVE_AREA);
wfManager.invoke(authoringDocument, getEvent());
} catch (Exception e) {
throw new RuntimeException(e);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org