You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2005/03/09 11:23:57 UTC
svn commit: r156628 - in cocoon/branches/BRANCH_2_1_X: ./ legal/ lib/
lib/optional/ src/blocks/scratchpad/
Author: cziegeler
Date: Wed Mar 9 02:23:55 2005
New Revision: 156628
URL: http://svn.apache.org/viewcvs?view=rev&rev=156628
Log:
Remove scratchpad block
Removed:
cocoon/branches/BRANCH_2_1_X/legal/commons-betwixt-0.6.jar.license.txt
cocoon/branches/BRANCH_2_1_X/legal/commons-digester-1.6.jar.license.txt
cocoon/branches/BRANCH_2_1_X/legal/servlet-2.3.jar.license.txt
cocoon/branches/BRANCH_2_1_X/lib/optional/apache-garbage-0.0.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/commons-betwixt-0.6.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/commons-digester-1.6.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/servlet-2_3.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/
Modified:
cocoon/branches/BRANCH_2_1_X/blocks.properties
cocoon/branches/BRANCH_2_1_X/gump.xml
cocoon/branches/BRANCH_2_1_X/lib/jars.xml
Modified: cocoon/branches/BRANCH_2_1_X/blocks.properties
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/blocks.properties?view=diff&r1=156627&r2=156628
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/blocks.properties (original)
+++ cocoon/branches/BRANCH_2_1_X/blocks.properties Wed Mar 9 02:23:55 2005
@@ -47,7 +47,7 @@
#-----[dependency]: "authentication-fw" depends on "session-fw".
#-----[dependency]: "authentication-fw" is needed by "portal", "portal-fw".
#include.block.authentication-fw=false
-#-----[dependency]: "batik" is needed by "fop", "scratchpad", "tour".
+#-----[dependency]: "batik" is needed by "fop", "tour".
#include.block.batik=false
#include.block.bsf=false
#include.block.chaperon=false
@@ -84,9 +84,23 @@
#include.block.web3=false
#-----[dependency]: "xmldb" depends on "databases".
#include.block.xmldb=false
-#-----[dependency]: "xsp" is needed by "databases", "forms", "linkrewriter", "python", "scratchpad", "session-fw", "woody".
+#-----[dependency]: "xsp" is needed by "databases", "forms", "linkrewriter", "python", "session-fw", "woody".
#include.block.xsp=false
+# Deprecated blocks ------------------------------------------------------------
+
+# Although some of these blocks may have been stable, they are now deprecated
+# in favour of other blocks and therefore are excluded by default from the build.
+# 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
+#-----[dependency]: "woody" depends on "xsp" (for samples).
+include.block.woody=false
+
# Unstable blocks --------------------------------------------------------------
# Unstable blocks are currently under development and do not guarantee that the
@@ -101,13 +115,12 @@
#include.block.apples=false
#-----[dependency]: "asciiart" is needed by "mail".
#include.block.asciiart=false
-#-----[dependency]: "axis" is needed by "scratchpad".
#include.block.axis=false
-#-----[dependency]: "cron" is needed by "portal", "scratchpad".
+#-----[dependency]: "cron" is needed by "portal".
#include.block.cron=false
#include.block.deli=false
#-----[dependency]: "eventcache" depends on "jms".
-#-----[dependency]: "eventcache" is needed by "repository", "scratchpad".
+#-----[dependency]: "eventcache" is needed by "repository".
#include.block.eventcache=false
#-----[dependency]: "faces" depends on "portal", "taglib".
#include.block.faces=false
@@ -131,10 +144,8 @@
#include.block.proxy=false
#include.block.qdox=false
#-----[dependency]: "repository" depends on "databases", "eventcache".
-#-----[dependency]: "repository" is needed by "scratchpad", "slide", "webdav".
+#-----[dependency]: "repository" is needed by "slide", "webdav".
#include.block.repository=false
-#-----[dependency]: "scratchpad" depends on "axis", "batik" (for samples), "cron", "eventcache", "repository", "xsp".
-#include.block.scratchpad=false
#include.block.serializers=false
#-----[dependency]: "slide" depends on "jms", "repository".
#include.block.slide=false
@@ -146,17 +157,3 @@
#include.block.tour=false
#-----[dependency]: "webdav" depends on "repository".
#include.block.webdav=false
-
-# Deprecated blocks ------------------------------------------------------------
-
-# Although some of these blocks may have been stable, they are now deprecated
-# in favour of other blocks and therefore are excluded by default from the build.
-# 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
-#-----[dependency]: "woody" depends on "xsp" (for samples).
-include.block.woody=false
Modified: cocoon/branches/BRANCH_2_1_X/gump.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/gump.xml?view=diff&r1=156627&r2=156628
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/gump.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/gump.xml Wed Mar 9 02:23:55 2005
@@ -139,45 +139,6 @@
<nag from="Gump <general@gump.apache.org>" to="fop-dev@xml.apache.org"/>
</project>
- <project name="cocoon-block-scratchpad" status="unstable" dir="src/blocks/scratchpad">
- <package>org.apache.cocoon</package>
-
- <ant target="gump-block">
- <property name="block-name" value="scratchpad"/>
- <property name="version" value="@@DATE@@"/>
- </ant>
-
- <depend project="cocoon" inherit="all"/>
- <depend project="castor"/>
- <depend project="commons-jexl"/>
- <depend project="commons-betwixt"/>
- <depend project="jakarta-velocity"/>
- <depend project="jakarta-servletapi-4"/>
- <depend project="cocoon-block-axis"/>
- <depend project="cocoon-block-batik" type="samples"/>
- <depend project="cocoon-block-cron"/>
- <depend project="cocoon-block-eventcache"/>
- <depend project="cocoon-block-repository"/>
- <depend project="cocoon-block-xsp"/>
- <depend project="apache-garbage"/>
-
- <library name="servlet-2_3" bundle="false"/>
- <library name="velocity"/>
- <library name="castor"/>
- <library name="commons-jexl"/>
- <library name="commons-betwixt"/>
- <library name="commons-beanutils"/>
- <library name="commons-digester"/>
- <library name="apache-garbage"/>
-
- <work nested="tools/anttasks"/>
- <home nested="build/cocoon-@@DATE@@"/>
-
- <jar name="blocks/scratchpad-block.jar"/>
-
- <nag from="Gump <general@gump.apache.org>" to="dev@cocoon.apache.org"/>
- </project>
-
<project name="cocoon-block-batik" status="stable" dir="src/blocks/batik">
<package>org.apache.cocoon</package>
Modified: cocoon/branches/BRANCH_2_1_X/lib/jars.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/lib/jars.xml?view=diff&r1=156627&r2=156628
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/lib/jars.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/lib/jars.xml Wed Mar 9 02:23:55 2005
@@ -600,13 +600,6 @@
<lib>core/servlet_2_2.jar</lib>
<homepage>http://jakarta.apache.org/tomcat/</homepage>
</file>
- <file>
- <title>Servlet API</title>
- <description>Servlet API Version 2.3</description>
- <used-by>Cocoon</used-by>
- <lib>optional/servlet-2_3.jar</lib>
- <homepage>http://jakarta.apache.org/tomcat/</homepage>
- </file>
<file>
<title>Velocity engine</title>
@@ -942,28 +935,6 @@
<homepage>http://sourceforge.net/projects/quartz/</homepage>
</file>
- <file>
- <title>Garbage</title>
- <description>Garbage</description>
- <used-by>Scratchpad block</used-by>
- <lib>optional/apache-garbage-0.0.jar</lib>
- <homepage>http://cocoon.apache.org/</homepage>
- </file>
-
- <file>
- <title>Jakarta Commons Betwixt</title>
- <description>
- The Betwixt library provides an XML introspection mechanism for
- mapping beans to XML in a flexible way. It is implemented using
- an XMLIntrospector and XMLBeanInfo classes which are similar to
- the standard Introspector and BeanInfo from the Java Beans
- specification.
- </description>
- <used-by>BetwixtTransformer</used-by>
- <lib>optional/commons-betwixt-0.6.jar</lib>
- <homepage>http://jakarta.apache.org/commons/betwixt/</homepage>
- </file>
-
<file>
<title>Jakarta Commons Beantuils</title>
<description>
@@ -977,7 +948,7 @@
<homepage>http://jakarta.apache.org/commons/beanutils/</homepage>
</file>
- <file>
+ <file id="commons-digester">
<title>Jakarta Commons Digester</title>
<description>
Allow configure an XML -> Java object mapping module, which triggers
@@ -985,7 +956,7 @@
XML elements is recognized. A rich set of predefined rules is
available for your use, or you can also create your own.
</description>
- <used-by>Faces block, BetwixtTransformer</used-by>
+ <used-by>Faces block</used-by>
<lib>optional/commons-digester-1.6.jar</lib>
<homepage>http://jakarta.apache.org/commons/digester/</homepage>
</file>