Date: 2004-11-11T17:51:54
Editor: VadimGritsenko <[EMAIL PROTECTED]>
Wiki: Cocoon Wiki
Page: MergingBranches
URL: http://wiki.apache.org/cocoon/MergingBranches
merge html block
Change Log:
------------------------------------------------------------------------------
@@ -18,26 +18,6 @@
<action dev="CZ" type="add" due-to="Juergen Seitz" due-to-email="[EMAIL
PROTECTED]">
Portal block: Apply batch for configuring the type handling in the
Castor converter.
</action>
-@@ -438,7 +595,7 @@
- </action>
- <action dev="AG" type="update">
- Update ant to 1.6.2, commons-jxpath to 1.2, commons-beanutils to 1.7,
-- POI to 2.5.1-final-20040804, commons-httpclient to 2.0.1,
-+ POI to 2.5.1-final-20040804, commons-httpclient to 2.0.1, nekohtml to
0.9.3,
- hsqldb to 1.7.2, jcs to 1.1-dev-20040811, quartz to 1.4.2, asm to 1.4.3,
- asm-util to 1.4.3 and groovy to 1.0-beta6
- </action>
-@@ -466,10 +623,15 @@
- custom publish/subscribe components.
- </action>
-+ <action dev="UV" type="add">
-+ Added a NekoHTMLGenerator to HTML block. This is a simpler HTML parser
than
-+ JTidy, which preserves more of the original HTML, primarily just
balancing
-+ closing tags.
-+ </action>
- <action dev="TC" type="add" fixes-bug="29935" due-to="Leszek Gawron"
due-to-email="[EMAIL PROTECTED]">
- Added support for stripping root elements in the CIncludeTransformer.
- </action>
@@ -515,6 +677,9 @@
<action dev="AG" type="fix" fixes-bug="29369" due-to="Juan Jose Pablos">
Move commons-logging-1.0.4.jar to lib/core as jcs.jar depends on it.
@@ -124,8 +104,6 @@
}}}
* Libs, Legal, and gump.xml
{{{
- src/blocks/html/lib/nekohtml-0.9.2.jar -- Pending a backporting of
NekoHTMLGenerator....
-
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
@@ -139,15 +117,6 @@
status.xml
Blocks:
- * 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
@@ -261,6 +230,7 @@
* fop
* forms (some new features added by Tim are kept in 2.2 only for now)
* hsqldb
+ * html
* itext
* jfor
* jms
