You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by to...@apache.org on 2004/10/28 23:51:17 UTC
svn commit: rev 55895 - cocoon/branches/BRANCH_2_1_X
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 <general@gump.apache.org>" to="dev@cocoon.apache.org"/>
</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="guillaume@anyware-tech.com">
XSP Block: Add space="strip" attribute support for <xsp:page>
element. When present, all extra whitespace from XSP source is stripped.
Re: svn commit: rev 55895 - cocoon/branches/BRANCH_2_1_X
Posted by Tony Collen <co...@umn.edu>.
Vadim Gritsenko wrote:
> PS You re-generated blocks.properties, not hand-edited it, right?
>
I hand-edited it at first, and then I found the re-generation script,
ran it, and the result was the same.
> Vadim
Tony
Re: svn commit: rev 55895 - cocoon/branches/BRANCH_2_1_X
Posted by Vadim Gritsenko <va...@reverycodes.com>.
Tony Collen wrote:
> tony@apache.org wrote:
>
>> --- 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 <general@gump.apache.org>"
>> to="dev@cocoon.apache.org"/>
>> </project>
>>
>> - <project name="cocoon-block-php" status="stable">
>> + <project name="cocoon-block-php" status="deprecated">
>> <package>org.apache.cocoon</package>
>>
>> <ant target="gump-block">
>
>
>
> Is this all that needed to be done in order to "correctly" deprecate the
> block, or is there something else I'm missing (e.g. a @deprecated tag on
> the PHPGenerator) ?
Of course.
PS You re-generated blocks.properties, not hand-edited it, right?
Vadim
Re: svn commit: rev 55895 - cocoon/branches/BRANCH_2_1_X
Posted by Tony Collen <co...@umn.edu>.
tony@apache.org wrote:
> 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 <general@gump.apache.org>" to="dev@cocoon.apache.org"/>
> </project>
>
> - <project name="cocoon-block-php" status="stable">
> + <project name="cocoon-block-php" status="deprecated">
> <package>org.apache.cocoon</package>
>
> <ant target="gump-block">
Is this all that needed to be done in order to "correctly" deprecate the
block, or is there something else I'm missing (e.g. a @deprecated tag on
the PHPGenerator) ?
Tony