Author: danielf Date: Tue Jan 11 23:12:11 2005 New Revision: 124942 URL: http://svn.apache.org/viewcvs?view=rev&rev=124942 Log: Moved the common-beanutils jar from faces to optional and updated gump and jars. I need beanutils in Template. Added: cocoon/trunk/lib/optional/commons-beanutils-core-1.7.jar - copied unchanged from r123846, cocoon/trunk/src/blocks/faces/lib/commons-beanutils-core-1.7.jar Removed: cocoon/trunk/src/blocks/faces/lib/commons-beanutils-core-1.7.jar Modified: cocoon/trunk/gump.xml cocoon/trunk/lib/jars.xml
Modified: cocoon/trunk/gump.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/gump.xml?view=diff&rev=124942&p1=cocoon/trunk/gump.xml&r1=124941&p2=cocoon/trunk/gump.xml&r2=124942 ============================================================================== --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Tue Jan 11 23:12:11 2005 @@ -18,7 +18,6 @@ <!--+ | Cocoon GUMP Descriptor | - | $Id$ +--> <module name="cocoon"> <url href="http://cocoon.apache.org/"/> @@ -742,6 +741,7 @@ <depend project="daisy-htmlcleaner"/> <depend project="jakarta-oro"/> <depend project="cocoon-block-xsp" type="samples"/> + <depend project="cocoon-block-conversion"/> <work nested="build/cocoon-@@DATE@@/blocks/forms/dest"/> <work nested="build/cocoon-@@DATE@@/blocks/forms/test"/> @@ -1226,13 +1226,32 @@ </ant> <depend project="cocoon" inherit="all"/> + <depend project="commons-beanutils" inherit="all"/> <depend project="commons-jexl"/> + <depend project="commons-jxpath"/> <work nested="build/cocoon-@@DATE@@/blocks/template/test"/> <work nested="tools/anttasks"/> <home nested="build/cocoon-@@DATE@@"/> <jar name="blocks/template-block.jar"/> + + <nag from="Gump <general@gump.apache.org>" to="dev@cocoon.apache.org"/> + </project> + <project name="cocoon-block-conversion" status="unstable"> + <package>org.apache.cocoon</package> + + <ant target="gump-block"> + <property name="block-name" value="conversion"/> + <property name="version" value="@@DATE@@"/> + </ant> + + <depend project="cocoon" inherit="all"/> + + <work nested="tools/anttasks"/> + <home nested="build/cocoon-@@DATE@@"/> + + <jar name="blocks/conversion-block.jar"/> <nag from="Gump <general@gump.apache.org>" to="dev@cocoon.apache.org"/> </project> Modified: cocoon/trunk/lib/jars.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/jars.xml?view=diff&rev=124942&p1=cocoon/trunk/lib/jars.xml&r1=124941&p2=cocoon/trunk/lib/jars.xml&r2=124942 ============================================================================== --- cocoon/trunk/lib/jars.xml (original) +++ cocoon/trunk/lib/jars.xml Tue Jan 11 23:12:11 2005 @@ -283,9 +283,9 @@ <title>ASM</title> <description> ASM is a Java bytecode manipulation framework. It can be used to - dynamically generate stub classes or other proxy classes, directly in - binary form, or to dynamically modify classes at load time, i.e., just - before they are loaded into the Java Virtual Machine. + dynamically generate stub classes or other proxy classes, directly in + binary form, or to dynamically modify classes at load time, i.e., just + before they are loaded into the Java Virtual Machine. </description> <used-by>BSF Block (Script generator, script action)</used-by> <lib>optional/asm-1.5.2.jar</lib> @@ -884,7 +884,7 @@ However, these APIs can be quite complex to understand and utilize. The BeanUtils component provides easy-to-use wrappers around these capabilities. </description> - <used-by>Faces block, BetwixtTransformer</used-by> + <used-by>Faces block, BetwixtTransformer, Template</used-by> <lib>faces/lib/commons-beanutils-core-1.7.jar</lib> <homepage>http://jakarta.apache.org/commons/beanutils/</homepage> </file> @@ -898,7 +898,7 @@ available for your use, or you can also create your own. </description> <used-by>Faces block, BetwixtTransformer</used-by> - <lib>faces/lib/commons-digester-1.6.jar</lib> + <lib>optional/commons-digester-1.6.jar</lib> <homepage>http://jakarta.apache.org/commons/digester/</homepage> </file> Copied: cocoon/trunk/lib/optional/commons-beanutils-core-1.7.jar (from r123846, cocoon/trunk/src/blocks/faces/lib/commons-beanutils-core-1.7.jar) Url: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/commons-beanutils-core-1.7.jar?view=diff&rev=124942&p1=cocoon/trunk/src/blocks/faces/lib/commons-beanutils-core-1.7.jar&r1=123846&p2=cocoon/trunk/lib/optional/commons-beanutils-core-1.7.jar&r2=124942 ============================================================================== Deleted: /cocoon/trunk/src/blocks/faces/lib/commons-beanutils-core-1.7.jar Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/faces/lib/commons-beanutils-core-1.7.jar?view=auto&rev=124941 ==============================================================================