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/31 14:49:54 UTC

svn commit: r159584 [3/3] - in lenya/trunk/src: java/org/apache/lenya/ java/org/apache/lenya/cms/ac/ java/org/apache/lenya/cms/ac/cocoon/ java/org/apache/lenya/cms/ac/workflow/ java/org/apache/lenya/cms/ant/ java/org/apache/lenya/cms/cocoon/acting/ java/org/apache/lenya/cms/cocoon/components/modules/input/ java/org/apache/lenya/cms/cocoon/flow/ java/org/apache/lenya/cms/cocoon/generation/ java/org/apache/lenya/cms/cocoon/scheduler/ java/org/apache/lenya/cms/cocoon/source/ java/org/apache/lenya/cms/cocoon/transformation/ java/org/apache/lenya/cms/metadata/dublincore/ java/org/apache/lenya/cms/publication/ java/org/apache/lenya/cms/publication/task/ java/org/apache/lenya/cms/publication/util/ java/org/apache/lenya/cms/scheduler/ java/org/apache/lenya/cms/site/tree/ java/org/apache/lenya/cms/site/usecases/ java/org/apache/lenya/cms/task/ java/org/apache/lenya/cms/usecase/ java/org/apache/lenya/transaction/ webapp/lenya/pubs/blog/java/src/org/apache/lenya/cms/site/usecases/ webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/ webapp/lenya/usecases/tab/

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=159583&r2=159584
==============================================================================
--- 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 Thu Mar 31 04:49:41 2005
@@ -27,6 +27,7 @@
 import org.apache.avalon.framework.service.ServiceSelector;
 import org.apache.lenya.cms.publication.Document;
 import org.apache.lenya.cms.publication.DocumentFactory;
+import org.apache.lenya.cms.publication.DocumentIdentityMap;
 import org.apache.lenya.cms.publication.DocumentManager;
 import org.apache.lenya.cms.publication.Publication;
 import org.apache.lenya.cms.publication.PublicationException;
@@ -96,9 +97,9 @@
             }
 
             Publication publication = document.getPublication();
-            DocumentFactory factory = document.getIdentityMap().getFactory();
+            DocumentIdentityMap map = document.getIdentityMap();
 
-            Document liveDocument = factory.getAreaVersion(document, Publication.LIVE_AREA);
+            Document liveDocument = map.getAreaVersion(document, Publication.LIVE_AREA);
 
             List missingDocuments = new ArrayList();
 
@@ -110,7 +111,7 @@
                 Document[] requiredDocuments = siteManager.getRequiredResources(liveDocument);
                 for (int i = 0; i < requiredDocuments.length; i++) {
                     if (!siteManager.containsInAnyLanguage(requiredDocuments[i])) {
-                        Document authoringVersion = factory.getAreaVersion(requiredDocuments[i],
+                        Document authoringVersion = map.getAreaVersion(requiredDocuments[i],
                                 Publication.AUTHORING_AREA);
                         missingDocuments.add(authoringVersion);
                     }
@@ -276,13 +277,13 @@
     protected void publishAllLanguageVersions(Document document) throws PublicationException,
             WorkflowException {
         String[] languages = document.getPublication().getLanguages();
-        DocumentFactory factory = document.getIdentityMap().getFactory();
 
         WorkflowManager wfManager = null;
         try {
             wfManager = (WorkflowManager) this.manager.lookup(WorkflowManager.ROLE);
             for (int i = 0; i < languages.length; i++) {
-                Document version = factory.getLanguageVersion(document, languages[i]);
+                Document version = document.getIdentityMap().getLanguageVersion(document,
+                        languages[i]);
                 if (version.exists()) {
                     if (wfManager.canInvoke(version, getEvent())) {
                         publish(version);

Modified: lenya/trunk/src/webapp/lenya/usecases/tab/sitetree.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/tab/sitetree.jx?view=diff&r1=159583&r2=159584
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/tab/sitetree.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/tab/sitetree.jx Thu Mar 31 04:49:41 2005
@@ -32,7 +32,7 @@
       <jx:forEach var="language" items="${document.getPublication().getLanguages()}">
         
         <jx:set var="languageVersion"
-                value="${document.getIdentityMap().getFactory().getLanguageVersion(document, language)}"/>
+                value="${document.getIdentityMap().getLanguageVersion(document, language)}"/>
         <jx:set var="languageUrl"
                 value="${request.contextPath + publicationId + '/info-' + area + languageVersion.getCanonicalDocumentURL()}"/>
         



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org