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:17:27 UTC
svn commit: r345032 - in /lenya/trunk/src/java/org/apache/lenya:
cms/editors/EditDocument.java cms/editors/forms/OneFormEditor.java
lenya.roles
Author: michi
Date: Wed Nov 16 07:17:21 2005
New Revision: 345032
URL: http://svn.apache.org/viewcvs?rev=345032&view=rev
Log:
lucene code of Robert Goene added
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/editors/EditDocument.java
lenya/trunk/src/java/org/apache/lenya/cms/editors/forms/OneFormEditor.java
lenya/trunk/src/java/org/apache/lenya/lenya.roles
Modified: lenya/trunk/src/java/org/apache/lenya/cms/editors/EditDocument.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/editors/EditDocument.java?rev=345032&r1=345031&r2=345032&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/editors/EditDocument.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/editors/EditDocument.java Wed Nov 16 07:17:21 2005
@@ -16,12 +16,14 @@
*/
package org.apache.lenya.cms.editors;
+import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
import org.apache.lenya.cms.cocoon.source.SourceUtil;
import org.apache.lenya.cms.repository.Node;
import org.apache.lenya.cms.usecase.DocumentUsecase;
import org.apache.lenya.cms.usecase.UsecaseException;
import org.apache.lenya.cms.workflow.WorkflowUtil;
+import org.xml.sax.InputSource;
/**
* Usecase to edit documents.
@@ -41,6 +43,7 @@
protected void doExecute() throws Exception {
super.doExecute();
SourceResolver resolver = null;
+ Source source = null;
try {
resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
SourceUtil.copy(resolver,
@@ -52,9 +55,17 @@
getLogger(),
getSourceDocument(),
"edit");
+
+ //index
+ 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);
} finally {
if (resolver != null) {
+ if (source != null) {
+ resolver.release(source);
+ }
this.manager.release(resolver);
}
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/editors/forms/OneFormEditor.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/editors/forms/OneFormEditor.java?rev=345032&r1=345031&r2=345032&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/editors/forms/OneFormEditor.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/editors/forms/OneFormEditor.java Wed Nov 16 07:17:21 2005
@@ -26,6 +26,7 @@
import org.apache.cocoon.components.ContextHelper;
import org.apache.cocoon.environment.Request;
import org.apache.excalibur.source.ModifiableSource;
+import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
import org.apache.lenya.cms.publication.ResourceType;
import org.apache.lenya.cms.usecase.DocumentUsecase;
@@ -36,6 +37,7 @@
import org.apache.lenya.xml.Schema;
import org.apache.lenya.xml.ValidationUtil;
import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
/**
@@ -91,6 +93,7 @@
ModifiableSource xmlSource = null;
SourceResolver resolver = null;
+ Source indexSource = null;
try {
resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
xmlSource = (ModifiableSource) resolver.resolveURI(getSourceDocument().getSourceURI());
@@ -116,6 +119,10 @@
getLogger(),
getSourceDocument(),
getEvent());
+
+ //re-index
+ indexSource = resolver.resolveURI("cocoon://core/lucene/index.xml");
+ InputSource xmlInputSource = org.apache.cocoon.components.source.SourceUtil.getInputSource(indexSource);
}
}
@@ -123,6 +130,9 @@
if (resolver != null) {
if (xmlSource != null) {
resolver.release(xmlSource);
+ }
+ if (indexSource != null) {
+ resolver.release(indexSource);
}
this.manager.release(resolver);
}
Modified: lenya/trunk/src/java/org/apache/lenya/lenya.roles
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/lenya.roles?rev=345032&r1=345031&r2=345032&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/lenya.roles (original)
+++ lenya/trunk/src/java/org/apache/lenya/lenya.roles Wed Nov 16 07:17:21 2005
@@ -180,4 +180,24 @@
<!--
default-class="org.apache.lenya.cms.jcr.JCRNodeFactory"/>
-->
+
+
+<!-- RGE: inserted roles used by the Lucene2 block -->
+
+ <!-- default indexer -->
+ <role name="org.apache.cocoon.components.search.components.Indexer/default" shorthand="default_indexer"
+default-class="org.apache.cocoon.components.search.components.impl.DefaultIndexerImpl"/>
+
+ <!-- parallel indexer -->
+ <role name="org.apache.cocoon.components.search.components.Indexer/parallel" shorthand="parallel_indexer"
+default-class="org.apache.cocoon.components.search.components.impl.ParallelIndexerImpl"/>
+
+ <!-- analyzer manager -->
+ <role name="org.apache.cocoon.components.search.components.AnalyzerManager" shorthand="analyzer_manager"
+default-class="org.apache.cocoon.components.search.components.impl.AnalyzerManagerImpl"/>
+
+ <!-- index manager -->
+ <role name="org.apache.cocoon.components.search.components.IndexManager" shorthand="index_manager"
+default-class="org.apache.cocoon.components.search.components.impl.IndexManagerImpl"/>
+
</role-list>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org