Merging Branches

This page helps keeping track of merging back the changes already done in the 2.2-dev repository (trunk) to the 2.1.x branch.

URGENT

There are some changes which claimed to be in 2.1 and actually not in 2.1, and changes which are in 2.1 but not in 2.2. Please review the list and help to reconcile discrpancies before a release:
(The original mail by Vadim)

--- cocoon-2.1.X\status.xml	2004-11-11 12:13:14.849524800 -0500
+++ cocoon-2.2.X\status.xml	2004-11-11 12:12:47.129665600 -0500
@@ -260,6 +414,9 @@
      Flow invocations (function calls or continuation invocations) should always
      result in a response. Flowscripts with no response are prohibited.
    </action>
+   <action dev="CZ" type="add" due-to="Sascha-Matthias Kulawik" due-to-email="sascha@kulawik.de">
+     Authentication block: Add authenticator for JAAS.
+   </action>
    <action dev="CZ" type="add" due-to="Juergen Seitz" due-to-email="Juergen.Seitz@Basf-It-Services.Com">
      Portal block: Apply batch for configuring the type handling in the Castor converter.
    </action>

Not Merged

• src/test

     src/test/org/apache/cocoon/environment/mock/MockRequest.java
     src/test/org/apache/cocoon/environment/mock/MockResponse.java
     src/test/org/apache/cocoon/environment/mock/MockSession.java
     src/test/org/apache/cocoon/environment/mock/MockEnvironment.java
     src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.java
     src/test/org/apache/cocoon/components/source/SourceResolverAdapter.java
     src/test/org/apache/cocoon/transformation/CIncludeTransformerTestCase.java
     src/test/org/apache/cocoon/transformation/XIncludeTransformerTestCase.xtest
     src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.xtest
     src/test/org/apache/cocoon/transformation/EncodeURLTransformerTestCase.xtest
     src/test/org/apache/cocoon/transformation/augment-result-1.xml
     src/test/org/apache/cocoon/transformation/EncodeURLTransformerTestCase.java
     src/test/org/apache/cocoon/transformation/AugmentTransformerTestCase.xtest
     src/test/org/apache/cocoon/transformation/encodeurl-result-1.xml
     src/test/org/apache/cocoon/transformation/encodeurl-result-2.xml
     src/test/org/apache/cocoon/transformation/augment-input-1.xml
     src/test/org/apache/cocoon/transformation/AugmentTransformerTestCase.java
     src/test/org/apache/cocoon/transformation/XIncludeTransformerTestCase.java
     src/test/org/apache/cocoon/transformation/encodeurl-input-1.xml
     src/test/org/apache/cocoon/transformation/encodeurl-input-2.xml
     src/test/org/apache/cocoon/transformation/CIncludeTransformerTestCase.xtest
     src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.java
     src/test/org/apache/cocoon/matching/CookieMatcherTestCase.xtest
     src/test/org/apache/cocoon/matching/RegexpURIMatcherTestCase.xtest
     src/test/org/apache/cocoon/matching/RequestAttributeMatcherTestCase.xtest
     src/test/org/apache/cocoon/matching/ParameterMatcherTestCase.xtest
     src/test/org/apache/cocoon/matching/SessionAttributeMatcherTestCase.java
     src/test/org/apache/cocoon/matching/CookieMatcherTestCase.java
     src/test/org/apache/cocoon/matching/WildcardURIMatcherTestCase.java
     src/test/org/apache/cocoon/matching/RegexpURIMatcherTestCase.java
     src/test/org/apache/cocoon/matching/RequestAttributeMatcherTestCase.java
     src/test/org/apache/cocoon/matching/HeaderMatcherTestCase.xtest
     src/test/org/apache/cocoon/matching/RequestParameterMatcherTestCase.xtest
     src/test/org/apache/cocoon/matching/ParameterMatcherTestCase.java
     src/test/org/apache/cocoon/matching/HeaderMatcherTestCase.java
     src/test/org/apache/cocoon/matching/RequestParameterMatcherTestCase.java
     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/WEB-INF/web.xml
     src/webapp/WEB-INF/cocoon.xconf
     

• Libs, Legal, and gump.xml

     lib/optional/servlet-2_3.jar  -- This is the 2.2 location. The 2.1.6-dev location is below:
     src/blocks/scratchpad/lib/servlet-2_3.jar
  
     lib/optional/servlet_2_2.jar  -- Deleted in 2.2. This library is currenlty only in 2.1.6-dev.
  
     // We use the same log4j version in both version. Is OK to move in 2.1.6-dev the library to core?
     lib/optional/log4j-1.2.8.jar
     lib/core/log4j-1.2.8.jar
     

• Root Directory
  status.xml
  

Blocks:

• 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
     src/blocks/javaflow/test/org/apache/cocoon/components/flow/java/test/PrimitivesFlow.java
     src/blocks/javaflow/test/org/apache/cocoon/components/flow/java/test/WrapperContinuable.java
     src/blocks/javaflow/test/org/apache/cocoon/components/flow/java/test/ExtendedContinuable.java
     src/blocks/javaflow/test/org/apache/cocoon/components/flow/java/test/JavaFlowTestCase.java
     src/blocks/javaflow/test/org/apache/cocoon/components/flow/java/test/LinkerContinuable.java
     src/blocks/javaflow/test/org/apache/cocoon/components/flow/java/test/JavaFlowTestCase.xtest
     src/blocks/javaflow/test/org/apache/cocoon/components/flow/java/test/SimpleContinuable.java
     src/blocks/javaflow/test/org/apache/cocoon/components/flow/java/test/InheritanceFlowTest.java
     src/blocks/javaflow/test/org/apache/cocoon/components/flow/java/test/FlowTest.java
     src/blocks/javaflow/test/org/apache/cocoon/components/flow/javascript/JavaScriptFlowTestCase.xtest
     src/blocks/javaflow/test/org/apache/cocoon/components/flow/javascript/JavaScriptFlowTestCase.java
     src/blocks/javaflow/test/org/apache/cocoon/components/flow/javascript/calc.js
     src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/ContinuationContext.java
     src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/JavaInterpreter.java
     src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/ContinuationClassLoader.java
     src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/AbstractContinuable.java
     src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/DecompilingVisitor.java
     src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/Continuation.java
     src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/ContinuationHelper.java
     src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/analyser/Subroutine.java
     src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/analyser/ExceptionHandlers.java
     src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/analyser/UninitializedObjectType.java
     src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/analyser/Subroutines.java
     src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/analyser/LocalVariables.java
     src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/analyser/ExecutionVisitor.java
     src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/analyser/InstructionContext.java
     src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/analyser/Frame.java
     src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/analyser/ControlFlowGraph.java
     src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/analyser/ExceptionHandler.java
     src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/analyser/OperandStack.java
     src/blocks/javaflow/java/org/apache/cocoon/components/flow/javascript/ScriptHelper.java
     src/blocks/javaflow/java/org/apache/cocoon/components/flow/javascript/JavaScriptCompilingClassLoader.java
     src/blocks/javaflow/java/org/apache/cocoon/components/flow/javascript/JavaScriptHelper.java
     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
     

• 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
     src/blocks/scratchpad/test/org/apache/cocoon/components/source/impl/CachingSourceTestCase.java
     src/blocks/scratchpad/test/org/apache/cocoon/components/source/impl/cachingsourcetest.xml
     src/blocks/scratchpad/java/org/apache/cocoon/ant/CocoonTask.java
     src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/InspectableTraversableCachingSource.java
     src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/DelayRefresher.java
     src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/CachingSourceFactory.java
     src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/TraversableCachingSource.java
     src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/UpdateTarget.java
     src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/CachingSource.java
     src/blocks/scratchpad/java/org/apache/cocoon/components/pipeline/impl/ExpiresCachingProcessingPipeline.java
     src/blocks/scratchpad/java/org/apache/cocoon/components/flow/groovy/GroovyCompilingClassLoader.java
     src/blocks/scratchpad/java/org/apache/cocoon/components/flow/groovy/GroovyInterpreter.java
     src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom/AO_FOM_JavaScriptInterpreter.java
     src/blocks/scratchpad/java/org/apache/cocoon/components/store/ehcache-defaults.xml
     src/blocks/scratchpad/java/org/apache/cocoon/components/store/EHStore.java
     src/blocks/scratchpad/java/org/apache/cocoon/caching/IdentifierCacheKey.java
     src/blocks/scratchpad/java/org/apache/cocoon/util/SoftSourceCache.java
     src/blocks/scratchpad/samples/groovyflow/samples.xml
     src/blocks/scratchpad/samples/groovyflow/sitemap.xmap
     src/blocks/scratchpad/samples/groovyflow/flow/CalculatorFlow.gy
     src/blocks/scratchpad/samples/groovyflow/flow/FormFlow.gy
     src/blocks/scratchpad/samples/groovyflow/flow/PersistenceFlow.gy
     src/blocks/scratchpad/samples/scratchpad-samples.xml
     src/blocks/scratchpad/conf/caching-source.xconf
     src/blocks/scratchpad/conf/groovyflow.xsamples
     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
     

• 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
     src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java/EclipseJavaCompiler.java
     src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java/JavaLanguage.java
     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/confpatch
• src/deprecated
• src/documentation
• src/java
• src/mocks
• src/resources
• src/samples
• misc
• tools

Blocks:

• apples
• asciiart
• authentication-fw
• axis
• batik
• bsf (Groovy support is not merged as it requires JDK 1.4)
• chaperon
• cron
• databases
• Deli
• eventcache
• fop
• forms (some new features added by Tim are kept in 2.2 only for now)
• hsqldb
• html
• itext
• jfor
• jms
• jsp
• linkrewriter
• linotype
• lucence
• Mail
• midi
• Naming
• ojb
• Paranoid
• Petstore
• Php
• Poi
• Portal
• Portal-FW
• Profiler
• Proxy
• Python
• qdox
• repository
• serializers
• Session-FW
• slide
• slop
• stx
• taglib
• tour
• velocity
• web3
• webdav
• woody
• xmldb