You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by je...@apache.org on 2004/11/18 17:21:51 UTC
svn commit: r76247 - in cocoon/trunk: . src/blocks/lucene/java/org/apache/cocoon/bean src/blocks/lucene/samples src/blocks/lucene/samples/query
Author: jeremy
Date: Thu Nov 18 08:21:50 2004
New Revision: 76247
Removed:
cocoon/trunk/src/blocks/lucene/java/org/apache/cocoon/bean/
cocoon/trunk/src/blocks/lucene/samples/query/
Modified:
cocoon/trunk/gump.xml
cocoon/trunk/src/blocks/lucene/samples/sitemap.xmap
cocoon/trunk/src/blocks/lucene/samples/welcome-index.xsp
Log:
moving QueryBean from Lucene Block to it's own block, so hopefully can add OJB persistence to it.
Modified: cocoon/trunk/gump.xml
==============================================================================
--- cocoon/trunk/gump.xml (original)
+++ cocoon/trunk/gump.xml Thu Nov 18 08:21:50 2004
@@ -937,6 +937,26 @@
<nag from="Gump <general@gump.apache.org>" to="dev@cocoon.apache.org"/>
</project>
+ <project name="cocoon-block-querybean" status="unstable">
+ <package>org.apache.cocoon</package>
+
+ <ant target="gump-block">
+ <property name="block-name" value="querybean"/>
+ <property name="version" value="@@DATE@@"/>
+ </ant>
+
+ <depend project="cocoon" inherit="all"/>
+ <depend project="cocoon-block-forms" type="samples"/>
+ <depend project="cocoon-block-lucene"/>
+
+ <work nested="tools/anttasks"/>
+ <home nested="build/cocoon-@@DATE@@"/>
+
+ <jar name="blocks/querybean-block.jar"/>
+
+ <nag from="Gump <general@gump.apache.org>" to="dev@cocoon.apache.org"/>
+ </project>
+
<project name="cocoon-block-slop" status="unstable">
<package>org.apache.cocoon</package>
Modified: cocoon/trunk/src/blocks/lucene/samples/sitemap.xmap
==============================================================================
--- cocoon/trunk/src/blocks/lucene/samples/sitemap.xmap (original)
+++ cocoon/trunk/src/blocks/lucene/samples/sitemap.xmap Thu Nov 18 08:21:50 2004
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- CVS $Id: sitemap.xmap,v 1.9 2004/07/11 15:45:25 antonio Exp $ -->
+<!-- CVS $Id$ -->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
<!-- =========================== Components ================================ -->
@@ -61,10 +61,10 @@
<map:pipeline>
- <!-- mount query bean pipelines -->
+ <!-- mount query bean pipelines
<map:match pattern="query/**">
<map:mount check-reload="yes" src="query/sitemap.xmap" uri-prefix="query"/>
- </map:match>
+ </map:match> -->
<map:match pattern="images/*.gif">
<map:read src="images/{1}.gif" mime-type="image/gif">
Modified: cocoon/trunk/src/blocks/lucene/samples/welcome-index.xsp
==============================================================================
--- cocoon/trunk/src/blocks/lucene/samples/welcome-index.xsp (original)
+++ cocoon/trunk/src/blocks/lucene/samples/welcome-index.xsp Thu Nov 18 08:21:50 2004
@@ -93,7 +93,7 @@
Enter a query and search the Lucene index2 that you have created
- using <a href="findIt2?queryString=cocoon">Cocoon Generators</a>.
</p>
- <p>
+ <!--<p>
Construct a query and search the Lucene index2 that you have created
- using <a href="query/advanced.html">Cocoon Forms</a>.<br/>
Or enter a word or two in here :
@@ -101,7 +101,7 @@
<input type="text" name="query" size="20" value="cocoon"/>
<input type="submit" value="Search" />
</form>
- </p>
+ </p>-->
<h2>Internals</h2>
<p>