You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by mi...@apache.org on 2005/11/16 16:29:52 UTC
svn commit: r345039 - in
/lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases:
Deactivate.java Publish.java
Author: michi
Date: Wed Nov 16 07:29:47 2005
New Revision: 345039
URL: http://svn.apache.org/viewcvs?rev=345039&view=rev
Log:
indexing added
Modified:
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/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=345039&r1=345038&r2=345039&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 Nov 16 07:29:47 2005
@@ -34,6 +34,9 @@
import org.apache.lenya.cms.workflow.WorkflowUtil;
import org.apache.lenya.workflow.WorkflowException;
+import org.apache.excalibur.source.SourceResolver;
+import org.apache.excalibur.source.Source;
+import org.xml.sax.InputSource;
/**
* Deactivate usecase handler.
*
@@ -132,6 +135,8 @@
boolean success = false;
DocumentManager documentManager = null;
+ SourceResolver resolver = null;
+ Source source = null;
try {
Document liveDocument = authoringDocument.getIdentityMap()
.getAreaVersion(authoringDocument, Publication.LIVE_AREA);
@@ -144,10 +149,21 @@
getLogger(),
authoringDocument,
getEvent());
+
+ resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
+ source = resolver.resolveURI("cocoon://core/lucene/delete.xml");
+ InputSource xmlInputSource = org.apache.cocoon.components.source.SourceUtil.getInputSource(source);
+
success = true;
} catch (Exception e) {
throw new RuntimeException(e);
} finally {
+ if (resolver != null) {
+ if (source != null) {
+ resolver.release(source);
+ }
+ this.manager.release(resolver);
+ }
if (getLogger().isDebugEnabled()) {
getLogger().debug("Deactivate document [" + authoringDocument + "]. Success: ["
+ success + "]");
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=345039&r1=345038&r2=345039&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 Nov 16 07:29:47 2005
@@ -53,6 +53,9 @@
import org.apache.lenya.notification.NotificationUtil;
import org.apache.lenya.workflow.WorkflowException;
+import org.apache.excalibur.source.SourceResolver;
+import org.apache.excalibur.source.Source;
+import org.xml.sax.InputSource;
/**
* Publish usecase handler.
*
@@ -242,6 +245,9 @@
protected void publish(Document authoringDocument) {
DocumentManager documentManager = null;
+ SourceResolver resolver = null;
+ Source source = null;
+
try {
documentManager = (DocumentManager) this.manager.lookup(DocumentManager.ROLE);
documentManager.copyToArea(authoringDocument, Publication.LIVE_AREA);
@@ -251,6 +257,10 @@
authoringDocument,
getEvent());
+ resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
+ source = resolver.resolveURI("cocoon://core/lucene/index.xml");
+ InputSource xmlInputSource = org.apache.cocoon.components.source.SourceUtil.getInputSource(source);
+
boolean notify = Boolean.valueOf(getBooleanCheckboxParameter(SEND_NOTIFICATION))
.booleanValue();
if (notify) {
@@ -260,6 +270,12 @@
} catch (Exception e) {
throw new RuntimeException(e);
} finally {
+ if (resolver != null) {
+ if (source != null) {
+ resolver.release(source);
+ }
+ this.manager.release(resolver);
+ }
if (documentManager != null) {
this.manager.release(documentManager);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org