svn commit: r157700 - cocoon/trunk/gump.xml
Author: stefano Date: Tue Mar 15 22:04:35 2005 New Revision: 157700 URL: http://svn.apache.org/viewcvs?view=revrev=157700 Log: this should fix the gump build Modified: cocoon/trunk/gump.xml Modified: cocoon/trunk/gump.xml URL: http://svn.apache.org/viewcvs/cocoon/trunk/gump.xml?view=diffr1=157699r2=157700 == --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Tue Mar 15 22:04:35 2005 @@ -41,7 +41,7 @@ mkdir dir=build/cocoon-@@DATE@@/test/ ant target=gump-core - property name=version value=@@DATE@@/ + property name=build value=build/cocoon-@@DATE@@/ depend property=logkit.jar project=avalon-logkit/ depend property=avalonapi.jar project=avalon-framework-api/ /ant
svn commit: r157744 - cocoon/trunk/gump.xml
Author: stefano Date: Wed Mar 16 05:27:07 2005 New Revision: 157744 URL: http://svn.apache.org/viewcvs?view=revrev=157744 Log: damn, forgot to fix the blocks (sorry for the gump flood people) Modified: cocoon/trunk/gump.xml Modified: cocoon/trunk/gump.xml URL: http://svn.apache.org/viewcvs/cocoon/trunk/gump.xml?view=diffr1=157743r2=157744 == --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Wed Mar 16 05:27:07 2005 @@ -122,7 +122,7 @@ ant target=gump-block property name=block-name value=fop/ - property name=version value=@@DATE@@/ + property name=build value=build/cocoon-@@DATE@@/ /ant depend project=cocoon inherit=all/ @@ -145,7 +145,7 @@ ant target=gump-block property name=block-name value=scratchpad/ - property name=version value=@@DATE@@/ + property name=build value=build/cocoon-@@DATE@@/ /ant depend project=cocoon inherit=all/ @@ -187,7 +187,7 @@ ant target=gump-block property name=block-name value=batik/ - property name=version value=@@DATE@@/ + property name=build value=build/cocoon-@@DATE@@/ /ant depend project=cocoon inherit=all/ @@ -209,7 +209,7 @@ ant target=gump-block property name=block-name value=chaperon/ - property name=version value=@@DATE@@/ + property name=build value=build/cocoon-@@DATE@@/ /ant depend project=cocoon inherit=all/ @@ -234,7 +234,7 @@ ant target=gump-block property name=block-name value=jfor/ - property name=version value=@@DATE@@/ + property name=build value=build/cocoon-@@DATE@@/ /ant depend project=cocoon inherit=all/ @@ -254,7 +254,7 @@ packageorg.apache.cocoon/package ant target=gump-block property name=block-name value=itext/ - property name=version value=@@DATE@@/ + property name=build value=build/cocoon-@@DATE@@/ /ant depend project=cocoon inherit=all/ @@ -275,7 +275,7 @@ ant target=gump-block property name=block-name value=session-fw/ - property name=version value=@@DATE@@/ + property name=build value=build/cocoon-@@DATE@@/ /ant depend project=cocoon inherit=all/ @@ -293,7 +293,7 @@ ant target=gump-block property name=block-name value=authentication-fw/ - property name=version value=@@DATE@@/ + property name=build value=build/cocoon-@@DATE@@/ /ant depend project=cocoon inherit=all/ @@ -312,7 +312,7 @@ ant target=gump-block property name=block-name value=databases/ - property name=version value=@@DATE@@/ + property name=build value=build/cocoon-@@DATE@@/ /ant depend project=cocoon inherit=all/ @@ -334,7 +334,7 @@ ant target=gump-block property name=block-name value=hsqldb/ - property name=version value=@@DATE@@/ + property name=build value=build/cocoon-@@DATE@@/ /ant depend project=cocoon inherit=all/ @@ -356,7 +356,7 @@ ant target=gump-block property name=block-name value=poi/ - property name=version value=@@DATE@@/ + property name=build value=build/cocoon-@@DATE@@/ /ant depend project=cocoon inherit=all/ @@ -378,7 +378,7 @@ ant target=gump-block property name=block-name value=naming/ - property name=version value=@@DATE@@/ + property name=build value=build/cocoon-@@DATE@@/ /ant depend project=cocoon inherit=all/ @@ -399,7 +399,7 @@ ant target=gump-block property name=block-name value=jsp/ - property name=version value=@@DATE@@/ + property name=build value=build/cocoon-@@DATE@@/ /ant depend project=cocoon inherit=all/ @@ -418,7 +418,7 @@ ant target=gump-block property name=block-name value=python/ - property name=version value=@@DATE@@/ + property name=build value=build/cocoon-@@DATE@@/ /ant depend project=cocoon inherit=all/ @@ -438,7 +438,7 @@ ant target=gump-block property name=block-name value=lucene/ - property name=version value=@@DATE@@/ + property name=build value=build/cocoon-@@DATE@@/ /ant depend project=cocoon inherit=all/ @@ -459,7 +459,7 @@ ant target=gump-block property name=block-name value=html/ - property name=version value=@@DATE@@/ + property name=build value=build/cocoon-@@DATE@@/ /ant depend project=cocoon inherit=all/ @@ -482,7 +482,7 @@ ant target=gump-block property name=block-name value=bsf/ - property name=version value=@@DATE@@/ + property name=build value=build/cocoon-@@DATE@@/ /ant depend project=cocoon inherit=all/ @@ -506,7 +506,7 @@ ant target=gump-block property name=block-name value=profiler/ - property name=version value=@@DATE@@/ + property name=build value=build/cocoon-@@DATE@@/ /ant depend
svn commit: r153477 - in cocoon/trunk: blocks.properties src/blocks/linotype/
Author: stefano Date: Fri Feb 11 16:45:13 2005 New Revision: 153477 URL: http://svn.apache.org/viewcvs?view=revrev=153477 Log: removing linotype from the trunk Removed: cocoon/trunk/src/blocks/linotype/ Modified: cocoon/trunk/blocks.properties Modified: cocoon/trunk/blocks.properties URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks.properties?view=diffr1=153476r2=153477 == --- cocoon/trunk/blocks.properties (original) +++ cocoon/trunk/blocks.properties Fri Feb 11 16:45:13 2005 @@ -119,7 +119,6 @@ #-[dependency]: jms depends on databases (for samples), hsqldb (for samples). #-[dependency]: jms is needed by eventcache, slide. #include.block.jms=false -#include.block.linotype=false #-[dependency]: mail depends on asciiart, scratchpad. #include.block.mail=false #include.block.midi=false
svn commit: r149104 - /cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java
Author: stefano Date: Sat Jan 29 21:22:17 2005 New Revision: 149104 URL: http://svn.apache.org/viewcvs?view=revrev=149104 Log: somebody forgot an annoying System.out :-) Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java?view=diffrev=149104p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.javar1=149103p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.javar2=149104 == --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java Sat Jan 29 21:22:17 2005 @@ -135,7 +135,6 @@ this.roleManager.enableLogging(logger); String msg = Lazy mode: + this.lazyMode; logger.debug(msg); -System.out.println(msg); } /* (non-Javadoc)
svn commit: r109354 - /cocoon/trunk/gump.xml
Author: stefano Date: Wed Dec 1 08:38:16 2004 New Revision: 109354 URL: http://svn.apache.org/viewcvs?view=revrev=109354 Log: this should fix the problem with the template block Modified: cocoon/trunk/gump.xml Modified: cocoon/trunk/gump.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/gump.xml?view=diffrev=109354p1=cocoon/trunk/gump.xmlr1=109353p2=cocoon/trunk/gump.xmlr2=109354 == --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Wed Dec 1 08:38:16 2004 @@ -1226,6 +1226,7 @@ depend project=cocoon inherit=all/ depend project=commons-jexl/ +work nested=build/cocoon-@@DATE@@/blocks/template/test/ work nested=tools/anttasks/ home nested=build/cocoon-@@DATE@@/ @@ -1233,6 +1234,7 @@ nag from=Gump lt;general@gump.apache.orggt; to=dev@cocoon.apache.org/ /project + !-- COCOON SUPPLIED PROJECTS @@ -1344,6 +1346,5 @@ packageorg.outerj.daisy.xmlutil/package jar name=src/blocks/forms/lib/daisy-util-1.1.jar/ /project - /module
svn commit: r105929 - cocoon/trunk
Author: stefano Date: Fri Nov 19 19:26:08 2004 New Revision: 105929 Modified: cocoon/trunk/gump.xml Log: missing dependency Modified: cocoon/trunk/gump.xml == --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Fri Nov 19 19:26:08 2004 @@ -577,6 +577,7 @@ depend project=jta/ depend project=jakarta-slide/ depend project=jdom/ +depend project=jms/ work nested=tools/anttasks/ home nested=build/cocoon-@@DATE@@/
svn commit: r105865 - cocoon/trunk
Author: stefano Date: Fri Nov 19 12:12:24 2004 New Revision: 105865 Modified: cocoon/trunk/gump.xml Log: missing dependency for the repository block Modified: cocoon/trunk/gump.xml == --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Fri Nov 19 12:12:24 2004 @@ -907,6 +907,7 @@ depend project=cocoon-block-jms/ depend project=jms/ depend project=cocoon-block-xsp type=samples/ +depend project=jms/ work nested=build/cocoon-@@DATE@@/blocks/eventcache/dest/ work nested=build/cocoon-@@DATE@@/blocks/eventcache/test/ @@ -1075,6 +1076,7 @@ depend project=cocoon-block-databases / depend project=cocoon-block-eventcache / +depend project=excalibur-datasource/ work nested=tools/anttasks/ home nested=build/cocoon-@@DATE@@/
svn commit: r105870 - cocoon/trunk
Author: stefano Date: Fri Nov 19 12:17:17 2004 New Revision: 105870 Modified: cocoon/trunk/gump.xml Log: other missing dependencies Modified: cocoon/trunk/gump.xml == --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Fri Nov 19 12:17:17 2004 @@ -949,6 +949,7 @@ depend project=cocoon inherit=all/ depend project=cocoon-block-forms type=samples/ depend project=cocoon-block-lucene/ +depend project=jakarta-lucene/ work nested=tools/anttasks/ home nested=build/cocoon-@@DATE@@/
svn commit: rev 57057 - cocoon/trunk
Author: stefano Date: Tue Nov 9 09:02:09 2004 New Revision: 57057 Modified: cocoon/trunk/gump.xml Log: moving to the old jms since we have now upgraded to 1.1 and should fix the problem Modified: cocoon/trunk/gump.xml == --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Tue Nov 9 09:02:09 2004 @@ -1032,7 +1032,7 @@ !--depend project=cocoon-block-eventcache type=samples/-- depend project=cocoon-block-databases type=samples/ depend project=cocoon-block-hsqldb/ -depend project=geronimo-spec-jms/ +depend project=jms/ work nested=tools/anttasks/ home nested=build/cocoon-@@DATE@@/
svn commit: rev 57100 - cocoon/trunk
Author: stefano Date: Tue Nov 9 13:08:56 2004 New Revision: 57100 Modified: cocoon/trunk/gump.xml Log: apparently, the jms block depends on the hsqldb code (which I find rather brain-dead if you ask me, but what the hell) Modified: cocoon/trunk/gump.xml == --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Tue Nov 9 13:08:56 2004 @@ -1031,7 +1031,7 @@ !-- commented out because of circular dependency -- !--depend project=cocoon-block-eventcache type=samples/-- depend project=cocoon-block-databases type=samples/ -depend project=cocoon-block-hsqldb/ +depend project=cocoon-block-hsqldb inherit=all/ depend project=jms/ work nested=tools/anttasks/
svn commit: rev 56534 - cocoon/trunk
Author: stefano Date: Wed Nov 3 16:23:56 2004 New Revision: 56534 Modified: cocoon/trunk/gump.xml Log: let's try again with the httpclient-2.0 branch Modified: cocoon/trunk/gump.xml == --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Wed Nov 3 16:23:56 2004 @@ -594,7 +594,7 @@ /ant depend project=cocoon inherit=all/ -depend project=commons-httpclient/ +depend project=commons-httpclient-2.0-branch/ depend project=commons-logging/ work nested=tools/anttasks/
svn commit: rev 56535 - cocoon/trunk
Author: stefano Date: Wed Nov 3 16:26:20 2004 New Revision: 56535 Modified: cocoon/trunk/gump.xml Log: it seems that we depend on the geronimo version of JMS Modified: cocoon/trunk/gump.xml == --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Wed Nov 3 16:26:20 2004 @@ -1025,7 +1025,7 @@ !--depend project=cocoon-block-eventcache type=samples/-- depend project=cocoon-block-databases type=samples/ depend project=cocoon-block-hsqldb/ -depend project=jms/ +depend project=geronimo-spec-jms/ work nested=tools/anttasks/ home nested=build/cocoon-@@DATE@@/
svn commit: rev 56570 - cocoon/trunk
Author: stefano Date: Wed Nov 3 22:03:14 2004 New Revision: 56570 Modified: cocoon/trunk/gump.xml Log: fixing the 'form' block and 'woody' block that were failing because their own classes were not in the classpath for compiling the tests Modified: cocoon/trunk/gump.xml == --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Wed Nov 3 22:03:14 2004 @@ -736,6 +736,7 @@ depend project=jakarta-oro/ depend project=cocoon-block-xsp type=samples/ +work nested=build/cocoon-@@DATE@@/blocks/forms/dest/ work nested=build/cocoon-@@DATE@@/blocks/forms/test/ work nested=tools/anttasks/ home nested=build/cocoon-@@DATE@@/ @@ -758,6 +759,7 @@ depend project=jakarta-oro/ depend project=cocoon-block-xsp type=samples/ +work nested=build/cocoon-@@DATE@@/blocks/woody/dest/ work nested=build/cocoon-@@DATE@@/blocks/woody/test/ work nested=tools/anttasks/ home nested=build/cocoon-@@DATE@@/
svn commit: rev 56517 - cocoon/trunk
Author: stefano Date: Wed Nov 3 11:37:00 2004 New Revision: 56517 Modified: cocoon/trunk/gump.xml Log: fixing the target names Modified: cocoon/trunk/gump.xml == --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Wed Nov 3 11:37:00 2004 @@ -1134,7 +1134,7 @@ project name=cocoon-block-tour status=unstable packageorg.apache.cocoon/package -ant target=tour-block +ant target=gump-block property name=block-name value=tour/ property name=version value=@@DATE@@/ /ant @@ -1156,7 +1156,7 @@ project name=cocoon-block-faces status=unstable packageorg.apache.cocoon/package -ant target=faces-block +ant target=gump-block property name=block-name value=faces/ property name=version value=@@DATE@@/ /ant
svn commit: rev 56518 - cocoon/trunk/tools/targets
Author: stefano
Date: Wed Nov 3 11:53:02 2004
New Revision: 56518
Modified:
cocoon/trunk/tools/targets/compile-build.xml
Log:
hopefully this should fix those blocks now
Modified: cocoon/trunk/tools/targets/compile-build.xml
==
--- cocoon/trunk/tools/targets/compile-build.xml(original)
+++ cocoon/trunk/tools/targets/compile-build.xmlWed Nov 3 11:53:02 2004
@@ -178,9 +178,7 @@
!-- package testcase code --
target name=package-testcase depends=compile-tests
jar jarfile=${build}/${name}-testcase.jar index=true
- fileset dir=${build.test}
-include name=org/apache/cocoon/*/
- /fileset
+ fileset dir=${build.test} includes=**/*.class/
/jar
!-- optionally add source files to the jar --
if
svn commit: rev 56303 - cocoon/trunk
Author: stefano Date: Mon Nov 1 16:07:35 2004 New Revision: 56303 Modified: cocoon/trunk/gump.xml Log: the bsf module depends on jakarta-bsf not on the IBM one Modified: cocoon/trunk/gump.xml == --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Mon Nov 1 16:07:35 2004 @@ -475,7 +475,7 @@ /ant depend project=cocoon inherit=all/ -depend project=bsf/ +depend project=jakarta-bsf/ work nested=tools/anttasks/ home nested=build/cocoon-@@DATE@@/
svn commit: rev 56317 - cocoon/trunk/tools/targets
Author: stefano
Date: Mon Nov 1 17:25:00 2004
New Revision: 56317
Modified:
cocoon/trunk/tools/targets/admin-build.xml
Log:
make sure we package the testcases too (needed for the block tests to compile)
Modified: cocoon/trunk/tools/targets/admin-build.xml
==
--- cocoon/trunk/tools/targets/admin-build.xml (original)
+++ cocoon/trunk/tools/targets/admin-build.xml Mon Nov 1 17:25:00 2004
@@ -47,7 +47,7 @@
!-- === Gump Targets ==
--
!-- compiles and packages the core classes and the deprecated classes --
- target name=gump-core depends=package-core, package-deprecated,
validate-jars, core-junit-tests/
+ target name=gump-core depends=package, validate-jars, core-junit-tests/
!-- compiles and packages a single block identified by ${block-name} --
target name=gump-block depends=compile-core, compile-deprecated,
prepare-blocks, compile-tests
svn commit: rev 56318 - cocoon/trunk
Author: stefano Date: Mon Nov 1 17:25:46 2004 New Revision: 56318 Modified: cocoon/trunk/gump.xml Log: adding the packages tests so that blocks tests can compile, this should fix a bunch of blocks that currently fail Modified: cocoon/trunk/gump.xml == --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Mon Nov 1 17:25:46 2004 @@ -97,6 +97,7 @@ jar name=cocoon.jar/ jar name=cocoon-deprecated.jar/ +jar name=cocoon-testcase.jar/ javadoc parent=build/cocoon-@@DATE@@/javadocs/
svn commit: rev 56377 - cocoon/trunk/tools/targets
Author: stefano
Date: Tue Nov 2 07:02:52 2004
New Revision: 56377
Modified:
cocoon/trunk/tools/targets/compile-build.xml
Log:
adding all tests to the test jar so that blocks find them when compiled by gump
Modified: cocoon/trunk/tools/targets/compile-build.xml
==
--- cocoon/trunk/tools/targets/compile-build.xml(original)
+++ cocoon/trunk/tools/targets/compile-build.xmlTue Nov 2 07:02:52 2004
@@ -179,10 +179,7 @@
target name=package-testcase depends=compile-tests
jar jarfile=${build}/${name}-testcase.jar index=true
fileset dir=${build.test}
-include name=org/apache/cocoon/environment/mock/*/
-include
name=org/apache/cocoon/components/source/SourceResolverAdapter*/
-include name=org/apache/cocoon/SitemapComponentTestCase*/
-include name=org/apache/cocoon/xml/WhitespaceFilter*/
+include name=org/apache/cocoon/*/
/fileset
/jar
!-- optionally add source files to the jar --
svn commit: rev 56380 - cocoon/trunk
Author: stefano Date: Tue Nov 2 07:09:44 2004 New Revision: 56380 Modified: cocoon/trunk/gump.xml Log: missing dependency for the jms block Modified: cocoon/trunk/gump.xml == --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Tue Nov 2 07:09:44 2004 @@ -1025,6 +1025,7 @@ !--depend project=cocoon-block-eventcache type=samples/-- depend project=cocoon-block-databases type=samples/ depend project=cocoon-block-hsqldb/ +depend project=jms/ work nested=tools/anttasks/ home nested=build/cocoon-@@DATE@@/
svn commit: rev 56180 - cocoon/trunk
Author: stefano Date: Sun Oct 31 18:09:49 2004 New Revision: 56180 Modified: cocoon/trunk/gump.xml Log: adding missing dependency to a block, for the other failing blocks, the problem seems to be more substantial Modified: cocoon/trunk/gump.xml == --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Sun Oct 31 18:09:49 2004 @@ -977,6 +977,7 @@ depend project=cocoon inherit=all/ depend project=quartz/ +depend project=concurrent/ work nested=tools/anttasks/ home nested=build/cocoon-@@DATE@@/
svn commit: rev 56295 - cocoon/trunk
Author: stefano Date: Mon Nov 1 15:26:03 2004 New Revision: 56295 Modified: cocoon/trunk/gump.xml Log: fixing the hsqlqd block dependencies Modified: cocoon/trunk/gump.xml == --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Mon Nov 1 15:26:03 2004 @@ -342,7 +342,7 @@ work nested=tools/anttasks/ home nested=build/cocoon-@@DATE@@/ -jar name=hsqldb-block.jar/ +jar name=blocks/hsqldb-block.jar/ nag from=Gump lt;general@gump.apache.orggt; to=dev@cocoon.apache.org/ /project
svn commit: rev 56298 - cocoon/trunk
Author: stefano Date: Mon Nov 1 15:55:30 2004 New Revision: 56298 Modified: cocoon/trunk/gump.xml Log: adding missing dependency to the cron block Modified: cocoon/trunk/gump.xml == --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Mon Nov 1 15:55:30 2004 @@ -978,6 +978,7 @@ depend project=cocoon inherit=all/ depend project=quartz/ depend project=concurrent/ +depend project=excalibur-datasource/ work nested=tools/anttasks/ home nested=build/cocoon-@@DATE@@/
svn commit: rev 56299 - cocoon/trunk
Author: stefano Date: Mon Nov 1 15:58:24 2004 New Revision: 56299 Modified: cocoon/trunk/gump.xml Log: adding pluto as a dependency to the portal block Modified: cocoon/trunk/gump.xml == --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Mon Nov 1 15:58:24 2004 @@ -799,6 +799,7 @@ depend project=jtidy/ depend project=castor/ depend project=commons-collections/ +depend project=jakarta-pluto inherit=runtime/ work nested=tools/anttasks/ home nested=build/cocoon-@@DATE@@/
svn commit: rev 56301 - cocoon/trunk
Author: stefano Date: Mon Nov 1 15:59:24 2004 New Revision: 56301 Modified: cocoon/trunk/gump.xml Log: adding castor as a dependency for chaperon Modified: cocoon/trunk/gump.xml == --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Mon Nov 1 15:59:24 2004 @@ -199,6 +199,7 @@ depend project=cocoon inherit=all/ depend project=chaperon/ depend project=cocoon-block-xsp type=samples/ +depend project=castor/ work nested=build/cocoon-@@DATE@@/blocks/chaperon/dest/ work nested=build/cocoon-@@DATE@@/blocks/chaperon/test/
svn commit: rev 55999 - cocoon/trunk
Author: stefano Date: Fri Oct 29 15:02:20 2004 New Revision: 55999 Modified: cocoon/trunk/gump.xml Log: don't make the tests available Modified: cocoon/trunk/gump.xml == --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Fri Oct 29 15:02:20 2004 @@ -97,7 +97,6 @@ jar name=cocoon.jar/ jar name=cocoon-deprecated.jar/ -jar name=cocoon-tests.jar/ javadoc parent=build/cocoon-@@DATE@@/javadocs/
svn commit: rev 55880 - cocoon/trunk/tools/targets
Author: stefano
Date: Thu Oct 28 11:19:34 2004
New Revision: 55880
Modified:
cocoon/trunk/tools/targets/admin-build.xml
Log:
gump should not run the tests for the blocks since the blocks are not compiled
yet
Modified: cocoon/trunk/tools/targets/admin-build.xml
==
--- cocoon/trunk/tools/targets/admin-build.xml (original)
+++ cocoon/trunk/tools/targets/admin-build.xml Thu Oct 28 11:19:34 2004
@@ -47,7 +47,7 @@
!-- === Gump Targets ==
--
!-- compiles and packages the core classes and the deprecated classes --
- target name=gump-core depends=package-core, package-deprecated,
validate-jars, junit-tests/
+ target name=gump-core depends=package-core, package-deprecated,
validate-jars, core-junit-tests/
!-- compiles and packages a single block identified by ${block-name} --
target name=gump-block depends=compile-core, compile-deprecated,
prepare-blocks, compile-tests
svn commit: rev 55657 - cocoon/trunk
Author: stefano Date: Tue Oct 26 18:27:45 2004 New Revision: 55657 Modified: cocoon/trunk/gump.xml Log: adding jmock as an internal package and also adding it as a dependency Modified: cocoon/trunk/gump.xml == --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Tue Oct 26 18:27:45 2004 @@ -83,6 +83,7 @@ depend project=jing/ depend project=pizza/ depend project=junit/ +depend project=jmock/ depend project=eclipse id=jdtcore/ depend project=xmlunit/!-- used by the testcases -- @@ -1242,13 +1243,23 @@ /project project name=jing -packagecom/thaiopensource/package +packagecom.thaiopensource/package url href=http://www.thaiopensource.com/relaxng/jing.html/ description Jing performs XML Validation using RelaxNG schemas /description home nested=tools/lib/ jar name=jing-20030619.jar/ + /project + + project name=jmock +packageorg.jmock/package +url href=http://jmock.codehaus.org// +description + jMock is a library for testing Java code using mock objects +/description +home nested=tools/lib/ +jar name=jmock-1.0.1.jar/ /project project name=chaperon
svn commit: rev 55636 - cocoon/trunk/tools/targets
Author: stefano
Date: Tue Oct 26 14:15:46 2004
New Revision: 55636
Modified:
cocoon/trunk/tools/targets/admin-build.xml
Log:
we don't really need to have gump build the javadocs
Modified: cocoon/trunk/tools/targets/admin-build.xml
==
--- cocoon/trunk/tools/targets/admin-build.xml (original)
+++ cocoon/trunk/tools/targets/admin-build.xml Tue Oct 26 14:15:46 2004
@@ -47,7 +47,7 @@
!-- === Gump Targets ==
--
!-- compiles and packages the core classes and the deprecated classes --
- target name=gump-core depends=package-core, package-deprecated,
javadocs, validate-jars, junit-tests/
+ target name=gump-core depends=package-core, package-deprecated,
validate-jars, junit-tests/
!-- compiles and packages a single block identified by ${block-name} --
target name=gump-block depends=compile-core, compile-deprecated,
prepare-blocks, compile-tests
svn commit: rev 55442 - cocoon/trunk
Author: stefano Date: Sun Oct 24 09:17:13 2004 New Revision: 55442 Modified: cocoon/trunk/gump.xml Log: apparently, excalibur-instrument changed in an incompatible way from version 1.0 to the (unreleased) version 1.2 that is currently in the repository. Another good reason to start moving away from depending on code which stability we can't trust. Modified: cocoon/trunk/gump.xml == --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Sun Oct 24 09:17:13 2004 @@ -51,10 +51,10 @@ depend project=avalon-framework-api/ depend project=avalon-framework-legacy/ depend project=avalon-framework-impl/ + depend project=excalibur-legacy id=compatibility/ -depend project=excalibur-instrument-api/ -depend project=excalibur-instrument-mgr-api/ -depend project=excalibur-instrument-mgr-impl/ +depend project=excalibur-legacy id=i18n/ +depend project=excalibur-instrument-legacy/ depend project=excalibur-sourceresolve/ depend project=excalibur-xmlutil/ depend project=excalibur-store/ @@ -63,7 +63,6 @@ depend project=excalibur-logger/ depend project=excalibur-event-api/ depend project=excalibur-event-impl/ -depend project=excalibur-legacy id=i18n/ depend project=jakarta-regexp/ depend project=jakarta-servletapi-4/
svn commit: rev 54746 - cocoon/trunk
Author: stefano Date: Wed Oct 13 11:14:46 2004 New Revision: 54746 Modified: cocoon/trunk/gump.xml Log: fixing gump dependencies Modified: cocoon/trunk/gump.xml == --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Wed Oct 13 11:14:46 2004 @@ -52,7 +52,7 @@ depend project=avalon-framework-legacy/ depend project=avalon-framework-impl/ depend project=excalibur-legacy id=compatibility/ -depend project=excalibur-instrument/ +depend project=excalibur-instrument-api/ depend project=excalibur-instrument-manager/ depend project=excalibur-sourceresolve/ depend project=excalibur-xmlutil/ @@ -60,7 +60,7 @@ depend project=excalibur-pool/ depend project=excalibur-component/ depend project=excalibur-logger/ -depend project=excalibur-event inherit=runtime/ +depend project=excalibur-event-api/ depend project=excalibur-legacy id=i18n/ depend project=excalibur-testcase/
svn commit: rev 54696 - cocoon/trunk
Author: stefano Date: Tue Oct 12 14:10:25 2004 New Revision: 54696 Modified: cocoon/trunk/gump.xml Log: moving some of our project descriptors into gump Modified: cocoon/trunk/gump.xml == --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Tue Oct 12 14:10:25 2004 @@ -82,7 +82,7 @@ depend project=jing/ depend project=pizza/ depend project=junit/ -depend project=eclipse-jtd/ +depend project=eclipse id=jdtcore/ depend project=xmlunit/!-- used by the testcases -- depend project=qdox/ !-- used by ant tasks -- @@ -1278,15 +1278,6 @@ jar name=itext-xml-1.02.jar/ /project - project name=eclipse-jtd -url href=http://www.eclipse.org// -description - Java Development Tools from the Eclipse IDE Project -/description -home nested=lib/optional/ -jar name=jdtcore-3.0.1.jar/ - /project - project name=xreporter-expression url href=http://xreporter.cocoondev.org/ description @@ -1296,16 +1287,6 @@ jar name=xreporter-expression-20040701.jar/ /project - project name=qdox -url href=http://qdox.codehaus.org// -description - Small footprint parser for extracting class/interface/method - definitions from java source files. -/description -home nested=src/blocks/qdox/lib/ -jar name=qdox-1.5.jar/ - /project - project name=joost url href=http://joost.sourceforge.net/ description @@ -1325,12 +1306,4 @@ jar name=lib/core/javacImpl-0.9.jar id=impl/ /project - project name=ehcache -url href=http://ehcache.sourceforge.net/ -description - A simple, fast and thread safe cache for Java -/description -home nested=src/blocks/scratchpad/lib/ -jar name=ehcache-0.9.jar/ - /project /module
svn commit: rev 51838 - cocoon/trunk
Author: stefano Date: Sun Oct 3 10:14:11 2004 New Revision: 51838 Modified: cocoon/trunk/gump.xml Log: updated the gump descriptor: 1) changed cocoon-2.1 to cocoon for the module name 2) fixed the deli project Modified: cocoon/trunk/gump.xml == --- cocoon/trunk/gump.xml (original) +++ cocoon/trunk/gump.xml Sun Oct 3 10:14:11 2004 @@ -18,9 +18,9 @@ !--+ | Cocoon GUMP Descriptor | -| CVS $Id$ +| $Id$ +-- -module name=cocoon-2.1 +module name=cocoon url href=http://cocoon.apache.org// descriptionJava XML Framework/description @@ -1212,7 +1212,7 @@ Delivery context library /description home nested=src/blocks/deli/lib/ -jar name=deli-0.9.8.jar/ +jar name=deli-x020904.jar/ /project project name=jing
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/i18n BundleFactory.java XMLResourceBundleFactory.java
stefano 2004/07/14 23:05:40 Modified:src/java/org/apache/cocoon/i18n BundleFactory.java XMLResourceBundleFactory.java Log: import cleanup Revision ChangesPath 1.10 +1 -2 cocoon-2.1/src/java/org/apache/cocoon/i18n/BundleFactory.java Index: BundleFactory.java === RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/i18n/BundleFactory.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- BundleFactory.java13 Jul 2004 16:00:12 - 1.9 +++ BundleFactory.java15 Jul 2004 06:05:40 - 1.10 @@ -19,7 +19,6 @@ import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.component.ComponentException; -import org.apache.avalon.framework.component.ComponentSelector; /** * Bundle Factory implementations are responsible for loading and providing 1.16 +2 -5 cocoon-2.1/src/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java Index: XMLResourceBundleFactory.java === RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- XMLResourceBundleFactory.java 13 Jul 2004 16:00:12 - 1.15 +++ XMLResourceBundleFactory.java 15 Jul 2004 06:05:40 - 1.16 @@ -24,23 +24,20 @@ import org.apache.avalon.framework.CascadingRuntimeException; import org.apache.avalon.framework.activity.Disposable; -import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.component.ComponentException; -import org.apache.avalon.framework.component.DefaultComponentSelector; import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; -import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.avalon.framework.logger.LogEnabled; import org.apache.avalon.framework.logger.Logger; import org.apache.avalon.framework.service.ServiceException; import org.apache.avalon.framework.service.ServiceManager; import org.apache.avalon.framework.service.Serviceable; import org.apache.avalon.framework.thread.ThreadSafe; +import org.apache.cocoon.ResourceNotFoundException; import org.apache.excalibur.source.Source; import org.apache.excalibur.source.SourceNotFoundException; import org.apache.excalibur.source.SourceResolver; -import org.apache.cocoon.ResourceNotFoundException; import org.xml.sax.SAXParseException; /**
cvs commit: cocoon-2.1/src/blocks/swf/java/org/apache/cocoon/serialization SWFSerializer.java
stefano 2004/05/24 12:40:31 Modified:src/blocks/swf/java/org/apache/cocoon/serialization SWFSerializer.java Log: cleaned up unused import statements Revision ChangesPath 1.6 +1 -4 cocoon-2.1/src/blocks/swf/java/org/apache/cocoon/serialization/SWFSerializer.java Index: SWFSerializer.java === RCS file: /home/cvs/cocoon-2.1/src/blocks/swf/java/org/apache/cocoon/serialization/SWFSerializer.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- SWFSerializer.java24 May 2004 08:09:29 - 1.5 +++ SWFSerializer.java24 May 2004 19:40:31 - 1.6 @@ -18,9 +18,6 @@ import java.io.OutputStream; -import org.xml.sax.Attributes; -import org.xml.sax.SAXException; - import de.tivano.flash.swf.publisher.SWFWriter; /**
cvs commit: cocoon-2.1/src/blocks/linotype/samples/images/icons unblock.gif block.gif undo.gif redo.gif underline.gif
stefano 2004/04/05 04:43:34 Modified:src/blocks/linotype/samples/stylesheets news2html-content.xslt news2rss-2.0.xslt news2rss-0.91.xslt news2html-single.xslt news2edit.xslt request2news.xslt news2html-history.xslt news2html-homepage.xslt news2html-private.xslt src/blocks/linotype/samples/styles editor_page.css main.css editor.css src/blocks/linotype/samples/scripts editor.js src/blocks/linotype/samples flow.js sitemap.xmap index.xhtml src/blocks/linotype/samples/screens login.jx notfound.jx logout.jx Added: src/blocks/linotype/samples/stylesheets news2rss.xslt public-directory2cinclude.xslt private-directory2cinclude.xslt src/blocks/linotype/samples/scripts schema.js utils.js browser_dependent.js src/blocks/linotype/samples/images/icons unblock.gif block.gif undo.gif redo.gif underline.gif Log: committed linotype 1.2. Note: it's not working properly but I don't want to stop others from contributing. Revision ChangesPath 1.4 +0 -15 cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2html-content.xslt http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2html-content.xslt.diff?r1=1.3r2=1.4 1.6 +15 -41 cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2rss-2.0.xslt http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2rss-2.0.xslt.diff?r1=1.5r2=1.6 1.5 +12 -27 cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2rss-0.91.xslt http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2rss-0.91.xslt.diff?r1=1.4r2=1.5 1.4 +55 -30 cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2html-single.xslt http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2html-single.xslt.diff?r1=1.3r2=1.4 1.5 +32 -25 cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2edit.xslt http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2edit.xslt.diff?r1=1.4r2=1.5 1.5 +1 -15 cocoon-2.1/src/blocks/linotype/samples/stylesheets/request2news.xslt http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/linotype/samples/stylesheets/request2news.xslt.diff?r1=1.4r2=1.5 1.4 +13 -23 cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2html-history.xslt http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2html-history.xslt.diff?r1=1.3r2=1.4 1.4 +30 -41 cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2html-homepage.xslt http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2html-homepage.xslt.diff?r1=1.3r2=1.4 1.4 +16 -23 cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2html-private.xslt http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2html-private.xslt.diff?r1=1.3r2=1.4 1.1 cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2rss.xslt http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2rss.xslt?rev=1.1 1.1 cocoon-2.1/src/blocks/linotype/samples/stylesheets/public-directory2cinclude.xslt http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/linotype/samples/stylesheets/public-directory2cinclude.xslt?rev=1.1 1.1 cocoon-2.1/src/blocks/linotype/samples/stylesheets/private-directory2cinclude.xslt http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/linotype/samples/stylesheets/private-directory2cinclude.xslt?rev=1.1 1.3 +0 -15 cocoon-2.1/src/blocks/linotype/samples/styles/editor_page.css http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/linotype/samples/styles/editor_page.css.diff?r1=1.2r2=1.3 1.4 +67 -48cocoon-2.1/src/blocks/linotype/samples/styles/main.css http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/linotype/samples/styles/main.css.diff?r1=1.3r2=1.4 1.3 +23 -22cocoon-2.1/src/blocks/linotype/samples/styles/editor.css http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/linotype/samples/styles/editor.css.diff?r1=1.2r2=1.3 1.6 +171 -676 cocoon-2.1/src/blocks/linotype/samples/scripts/editor.js http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/linotype/samples/scripts/editor.js.diff?r1=1.5r2=1.6 1.1 cocoon-2.1/src/blocks/linotype/samples/scripts/schema.js http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/linotype/samples
cvs commit: cocoon-2.1/src/blocks/linotype/samples/repository/news/template document.xml
stefano 2004/04/05 15:28:17
Modified:src/blocks/linotype/samples sitemap.xmap index.xhtml
src/blocks/linotype/samples/scripts browser_dependent.js
schema.js editor.js utils.js
src/blocks/linotype/samples/styles editor.css
src/blocks/linotype/samples/stylesheets
news2html-single.xslt news2edit.xslt
src/blocks/linotype/samples/repository/news/1 document.xml
src/blocks/linotype TODO.txt
src/blocks/linotype/samples/repository/news/template
document.xml
Removed: src/blocks/linotype/samples sitemap.source.xmap
Log:
fixed a few things here and there so that now it works with samples, also
updated the todo list to reflect the new things
Revision ChangesPath
1.10 +6 -6 cocoon-2.1/src/blocks/linotype/samples/sitemap.xmap
Index: sitemap.xmap
===
RCS file: /home/cvs/cocoon-2.1/src/blocks/linotype/samples/sitemap.xmap,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sitemap.xmap 5 Apr 2004 11:43:34 - 1.9
+++ sitemap.xmap 5 Apr 2004 22:28:16 - 1.10
@@ -160,7 +160,7 @@
map:component-configurations
global-variables
- home/~stefano/linotype/home
+ home/samples/blocks/linotype/home
count3/count
/global-variables
/map:component-configurations
@@ -314,14 +314,14 @@
map:serialize/
/map:match
-map:match pattern=private/
+map:match pattern=backend/
map:redirect-to uri=news/
/map:match
-map:match pattern=private/edit/news/*/*
+map:match pattern=backend/edit/news/*/*
map:call function=main
map:parameter name=page value=edit/
-map:parameter name=root value={realpath:/}/
+map:parameter name=root value={realpath:/}{global:home}/
map:parameter name=base value={global:home}/
map:parameter name=id value={1}/
map:parameter name=type value=news/
@@ -329,10 +329,10 @@
/map:call
/map:match
-map:match pattern=private/**
+map:match pattern=backend/**
map:call function=main
map:parameter name=page value={1}/
-map:parameter name=root value={realpath:/}/
+map:parameter name=root value={realpath:/}{global:home}/
map:parameter name=base value={global:home}/
/map:call
/map:match
1.6 +2 -4 cocoon-2.1/src/blocks/linotype/samples/index.xhtml
Index: index.xhtml
===
RCS file: /home/cvs/cocoon-2.1/src/blocks/linotype/samples/index.xhtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- index.xhtml 5 Apr 2004 11:43:34 - 1.5
+++ index.xhtml 5 Apr 2004 22:28:16 - 1.6
@@ -4,8 +4,6 @@
head
titleStefano's Linotype/title
- meta http-equiv=Content-Type content=text/html; charset=utf-8/
-
meta name=DC.title content=Stefano's Linotype/
meta name=DC.author.personalName content=Stefano Mazzocchi/
meta name=description lang=en content=Stefano Mazzocchi's Weblog/
@@ -45,7 +43,7 @@
div id=page
h1Stefano's Linotype/h1
h2Typesetting some of Stefano Mazzocchi's random thoughts/h2
- include:include src=cocoon://news.html
xmlns:include=http://apache.org/cocoon/include/1.0/
+ include:include src=cocoon:/news.html
xmlns:include=http://apache.org/cocoon/include/1.0/
/div
div id=footer
@@ -53,7 +51,7 @@
/div
div id=sidebar
- a href=private/img alt=Linotype src=images/linotype.jpg
width=156px height=207px//abr/
+ a href=backend/img alt=Linotype src=images/linotype.jpg
width=156px height=207px//abr/
a href=historyHistory/abr/
a href=rss/2.0/index.rssimg alt=RSS Feed
src=images/rss.gif//abr/
/div
1.2 +19 -1
cocoon-2.1/src/blocks/linotype/samples/scripts/browser_dependent.js
Index: browser_dependent.js
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/linotype/samples/scripts/browser_dependent.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- browser_dependent.js 5 Apr 2004 11:43:33 - 1.1
+++ browser_dependent.js 5 Apr 2004 22:28:16 - 1.2
@@ -1,5 +1,23 @@
-// - Browser dependent functions
+/*
+ * Copyright 1999-2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE
cvs commit: cocoon-2.1/src/webapp/WEB-INF web.xml
stefano 2004/01/03 07:24:03 Modified:src/webapp/WEB-INF web.xml Log: Found a way to tell Jetty to modify the root path of the cookie so that I can mount my webapp in my web server (via ProxyPass) from another location than the one used by the application server (which is great since I can now use one single JVM now) Still not the perfect solution, but something that might be useful for others so I'm putting it here. Revision ChangesPath 1.10 +14 -0 cocoon-2.1/src/webapp/WEB-INF/web.xml Index: web.xml === RCS file: /home/cvs/cocoon-2.1/src/webapp/WEB-INF/web.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- web.xml 7 Nov 2003 10:09:06 - 1.9 +++ web.xml 3 Jan 2004 15:24:03 - 1.10 @@ -10,6 +10,20 @@ web-app + !-- Context Configuration == -- + + !--+ + | Set a context property useful to allow you to ProxyPass your + | web application mounted to a different URI without loosing the + | ability to do cookie-based sessions. + | WARNING: this is Jetty specific! + +-- + !--context-param +param-nameorg.mortbay.jetty.servlet.SessionPath/param-name +param-value/some/path/to/your/webapp/param-value +descriptionAn override of the session cookie path/description + /context-param-- + !-- Servlet Configuration == -- servlet
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
stefano 2004/01/01 14:43:29
Modified:tools/src blocks-build.xsl
Log:
- smaller notices in case blocks are exluded
- pretty printed WARNING in case of alpha blocks
- removed the alpha term that gave bad impression to people
- added unless.excluded... to block-***-prepare so that the block is not
prepared if exluded from the build (this speeds up the build rather
significantly when only a few blocks are selected... as I normally do ;-)
Revision ChangesPath
1.44 +8 -9 cocoon-2.1/tools/src/blocks-build.xsl
Index: blocks-build.xsl
===
RCS file: /home/cvs/cocoon-2.1/tools/src/blocks-build.xsl,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- blocks-build.xsl 20 Dec 2003 10:02:39 - 1.43
+++ blocks-build.xsl 1 Jan 2004 22:43:29 - 1.44
@@ -269,9 +269,7 @@
xsl:variable name=cocoon-block-dependencies
select=depend[starts-with(@project,'cocoon-block-')]/
target name=[EMAIL PROTECTED] if=exclude.block.{$block-name}
- echo message=---/
- echo message=ATTENTION: {$block-name} is excluded from the build./
- echo message=---/
+ echo message=NOTICE: Block '{$block-name}' is excluded from the
build./
/target
target name=[EMAIL PROTECTED]
unless=unless.exclude.block.{$block-name}/
@@ -294,11 +292,12 @@
available property={$block-name}.has.mocks type=dir
file={string('${blocks}')}/{$block-name}/mocks//
xsl:if test=@status='unstable'
-echo message=---/
-echo message=ATTENTION: {$block-name} is marked unstable./
-echo message=It should be considered alpha quality/
-echo message=which means that its API might change without
notice./
-echo message=---/
+echo message= WARNING
===/
+echo message= Block '{$block-name}' should be considered
unstable./
+echo
message=/
+echo message= This means that its API, schemas /
+echo message= and other contracts might change without notice./
+echo
message=/
/xsl:if
antcall target={$block-name}-compile/
@@ -342,7 +341,7 @@
antcall target={$block-name}-webinf/
/target
-target name={$block-name}-prepare
+target name={$block-name}-prepare
unless=unless.exclude.block.{$block-name}
xsl:if test=depend
xsl:attribute name=depends
xsl:value-of select=@name/
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom CompilingClassLoader.java FOM_JavaScriptInterpreter.java
stefano 2003/12/29 09:51:38 Modified:src/java/org/apache/cocoon/components/flow/javascript/fom CompilingClassLoader.java FOM_JavaScriptInterpreter.java Log: organizing imports Revision ChangesPath 1.4 +14 -16 cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/CompilingClassLoader.java Index: CompilingClassLoader.java === RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/CompilingClassLoader.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- CompilingClassLoader.java 28 Dec 2003 07:19:23 - 1.3 +++ CompilingClassLoader.java 29 Dec 2003 17:51:38 - 1.4 @@ -45,29 +45,27 @@ */ package org.apache.cocoon.components.flow.javascript.fom; -import java.net.MalformedURLException; -import java.util.Iterator; -import java.util.List; -import java.util.LinkedList; -import java.util.Map; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Set; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.ByteArrayOutputStream; -import java.io.ByteArrayInputStream; -import java.io.Reader; -import java.io.BufferedReader; import java.io.InputStreamReader; +import java.io.Reader; +import java.net.MalformedURLException; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; + import org.apache.excalibur.source.Source; import org.apache.excalibur.source.SourceResolver; -import org.tempuri.javac.JavaCompiler; -import org.tempuri.javac.JavaCompilerErrorHandler; -import org.tempuri.javac.JavaClassWriter; -import org.tempuri.javac.JavaClassWriterFactory; import org.tempuri.javac.JavaClassReader; import org.tempuri.javac.JavaClassReaderFactory; +import org.tempuri.javac.JavaClassWriter; +import org.tempuri.javac.JavaClassWriterFactory; +import org.tempuri.javac.JavaCompiler; +import org.tempuri.javac.JavaCompilerErrorHandler; import org.tempuri.javac.JavaSourceReader; import org.tempuri.javac.JavaSourceReaderFactory; import org.tempuri.javacImpl.eclipse.JavaCompilerImpl; 1.16 +17 -7 cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java Index: FOM_JavaScriptInterpreter.java === RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- FOM_JavaScriptInterpreter.java28 Dec 2003 07:19:23 - 1.15 +++ FOM_JavaScriptInterpreter.java29 Dec 2003 17:51:38 - 1.16 @@ -56,12 +56,12 @@ import java.io.OutputStream; import java.io.Reader; import java.util.ArrayList; -import java.util.LinkedList; -import java.util.Iterator; -import java.util.StringTokenizer; import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.StringTokenizer; import org.apache.avalon.framework.CascadingRuntimeException; import org.apache.avalon.framework.activity.Initializable; @@ -86,12 +86,22 @@ import org.apache.excalibur.source.Source; import org.apache.excalibur.source.SourceResolver; import org.apache.excalibur.source.SourceValidity; -import org.mozilla.javascript.*; -import org.mozilla.javascript.continuations.Continuation; +import org.mozilla.javascript.Context; +import org.mozilla.javascript.EcmaError; +import org.mozilla.javascript.EvaluatorException; +import org.mozilla.javascript.Function; +import org.mozilla.javascript.JavaScriptException; +import org.mozilla.javascript.NativeJavaClass; import org.mozilla.javascript.NativeJavaPackage; +import org.mozilla.javascript.PropertyException; +import org.mozilla.javascript.Script; +import org.mozilla.javascript.ScriptRuntime; +import org.mozilla.javascript.Scriptable; +import org.mozilla.javascript.ScriptableObject; +import org.mozilla.javascript.Wrapper; +import org.mozilla.javascript.continuations.Continuation; import org.mozilla.javascript.tools.ToolErrorReporter; import org.mozilla.javascript.tools.shell.Global; -import org.apache.excalibur.source.SourceResolver; /** * Interface with the JavaScript interpreter.
cvs commit: cocoon-2.1 blocks.properties
stefano 2003/10/30 03:57:07 Modified:.blocks.properties Log: added missing dependencies of the repository block, excluded xmlform by default from the build (since deprecated) and moved things around so that dependent blocks are closer together (also added a little bit of syntax so that people don't miss the dependencies Revision ChangesPath 1.40 +18 -20cocoon-2.1/blocks.properties Index: blocks.properties === RCS file: /home/cvs/cocoon-2.1/blocks.properties,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- blocks.properties 22 Oct 2003 21:11:19 - 1.39 +++ blocks.properties 30 Oct 2003 11:57:07 - 1.40 @@ -20,15 +20,14 @@ # developers are committed to back compatibility. In short, stuff that you # can depend on. -#exclude.block.authentication-fw=true - -#dependency: fop needs batik +#exclude.block.fop=true +#-[dependency]: batik needed by fop #exclude.block.batik=true -#exclude.block.bsf=true -#exclude.block.chaperon=true +#-[dependency]: databases needed by repository #exclude.block.databases=true -#exclude.block.fop=true #exclude.block.hsqldb=true +#exclude.block.bsf=true +#exclude.block.chaperon=true #exclude.block.html=true #exclude.block.itext=true #exclude.block.jfor=true @@ -42,8 +41,8 @@ #exclude.block.portal-fw=true #exclude.block.profiler=true #exclude.block.python=true - -#dependency: authentication-fw needs session-fw +#exclude.block.authentication-fw=true +#-[dependency]: session-fw needed by authentication-fw #exclude.block.session-fw=true #exclude.block.swf=true #exclude.block.velocity=true @@ -64,37 +63,36 @@ #exclude.block.apples=true #exclude.block.asciiart=true #exclude.block.axis=true - -#dependency: scratchpad needs cron +#exclude.block.scratchpad=true +#-[dependency]: cron needed by scratchpad #exclude.block.cron=true #exclude.block.deli=true +#-[dependency]: eventcache needed by repository #exclude.block.eventcache=true exclude.block.jms=true +#-[dependency]: slide and webdav need repository +#exclude.block.repository=true +#exclude.block.slide=true +#exclude.block.webdav=true #exclude.block.linotype=true #exclude.block.mail=true #exclude.block.midi=true -# Before including this block, see: http://wiki.cocoondev.org/Wiki.jsp?page=OJBBlock -exclude.block.ojb=true #exclude.block.petstore=true #exclude.block.portal=true #exclude.block.precept=true #exclude.block.proxy=true #exclude.block.qdox=true - -#dependency: slide, webdav needs repository -#exclude.block.repository=true -#exclude.block.scratchpad=true -#exclude.block.slide=true #exclude.block.slop=true #exclude.block.stx=true #exclude.block.taglib=true -#exclude.block.webdav=true #exclude.block.woody=true +# Before including the ojb block, see: http://wiki.cocoondev.org/Wiki.jsp?page=OJBBlock +exclude.block.ojb=true # Deprecated blocks # Although some of these blocks may have been stable, they are now deprecated -# in favour of other blocks. +# in favour of other blocks and therefore are excluded by default from the build -#exclude.block.xmlform=true +exclude.block.xmlform=true
cvs commit: cocoon-2.1/src/blocks/petstore/java .cvsignore
stefano 2003/10/28 16:46:15 Removed: src/blocks/petstore/java .cvsignore Log: removing unnecessary .cvsignore file
cvs commit: cocoon-2.1/src/webapp/WEB-INF cocoon.xconf
stefano 2003/10/06 08:43:22 Modified:src/webapp/WEB-INF cocoon.xconf Log: fixing bug 22795 and removing configurations that might be misleading since reuse-parser seems to indicate reuse of the pooled parser but it's only used when the parser should be reused when exits from an error. Since I don't think anybody would want to change this, I'm removing the configurations entirely. Revision ChangesPath 1.29 +0 -3 cocoon-2.1/src/webapp/WEB-INF/cocoon.xconf Index: cocoon.xconf === RCS file: /home/cvs/cocoon-2.1/src/webapp/WEB-INF/cocoon.xconf,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- cocoon.xconf 3 Sep 2003 09:45:50 - 1.28 +++ cocoon.xconf 6 Oct 2003 15:43:22 - 1.29 @@ -326,9 +326,6 @@ parameter name=namespace-prefixes value=false/ parameter name=stop-on-warning value=true/ parameter name=stop-on-recoverable-error value=true/ -parameter name=reuse-parsers value=false/ -!--parameter name=sax-parser-factory value=???/-- -!--parameter name=document-builder-factory value=???/-- !-- drop-dtd-comments: causes all comment events originating from DTD comments to be dropped right after parsing -- parameter name=drop-dtd-comments value=true/
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/serialization LinkSerializer.java
stefano 2003/10/06 09:36:15
Modified:src/java/org/apache/cocoon/serialization LinkSerializer.java
Log:
applying patch 20298
CVS: --
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision ChangesPath
1.2 +3 -1
cocoon-2.1/src/java/org/apache/cocoon/serialization/LinkSerializer.java
Index: LinkSerializer.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/serialization/LinkSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LinkSerializer.java 9 Mar 2003 00:09:36 - 1.1
+++ LinkSerializer.java 6 Oct 2003 16:36:15 - 1.2
@@ -88,11 +88,13 @@
public void simpleLink(String href, String role, String arcrole, String
title, String show, String actuate, String uri, String name, String raw,
Attributes attr)
throws SAXException {
if (traversable(href)) this.print(href);
+super.simpleLink(href, role, arcrole, title, show, actuate, uri,
name, raw, attr);
}
public void startLocator(String href, String role, String title, String
label, String uri, String name, String raw, Attributes attr)
throws SAXException {
if (traversable(href)) this.print(href);
+super.startLocator(href, role, title, label, uri, name, raw, attr);
}
private boolean traversable(String href) {
cvs commit: cocoon-2.1 WARNING.txt
stefano 2003/10/04 17:04:30 Removed: .WARNING.txt Log: I think we can remove this now
cvs commit: cocoon-2.1/src/blocks/linotype/samples/stylesheets news2rss-2.0.xslt
stefano 2003/08/24 10:52:03 Modified:src/blocks/linotype/samples/stylesheets news2rss-2.0.xslt Log: fixed validation problems with RSS2 and allowed escaped markup in description which is rendered correctly by news aggregators such as NetNewsWire. The images link are still broken though, will fix this when it bugs me enough. Revision ChangesPath 1.3 +18 -6 cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2rss-2.0.xslt Index: news2rss-2.0.xslt === RCS file: /home/cvs/cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2rss-2.0.xslt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- news2rss-2.0.xslt 26 Jun 2003 03:09:49 - 1.2 +++ news2rss-2.0.xslt 24 Aug 2003 17:52:03 - 1.3 @@ -4,6 +4,7 @@ xmlns:xsl=http://www.w3.org/1999/XSL/Transform; xmlns:n=http://www.betaversion.org/linotype/news/1.0; xmlns:h=http://www.w3.org/1999/xhtml; + xmlns:dc=http://purl.org/dc/elements/1.1/; xsl:param name=home/ @@ -11,12 +12,12 @@ xsl:template match=/ rss version=2.0 - channel +channel titleStefano's Linotype/title linkhttp://www.betaversion.org/~stefano/linotype//link descriptionStefano Mazzocchi's weblog/description - languageen/language - copyrightCopyright 2003 Stefano Mazzocchi. Some rights reserved./copyright + dc:creatorStefano Mazzocchi/dc:creator + dc:rightsCopyright 2003 Stefano Mazzocchi. Some rights reserved./dc:rights lastBuildDatexsl:value-of select=(//n:[EMAIL PROTECTED] = 'on'])[1]/@creation-fulldate//lastBuildDate generatorLinotype 1.1/generator xsl:apply-templates select=(//n:[EMAIL PROTECTED] = 'on'])[position() lt; number($count)]/ @@ -27,11 +28,22 @@ xsl:template match=n:news item titlexsl:value-of select=n:title//title - linkxsl:value-of select=$home//xsl:value-of select=../@id///link - descriptionxsl:apply-templates select=h:body//description -pubDatexsl:value-of select=@creation-fulldate//pubDate +linkxsl:value-of select=$home//xsl:value-of select=../@id///link +descriptionxsl:apply-templates select=h:body/node() mode=encode//description +xsl:apply-templates select=h:body/ +dc:datexsl:value-of select=@creation-fulldate//dc:date /item /xsl:template + + xsl:template match=* mode=encode +xsl:textlt;/xsl:textxsl:value-of select=name()/xsl:apply-templates select=@* mode=encode/xsl:textgt;/xsl:text +xsl:apply-templates select=node() mode=encode/ +xsl:textlt;//xsl:textxsl:value-of select=name()/xsl:textgt;/xsl:text + /xsl:template + +xsl:template match=@* mode=encodexsl:text /xsl:textxsl:value-of select=name()/xsl:text=/xsl:textxsl:value-of select=./xsl:text/xsl:text/xsl:template + + xsl:template match=text() mode=encodexsl:value-of select=.//xsl:template xsl:template match=node()|@* xsl:copy
