|
|
Choosing A Webhost: |
svn commit: r231192 - in /lenya/trunk/src/webapp/lenya/pubs: blog/java/src/: msg#00029cms.lenya.cvs
Author: andreas Date: Wed Aug 10 01:14:58 2005 New Revision: 231192 URL: http://svn.apache.org/viewcvs?rev=231192&view=rev Log: Introduced RepositoryManager service. This service is the single entry point for repository manipulation, because RepositorySource handling doesn't take care of meta data (for instance JCR properties). Modified: lenya/trunk/src/webapp/lenya/pubs/blog/java/src/org/apache/lenya/cms/workflow/usecases/Publish.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 lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/webdav/Put.java Modified: lenya/trunk/src/webapp/lenya/pubs/blog/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/blog/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java?rev=231192&r1=231191&r2=231192&view=diff ============================================================================== --- lenya/trunk/src/webapp/lenya/pubs/blog/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java (original) +++ lenya/trunk/src/webapp/lenya/pubs/blog/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java Wed Aug 10 01:14:58 2005 @@ -17,7 +17,6 @@ package org.apache.lenya.cms.workflow.usecases; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import org.apache.lenya.cms.publication.Document; @@ -59,7 +58,7 @@ Document[] documents = set.getDocuments(); for (int i = 0; i < documents.length; i++) { - nodes.addAll(Arrays.asList(documents[i].getRepositoryNodes())); + nodes.add(documents[i].getRepositoryNode()); } nodes.add(SiteUtil.getSiteStructure(this.manager, liveDoc).getRepositoryNode()); 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?rev=231192&r1=231191&r2=231192&view=diff ============================================================================== --- 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 Wed Aug 10 01:14:58 2005 @@ -17,7 +17,6 @@ package org.apache.lenya.defaultpub.cms.usecases; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import org.apache.lenya.cms.publication.Document; @@ -97,7 +96,7 @@ Document[] documents = set.getDocuments(); for (int i = 0; i < documents.length; i++) { - nodes.addAll(Arrays.asList(documents[i].getRepositoryNodes())); + nodes.add(documents[i].getRepositoryNode()); } nodes.add(SiteUtil.getSiteStructure(this.manager, liveDoc).getRepositoryNode()); 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?rev=231192&r1=231191&r2=231192&view=diff ============================================================================== --- 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 Wed Aug 10 01:14:58 2005 @@ -20,7 +20,6 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Arrays; import java.util.Date; import java.util.GregorianCalendar; import java.util.List; @@ -84,9 +83,9 @@ SiteUtil.MODE_REPLACE); Document[] docs = set.getDocuments(); for (int i = 0; i < docs.length; i++) { - nodes.addAll(Arrays.asList(docs[i].getRepositoryNodes())); + nodes.add(docs[i].getRepositoryNode()); Document target = (Document) targets.get(docs[i]); - nodes.addAll(Arrays.asList(target.getRepositoryNodes())); + nodes.add(target.getRepositoryNode()); nodes.addAll(AssetUtil.getCopiedAssetNodes(docs[i], target, this.manager, getLogger())); } Modified: lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/webdav/Put.java URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/webdav/Put.java?rev=231192&r1=231191&r2=231192&view=diff ============================================================================== --- lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/webdav/Put.java (original) +++ lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/webdav/Put.java Wed Aug 10 01:14:58 2005 @@ -17,7 +17,6 @@ package org.apache.lenya.defaultpub.cms.usecases.webdav; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -120,8 +119,8 @@ addErrorMessage("invalid source xml"); } - if(!hasErrors()) { - + if (!hasErrors()) { + Source tempSource = resolver.resolveURI(tempSourceUri); if (!tempSource.exists()) { throw new IllegalArgumentException("The temp file [" + tempSource.getURI() @@ -149,7 +148,7 @@ SourceUtil.copy(resolver, tempSourceUri, sourceUri, true); SourceUtil.delete(tempSourceUri, this.manager); } - + } } finally { @@ -173,7 +172,7 @@ DocumentSet set = SiteUtil.getSubSite(this.manager, doc); Document[] documents = set.getDocuments(); for (int i = 0; i < documents.length; i++) { - nodes.addAll(Arrays.asList(documents[i].getRepositoryNodes())); + nodes.add(documents[i].getRepositoryNode()); } SiteStructure structure = SiteUtil.getSiteStructure(this.manager, getSourceDocument());
|
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
Free MagazinesCisco NewsReceive a free quarterly e-newsletter with exclusive articles on how Cisco IT uses its own products and solutions to enable the business. subscribe Systems Management News, the newspaper for IT systems administration and data center managers! Each issue of Systems Management News is chock-full of news and analysis to help you understand what's happening in your field. subscribe The Enterprise Newsweekly eWeek is the essential technology information source for builders of e-business. subscribe Oracle Magazine Oracle Magazine contains technology strategy articles, sample code, tips, Oracle and partner news, how to articles for developers and DBAs, and more. Oracle (NASDAQ: ORCL) is the world's largest enterprise software company. subscribe Total Telecom Total Telecom is "The Economist of the communications industry". subscribe |