Date: 2004-08-11T13:39:57
Editor: VadimGritsenko <[EMAIL PROTECTED]>
Wiki: Cocoon Wiki
Page: MergingBranches
URL: http://wiki.apache.org/cocoon/MergingBranches
no comment
Change Log:
------------------------------------------------------------------------------
@@ -3,6 +3,7 @@
== Not Merged ==
* src/java
+ {{{
src/java/org/apache/cocoon/Cocoon.java
src/java/org/apache/cocoon/selection/ExceptionSelector.java
src/java/org/apache/cocoon/selection/RegexpRequestParameterSelector.java
@@ -210,9 +211,13 @@
src/java/org/apache/cocoon/util/IOUtils.java
src/java/org/apache/cocoon/util/MRUBucketMap.java
src/java/org/apache/cocoon/util/JavaArchiveFilter.java
+ }}}
* src/confpatch
+ {{{
src/confpatch/enable-instrumentation.xweb
+ }}}
* src/documentation
+ {{{
src/documentation/xdocs/userdocs/offline/configuration.xml
src/documentation/xdocs/userdocs/transformers/sourcewriting-transformer.xml
src/documentation/xdocs/userdocs/forms/validation.xml
@@ -253,10 +258,14 @@
src/documentation/stylesheets/changes2document.xsl
src/documentation/stylesheets/statuschanges2document.xsl
src/documentation/stylesheets/site2xhtml.xsl
+ }}}
* src/samples
+ {{{
src/samples/org/apache/cocoon/samples/parentcm/Generator.java
src/samples/org/apache/cocoon/acting/modular/TestAction.java
+ }}}
* src/test
+ {{{
src/test/anteater/run-tests.xml
src/test/anteater/all-tests.xml
src/test/org/apache/cocoon/SitemapComponentTestCase.java
@@ -325,7 +334,9 @@
src/test/org/apache/cocoon/matching/SessionAttributeMatcherTestCase.xtest
src/test/org/apache/cocoon/util/test/IOUtilsTestCase.java
src/test/org/apache/cocoon/util/test/MIMEUtilsTestCase.java
+ }}}
* src/webapp
+ {{{
src/webapp/samples/test/sendpage-redirect/explain-test.xml
src/webapp/samples/test/reader-mime-type/explain-test.xml
src/webapp/samples/common/style/xsl/html/simple-page2html.xsl
@@ -352,7 +363,9 @@
src/webapp/WEB-INF/cocoon.xconf
src/webapp/resources/styles/main.css
src/webapp/stylesheets/system/error2html.xslt
+ }}}
* Libs, Legal, and gump.xml
+ {{{
gump.xml
lib/jars.xml
src/blocks/html/lib/nekohtml-0.9.2.jar
@@ -406,7 +419,9 @@
lib/core/commons-collections-3.0.jar
lib/core/util.concurrent-1.3.3.jar
lib/core/rhino1.5r4-continuations-20040228.jar
+ }}}
* Tools (with the exception of new-targets)
+ {{{
tools/jetty/conf/webdefaults.xml
tools/instrumentation/readme.txt
tools/src/blocks-build.xsl
@@ -440,6 +455,7 @@
tools/targets/compile-build.xml
tools/targets/webapp-build.xml
tools/targets/test-build.xml
+ }}}
* Root Directory
blocks.properties
build.properties
@@ -449,19 +465,24 @@
KEYS
Blocks:
* Apples
+ {{{
src/blocks/apples/java/org/apache/cocoon/components/flow/apples/AppleResponse.java
src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
src/blocks/apples/java/org/apache/cocoon/components/flow/apples/DefaultAppleResponse.java
src/blocks/apples/java/org/apache/cocoon/components/flow/apples/AppleController.java
src/blocks/apples/java/org/apache/cocoon/components/flow/apples/StatelessAppleController.java
+ }}}
* Chaperon
+ {{{
src/blocks/chaperon/samples/wiki/selftest.txt
src/blocks/chaperon/samples/grammars/wiki.grm
src/blocks/chaperon/samples/grammars/link.xlex
src/blocks/chaperon/samples/stylesheets/pattern2link.xsl
src/blocks/chaperon/samples/stylesheets/error2html.xsl
src/blocks/chaperon/samples/stylesheets/wiki2xdoc.xsl
+ }}}
* Cron
+ {{{
src/blocks/cron/java/org/apache/cocoon/environment/background/BackgroundEnvironment.java
src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobExecutor.java
src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java
@@ -474,14 +495,20 @@
src/blocks/cron/conf/cron.xsamples
src/blocks/cron/conf/cron.xconf
src/blocks/cron/conf/cron-target.xlog
+ }}}
* Databases
+ {{{
src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/AbstractEsqlConnection.java
src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java
+ }}}
* Eventcache
+ {{{
src/blocks/eventcache/java/org/apache/cocoon/caching/impl/JMSEventMessageListener.java
src/blocks/eventcache/java/org/apache/cocoon/caching/impl/StoreEventRegistryImpl.java
src/blocks/eventcache/conf/jmslistener.xconf
+ }}}
* Forms
+ {{{
src/blocks/forms/java/org/apache/cocoon/forms/event/WidgetEventMulticaster.java
src/blocks/forms/java/org/apache/cocoon/forms/event/CreateEvent.java
src/blocks/forms/java/org/apache/cocoon/forms/event/CreateListener.java
@@ -550,14 +577,18 @@
src/blocks/forms/samples/resources/forms-advanced-field-styling.xsl
src/blocks/forms/samples/resources/forms-htmlarea-styling.xsl
src/blocks/forms/samples/welcome.xml
+ }}}
* html
+ {{{
src/blocks/html/java/org/apache/cocoon/transformation/HTMLTransformer.java
src/blocks/html/java/org/apache/cocoon/generation/NekoHTMLGenerator.java
src/blocks/html/java/org/apache/cocoon/generation/HTMLGenerator.java
src/blocks/html/conf/html.xmap
src/blocks/html/conf/tidy.xmap
src/blocks/html/WEB-INF/tidy.properties
+ }}}
* javaflow
+ {{{
src/blocks/javaflow/test/org/apache/cocoon/components/flow/java/test/InnerContinuable.java
src/blocks/javaflow/test/org/apache/cocoon/components/flow/java/test/SimpleFlow.java
src/blocks/javaflow/test/org/apache/cocoon/components/flow/java/test/FooException.java
@@ -597,7 +628,9 @@
src/blocks/javaflow/java/org/apache/cocoon/components/flow/javascript/JavaScriptInterpreter.java
src/blocks/javaflow/java/org/apache/cocoon/forms/flow/java/FormInstance.java
src/blocks/javaflow/samples/forms/form1.xml
+ }}}
* jms
+ {{{
src/blocks/jms/java/org/apache/cocoon/components/jms/JMSConnectionManager.java
src/blocks/jms/java/org/apache/cocoon/components/jms/AbstractMessagePublisher.java
src/blocks/jms/java/org/apache/cocoon/components/jms/JMSConnectionManagerImpl.java
@@ -613,11 +646,15 @@
src/blocks/jms/conf/jms-connection-manager.xconf
src/blocks/jms/conf/jmsconnection.xconf
src/blocks/jms/conf/jmslistener.xconf
+ }}}
* linkrewriter
+ {{{
src/blocks/linkrewriter/java/org/apache/cocoon/transformation/LinkRewriterTransformer.java
src/blocks/linkrewriter/java/org/apache/cocoon/transformation/VariableRewriterTransformer.java
src/blocks/linkrewriter/samples/bookdemo/docs/book.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
@@ -656,9 +693,13 @@
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
src/blocks/ojb/java/org/apache/cocoon/ojb/broker/components/PBFactoryImpl.java
src/blocks/ojb/java/org/apache/cocoon/ojb/components/AbstractOjbImpl.java
@@ -668,7 +709,9 @@
src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/JdoPMF.java
src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/JdoPMFImpl.java
src/blocks/ojb/samples/sitemap.xmap
+ }}}
* Poi
+ {{{
src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Sheet.java
src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPHeader.java
src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EP_Footer.java
@@ -686,14 +729,20 @@
src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EP_Monochrome.java
src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPFooter.java
src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EP_Bottom.java
+ }}}
* Qdox
+ {{{
src/blocks/qdox/java/org/apache/cocoon/components/source/impl/QDoxSourceFactory.java
src/blocks/qdox/java/org/apache/cocoon/components/source/impl/QDoxSource.java
src/blocks/qdox/samples/stylesheets/qdox2html.xsl
+ }}}
* 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
src/blocks/scratchpad/test/org/apache/cocoon/components/source/impl/XMLizableSourceFactory.java
src/blocks/scratchpad/test/org/apache/cocoon/components/source/impl/XMLizableSource.java
@@ -726,18 +775,24 @@
src/blocks/scratchpad/conf/groovyflow.xconf
src/blocks/scratchpad/conf/delay-refresher.xconf
src/blocks/scratchpad/garbage/source/java/org/apache/garbage/serializer/XMLSerializer.java
+ }}}
* serializers
+ {{{
src/blocks/serializers/java/org/apache/cocoon/components/serializers/EncodingSerializer.java
src/blocks/serializers/java/org/apache/cocoon/components/serializers/XMLSerializer.java
src/blocks/serializers/java/org/apache/cocoon/components/serializers/util/Namespaces.java
+ }}}
* slide
+ {{{
src/blocks/slide/java/org/apache/cocoon/slide/util/AdminHelper.java
src/blocks/slide/java/org/apache/cocoon/components/slide/impl/SlideConfigurationAdapter.java
src/blocks/slide/samples/flow.js
src/blocks/slide/samples/screens/users.jx
src/blocks/slide/samples/screens/permissions.jx
src/blocks/slide/samples/screens/locks.jx
+ }}}
* tour
+ {{{
src/blocks/tour/java/org/apache/cocoon/samples/tour/shapes/Square.java
src/blocks/tour/java/org/apache/cocoon/samples/tour/shapes/Shape.java
src/blocks/tour/java/org/apache/cocoon/samples/tour/shapes/Circle.java
@@ -763,10 +818,14 @@
src/blocks/tour/samples/intro/docs/toc.xml
src/blocks/tour/samples/intro/docs/use-cases.xml
src/blocks/tour/samples/intro/presentation/tour.css
+ }}}
* webdav
+ {{{
src/blocks/webdav/test/org/apache/cocoon/components/source/impl/WebDAVSourceTestCase.java
src/blocks/webdav/java/org/apache/cocoon/components/source/impl/WebDAVSource.java
+ }}}
* xmldb
+ {{{
src/blocks/xmldb/java/org/apache/cocoon/components/source/impl/XMLDBSource.java
src/blocks/xmldb/java/org/apache/cocoon/generation/XMLDBCollectionGenerator.java
src/blocks/xmldb/java/org/apache/cocoon/generation/XMLDBGenerator.java
@@ -774,7 +833,9 @@
src/blocks/xmldb/conf/xmldb.xconf
src/blocks/xmldb/conf/xindice-servlet.xweb
src/blocks/xmldb/WEB-INF/xindice.xml
+ }}}
* xsp
+ {{{
src/blocks/xsp/java/org/apache/cocoon/acting/ServerPagesAction.java
src/blocks/xsp/java/org/apache/cocoon/components/language/markup/LogicsheetCodeGenerator.java
src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPGenerator.java
@@ -783,6 +844,7 @@
src/blocks/xsp/java/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java
src/blocks/xsp/java/org/apache/cocoon/components/language/generator/GeneratorSelector.java
src/blocks/xsp/java/org/apache/cocoon/generation/AbstractServerPage.java
+ }}}
== Already Merged ==
* src/deprecated
@@ -821,4 +883,4 @@
* Woody
== Questions ==
- * Are we going to merge in changes for Log4J configuration in
CocoonServlet/Portlet(s) ?
+ * Are we going to merge in changes for Log4J configuration in
!CocoonServlet/!CocoonPortlet(s) ?
