Author: tony
Date: Thu Oct 28 14:51:15 2004
New Revision: 55895
Modified:
cocoon/branches/BRANCH_2_1_X/blocks.properties
cocoon/branches/BRANCH_2_1_X/gump.xml
cocoon/branches/BRANCH_2_1_X/status.xml
Log:
deprecating the php block
Modified: cocoon/branches/BRANCH_2_1_X/blocks.properties
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/blocks.properties (original)
+++ cocoon/branches/BRANCH_2_1_X/blocks.properties Thu Oct 28 14:51:15 2004
@@ -72,7 +72,6 @@
#include.block.lucene=false
#include.block.naming=false
#include.block.paranoid=false
-#include.block.php=false
#include.block.poi=false
#-----[dependency]: "portal" depends on "authentication-fw", "html",
"session-fw".
#-----[dependency]: "portal" is needed by "faces".
@@ -160,6 +159,7 @@
# For including one of them you have to set the exclude property into comment
in
# blocks.properties.
+include.block.php=false
#-----[dependency]: "portal-fw" depends on "authentication-fw", "session-fw".
include.block.portal-fw=false
include.block.swf=false
Modified: cocoon/branches/BRANCH_2_1_X/gump.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/gump.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/gump.xml Thu Oct 28 14:51:15 2004
@@ -451,7 +451,7 @@
<nag from="Gump <[email protected]>"
to="[email protected]"/>
</project>
- <project name="cocoon-block-php" status="stable">
+ <project name="cocoon-block-php" status="deprecated">
<package>org.apache.cocoon</package>
<ant target="gump-block">
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Thu Oct 28 14:51:15 2004
@@ -199,6 +199,10 @@
<changes>
<release version="@version@" date="@date@">
+ <action dev="ATC" type="update">
+ Deprecated the PHP block since the PHP servlet the generator depends on
+ never worked properly. Explicitly excluded the PHP block from
blocks.properties.
+ </action>
<action dev="VG" type="fix" fixes-bug="27176" due-to="Guillaume Deflache"
due-to-email="[EMAIL PROTECTED]">
XSP Block: Add space="strip" attribute support for <xsp:page>
element. When present, all extra whitespace from XSP source is stripped.