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 2004/09/13 12:05:56 UTC
svn commit: rev 45963 - in incubator/lenya/trunk/src/webapp/lenya: . content/authoring pubs/default/java/src/org/apache/lenya/defaultpub/cms/task
Author: andreas
Date: Mon Sep 13 03:05:56 2004
New Revision: 45963
Modified:
incubator/lenya/trunk/src/webapp/lenya/content/authoring/removelabel.xsp
incubator/lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/task/Deactivate.java
incubator/lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/task/Publish.java
incubator/lenya/trunk/src/webapp/lenya/usecase.xmap
Log:
moved sitetree classes to their own package
Modified: incubator/lenya/trunk/src/webapp/lenya/content/authoring/removelabel.xsp
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/content/authoring/removelabel.xsp (original)
+++ incubator/lenya/trunk/src/webapp/lenya/content/authoring/removelabel.xsp Mon Sep 13 03:05:56 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: removelabel.xsp,v 1.4 2004/03/13 12:31:31 gregor Exp $ -->
+<!-- $Id$ -->
<xsp:page
language="java"
@@ -26,7 +26,7 @@
<xsp:structure>
<xsp:include>org.apache.lenya.cms.publication.Publication</xsp:include>
- <xsp:include>org.apache.lenya.cms.publication.SiteTreeException</xsp:include>
+ <xsp:include>org.apache.lenya.cms.site.SiteException</xsp:include>
</xsp:structure>
<usecase:removelabel>
@@ -38,7 +38,7 @@
String label = "";
try {
label = pub.getSiteTree(Publication.AUTHORING_AREA).getNode(documentId).getLabel(language).getLabel();
- } catch (SiteTreeException e) {}
+ } catch (SiteException e) {}
</xsp:logic>
<usecase:document-id><xsp:expr>documentId</xsp:expr></usecase:document-id>
Modified: incubator/lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/task/Deactivate.java
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/task/Deactivate.java (original)
+++ incubator/lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/task/Deactivate.java Mon Sep 13 03:05:56 2004
@@ -15,7 +15,7 @@
*
*/
-/* $Id: Deactivate.java,v 1.2 2004/03/20 11:46:20 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.defaultpub.cms.task;
@@ -26,14 +26,14 @@
import org.apache.lenya.cms.publication.DocumentBuildException;
import org.apache.lenya.cms.publication.DocumentBuilder;
import org.apache.lenya.cms.publication.DocumentException;
-import org.apache.lenya.cms.publication.Label;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.PublicationException;
import org.apache.lenya.cms.publication.ResourcesManager;
-import org.apache.lenya.cms.publication.SiteTree;
-import org.apache.lenya.cms.publication.SiteTreeException;
-import org.apache.lenya.cms.publication.SiteTreeNode;
import org.apache.lenya.cms.publication.task.PublicationTask;
+import org.apache.lenya.cms.site.SiteException;
+import org.apache.lenya.cms.site.tree.Label;
+import org.apache.lenya.cms.site.tree.SiteTree;
+import org.apache.lenya.cms.site.tree.SiteTreeNode;
import org.apache.lenya.cms.task.ExecutionException;
import org.apache.lenya.workflow.WorkflowException;
import org.apache.log4j.Category;
@@ -85,12 +85,13 @@
* @throws ExecutionException when something went wrong.
* @throws DocumentException when something went wrong.
* FIXME: Remove references to sitetree
+ * @throws SiteException if an error occurs.
*/
protected boolean checkPreconditions(Document liveDocument)
throws
PublicationException,
DocumentException,
- SiteTreeException,
+ SiteException,
ExecutionException {
boolean OK = true;
Modified: incubator/lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/task/Publish.java
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/task/Publish.java (original)
+++ incubator/lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/task/Publish.java Mon Sep 13 03:05:56 2004
@@ -15,7 +15,7 @@
*
*/
-/* $Id: Publish.java,v 1.2 2004/03/20 11:46:20 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.defaultpub.cms.task;
@@ -30,10 +30,10 @@
import org.apache.lenya.cms.publication.DocumentHelper;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.PublicationException;
-import org.apache.lenya.cms.publication.SiteTree;
-import org.apache.lenya.cms.publication.SiteTreeException;
-import org.apache.lenya.cms.publication.SiteTreeNode;
import org.apache.lenya.cms.publication.task.PublicationTask;
+import org.apache.lenya.cms.site.SiteException;
+import org.apache.lenya.cms.site.tree.SiteTree;
+import org.apache.lenya.cms.site.tree.SiteTreeNode;
import org.apache.lenya.cms.task.ExecutionException;
import org.apache.lenya.workflow.WorkflowException;
import org.apache.log4j.Category;
@@ -91,7 +91,7 @@
PublicationException,
DocumentException,
ProcessingException,
- SiteTreeException,
+ SiteException,
ExecutionException {
boolean OK = true;
Modified: incubator/lenya/trunk/src/webapp/lenya/usecase.xmap
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/usecase.xmap (original)
+++ incubator/lenya/trunk/src/webapp/lenya/usecase.xmap Mon Sep 13 03:05:56 2004
@@ -39,7 +39,7 @@
<exception class="org.apache.cocoon.ProcessingException" name="processing" unroll="true"/>
<exception class="org.apache.lenya.cms.publishing.ParentNodeNotFoundException" name="parent-node-not-found"/>
<!-- <exception class="org.apache.lenya.cms.publishing.PublishingException" name="publishing"/> -->
- <!-- <exception class="org.apache.lenya.cms.publication.SiteTreeException" name="sitetree"/> -->
+ <!-- <exception class="org.apache.lenya.cms.site.SiteException" name="sitetree"/> -->
</map:selector>
</map:selectors>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org