Date: 2004-08-11T13:35:22
Editor: VadimGritsenko <[EMAIL PROTECTED]>
Wiki: Cocoon Wiki
Page: MergingBranches
URL: http://wiki.apache.org/cocoon/MergingBranches
no comment
Change Log:
------------------------------------------------------------------------------
@@ -1,10 +1,9 @@
-This page helps keeping track of merging back the changes already done in the
2.2-dev repository to the 2.1.x branch.
+= 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.
== Not Merged ==
* src/java
src/java/org/apache/cocoon/Cocoon.java
- src/java/org/apache/cocoon/CocoonAccess.java
- src/java/org/apache/cocoon/servlet/CocoonServlet.java
src/java/org/apache/cocoon/selection/ExceptionSelector.java
src/java/org/apache/cocoon/selection/RegexpRequestParameterSelector.java
src/java/org/apache/cocoon/selection/AbstractRegexpSelector.java
@@ -808,7 +807,7 @@
* Paranoid
* Petstore
* Php
- * Portal (see below)
+ * Portal
* Portal-FW
* Profiler
* Proxy
@@ -822,5 +821,4 @@
* Woody
== Questions ==
- * Portal: !ManagedCocoonPortlet is not merged.
- ''-- I'll do it. Vadim.''
+ * Are we going to merge in changes for Log4J configuration in
CocoonServlet/Portlet(s) ?
