Date: 2004-09-27T05:06:20
Editor: CarstenZiegeler <[EMAIL PROTECTED]>
Wiki: Cocoon Wiki
Page: MergingBranches
URL: http://wiki.apache.org/cocoon/MergingBranches
no comment
Change Log:
------------------------------------------------------------------------------
@@ -159,51 +159,6 @@
src/blocks/javaflow/java/org/apache/cocoon/forms/flow/java/FormInstance.java
src/blocks/javaflow/samples/forms/form1.xml
}}}
- * lucene
- {{{
-
src/blocks/lucene/java/org/apache/cocoon/components/search/SimpleLuceneCocoonSearcherImpl.java
-
src/blocks/lucene/java/org/apache/cocoon/components/search/LuceneCocoonSearcher.java
-
src/blocks/lucene/java/org/apache/cocoon/bean/query/SimpleLuceneQueryBean.java
-
src/blocks/lucene/java/org/apache/cocoon/bean/query/SimpleLuceneCriterion.java
- src/blocks/lucene/java/org/apache/cocoon/bean/query/ContextAccess.java
-
src/blocks/lucene/java/org/apache/cocoon/bean/query/SimpleLuceneCriterionBean.java
- src/blocks/lucene/java/org/apache/cocoon/bean/query/SimpleLuceneQuery.java
- src/blocks/lucene/samples/create-index.xsp
- src/blocks/lucene/samples/search-index.xsp
- src/blocks/lucene/samples/query/query.js
- src/blocks/lucene/samples/query/screens/results.xml
- src/blocks/lucene/samples/query/screens/history.xml
- src/blocks/lucene/samples/query/screens/simple-binding.xml
- src/blocks/lucene/samples/query/screens/simple-template.xml
- src/blocks/lucene/samples/query/screens/advanced-model.xml
- src/blocks/lucene/samples/query/screens/simple-model.xml
- src/blocks/lucene/samples/query/screens/messages.xml
- src/blocks/lucene/samples/query/screens/index.xml
- src/blocks/lucene/samples/query/screens/advanced-fields.xml
- src/blocks/lucene/samples/query/screens/error.xml
- src/blocks/lucene/samples/query/screens/simple-fields.xml
- src/blocks/lucene/samples/query/screens/advanced-binding.xml
- src/blocks/lucene/samples/query/screens/advanced-template.xml
- src/blocks/lucene/samples/query/sitemap.xmap
- src/blocks/lucene/samples/statistic-index.xsp
- src/blocks/lucene/samples/sitemap.xmap
- src/blocks/lucene/samples/document-files.xsp
- src/blocks/lucene/samples/welcome-index.xsp
- src/blocks/lucene/samples/stylesheets/search2html.xsl
- src/blocks/lucene/samples/stylesheets/search-index2html.xsl
- src/blocks/lucene/samples/stylesheets/all-files2content.xsl
- src/blocks/lucene/samples/stylesheets/lucene-index2html.xsl
- src/blocks/lucene/samples/stylesheets/content2lucene.xsl
- src/blocks/lucene/conf/lucene.xmap
- src/blocks/lucene/conf/lucene.samplesxpipe
- src/blocks/lucene/conf/lucene.xsamples
- src/blocks/lucene/conf/lucene.xroles
- src/blocks/lucene/conf/lucene.xconf
- }}}
- * Midi
- {{{
- src/blocks/midi/java/org/apache/cocoon/generation/XMidiGenerator.java
- }}}
* Ojb
{{{
src/blocks/ojb/java/org/apache/cocoon/ojb/broker/components/PBFactory.java
@@ -216,11 +171,6 @@
src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/JdoPMFImpl.java
src/blocks/ojb/samples/sitemap.xmap
}}}
- * repository
- {{{
-
src/blocks/repository/java/org/apache/cocoon/components/repository/SourceRepositoryImpl.java
-
src/blocks/repository/java/org/apache/cocoon/components/source/impl/RepositorySourceFactory.java
- }}}
* scratchpad
{{{
src/blocks/scratchpad/test/org/apache/cocoon/components/source/impl/CachingSourceTestCase.xtest
@@ -354,7 +304,9 @@
* jsp
* linkrewriter
* linotype
+ * lucence
* Mail
+ * midi
* Naming
* Paranoid
* Petstore
@@ -366,6 +318,7 @@
* Proxy
* Python
* qdox
+ * repository
* Session-FW
* slop
* stx
