cvs commit: cocoon-2.1/tools/src blocks-build.xsl
sylvain 2004/06/07 01:55:25
Modified:.status.xml
tools/targets compile-build.xml
tools/src blocks-build.xsl
Log:
New build.archive-sources build property to include java source files in
jar archives.
Revision ChangesPath
1.354 +6 -1 cocoon-2.1/status.xml
Index: status.xml
===
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- status.xml7 Jun 2004 08:18:16 - 1.353
+++ status.xml7 Jun 2004 08:55:25 - 1.354
@@ -205,6 +205,11 @@
changes
release version=@version@ date=@date@
+ action dev=SW type=update
+ A new build property, build.archive-sources, allows to include java
source files
+ in jar archives. Useful when using a non-released version to know what
sources
+ are used.
+ /action
action dev=CZ type=fix fixes-bug=28686
Correct redirect handling for internal redirects.
/action
1.12 +33 -0 cocoon-2.1/tools/targets/compile-build.xml
Index: compile-build.xml
===
RCS file: /home/cvs/cocoon-2.1/tools/targets/compile-build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- compile-build.xml 24 May 2004 11:42:16 - 1.11
+++ compile-build.xml 7 Jun 2004 08:55:25 - 1.12
@@ -123,6 +123,17 @@
exclude name=**/Manifest.mf/
/fileset
/jar
+!-- optionally add source files to the core jar --
+if
+ istrue value=${build.archive-sources}/
+ then
+jar jarfile=${build}/${name}.jar update=yes
+ fileset dir=${java}
+include name=**/*.java/
+ /fileset
+/jar
+ /then
+/if
/target
!-- package deprecated code --
@@ -131,6 +142,17 @@
jar jarfile=${build}/${name}-deprecated.jar index=true
fileset dir=${build.deprecated}/
/jar
+!-- optionally add source files to the jar --
+if
+ istrue value=${build.archive-sources}/
+ then
+jar jarfile=${build}/${name}-deprecated.jar update=yes
+ fileset dir=${deprecated.src}
+include name=**/*.java/
+ /fileset
+/jar
+ /then
+/if
/target
!-- package testcase code --
@@ -143,6 +165,17 @@
include name=org/apache/cocoon/xml/WhitespaceFilter*/
/fileset
/jar
+!-- optionally add source files to the jar --
+if
+ istrue value=${build.archive-sources}/
+ then
+jar jarfile=${build}/${name}-testcase.jar update=yes
+ fileset dir=${test}
+include name=**/*.java/
+ /fileset
+/jar
+ /then
+/if
/target
!-- === Block Targets ===
--
1.71 +11 -0 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.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- blocks-build.xsl 25 May 2004 12:53:43 - 1.70
+++ blocks-build.xsl 7 Jun 2004 08:55:25 - 1.71
@@ -438,6 +438,17 @@
/fileset
/jar
+ if
+istrue value=${{build.archive-sources}}/
+then
+ jar jarfile=${{build.blocks}}/{$block-name}-block.jar
update=true
+fileset dir=${{blocks}}/{$block-name}/java
+ include name=**/*.java/
+/fileset
+ /jar
+/then
+ /if
+
!-- exclude sample classes from the block package --
mkdir dir=${{build.blocks}}/{$block-name}/samples/
javac destdir=${{build.blocks}}/{$block-name}/samples
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
joerg 2004/05/07 10:26:33
Modified:tools/src blocks-build.xsl
Log:
ignore new cocoon documentation tags in javadocs (thanks to Jorg Heymans)
Revision ChangesPath
1.68 +12 -1 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.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- blocks-build.xsl 4 May 2004 07:14:08 - 1.67
+++ blocks-build.xsl 7 May 2004 17:26:33 - 1.68
@@ -229,7 +229,18 @@
--
tag name=avalon.context scope=methods description=Requires
entry: /
tag name=avalon.dependency scope=methods description=Requires
component: /
-
+tag name=cocoon.sitemap.component.configuration enabled=false/
+tag name=cocoon.sitemap.component.documentation enabled=false/
+tag name=cocoon.sitemap.component.documentation.caching
enabled=false/
+tag name=cocoon.sitemap.component.label enabled=false/
+tag name=cocoon.sitemap.component.logger enabled=false/
+tag name=cocoon.sitemap.component.mimetype enabled=false/
+tag name=cocoon.sitemap.component.name enabled=false/
+tag name=cocoon.sitemap.component.parameter enabled=false/
+tag name=cocoon.sitemap.component.pooling.grow enabled=false/
+tag name=cocoon.sitemap.component.pooling.max enabled=false/
+tag name=cocoon.sitemap.component.pooling.min enabled=false/
+
packageset dir=${{java}}
include name=**/
/packageset
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
cziegeler2004/05/04 00:14:09
Modified:tools/src/anttasks SitemapTask.java
tools/src blocks-build.xsl
Log:
Disabling doc generation for blocks
Revision ChangesPath
1.13 +2 -2 cocoon-2.1/tools/src/anttasks/SitemapTask.java
Index: SitemapTask.java
===
RCS file: /home/cvs/cocoon-2.1/tools/src/anttasks/SitemapTask.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SitemapTask.java 3 May 2004 14:23:56 - 1.12
+++ SitemapTask.java 4 May 2004 07:14:08 - 1.13
@@ -634,7 +634,7 @@
} else if ( clazz.isA(PIPELINE) ) {
return pipe;
} else {
-throw new BuildException(Sitemap component +
clazz.getName() + does not implement a sitemap component interface.);
+throw new BuildException(Sitemap component +
clazz.getFullyQualifiedName() + does not implement a sitemap component
interface.);
}
}
1.67 +7 -6 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.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- blocks-build.xsl 3 May 2004 14:07:12 - 1.66
+++ blocks-build.xsl 4 May 2004 07:14:08 - 1.67
@@ -413,7 +413,7 @@
xpatch file=${{build.webapp}}/WEB-INF/web.xml srcdir=${{blocks}}
include name={$block-name}/conf/*.xweb/
/xpatch
- !-- generate sitemap entries --
+ !-- generate sitemap entries
sitemap-components sitemap=${{build.webapp}}/sitemap.xmap
source=${{blocks}}/{$block-name}/java
block={$block-name}
@@ -424,11 +424,12 @@
xsl:attribute name=deprecatedtrue/xsl:attribute
/xsl:if
/sitemap-components
-
- !-- TODO - this is the wrong place for documentation, but currently
blocks
- don't have own docs! --
- mkdir dir=${{build.context}}/xdocs/userdocs/
+ --
+
!-- generate sitemap components docs --
+ !-- TODO - this is the wrong place for documentation, but currently
blocks
+ don't have own docs!
+mkdir dir=${{build.context}}/xdocs/userdocs/
sitemap-components docDir=${{build.context}}/xdocs/userdocs
source=${{blocks}}/{$block-name}/java
block={$block-name}
@@ -439,7 +440,7 @@
xsl:attribute name=deprecatedtrue/xsl:attribute
/xsl:if
/sitemap-components
-
+ --
/target
target name=[EMAIL PROTECTED]
unless=internal.exclude.block.{$block-name}
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
cziegeler2004/05/03 06:07:26
Modified:tools/src/anttasks SitemapTask.java
src/blocks/html/java/org/apache/cocoon/generation
HTMLGenerator.java
tools/src blocks-build.xsl
Log:
Add doc generation to blocks generation; unfortunately blocks don't have
docs...
Revision ChangesPath
1.11 +1 -2 cocoon-2.1/tools/src/anttasks/SitemapTask.java
Index: SitemapTask.java
===
RCS file: /home/cvs/cocoon-2.1/tools/src/anttasks/SitemapTask.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SitemapTask.java 3 May 2004 11:57:10 - 1.10
+++ SitemapTask.java 3 May 2004 13:07:26 - 1.11
@@ -158,7 +158,6 @@
*/
public void execute()
throws BuildException {
-
validate();
List components = (List)cache.get(this.directory);
1.12 +15 -1
cocoon-2.1/src/blocks/html/java/org/apache/cocoon/generation/HTMLGenerator.java
Index: HTMLGenerator.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/html/java/org/apache/cocoon/generation/HTMLGenerator.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- HTMLGenerator.java5 Mar 2004 13:01:56 - 1.11
+++ HTMLGenerator.java3 May 2004 13:07:26 - 1.12
@@ -53,6 +53,20 @@
import org.xml.sax.SAXException;
/**
+ * @cocoon.sitemap.component.documentation
+ * The html generator reads HTML from a source, converts it to XHTML
+ * and generates SAX Events.
+ *
+ * @cocoon.sitemap.component.name html
+ * @cocoon.sitemap.component.label content
+ * @cocoon.sitemap.component.logger sitemap.generator.html
+ * @cocoon.sitemap.component.documentation.caching
+ * Uses the last modification date of the xml document for
validation
+ *
+ * @cocoon.sitemap.component.pooling.min 4
+ * @cocoon.sitemap.component.pooling.max 32
+ * @cocoon.sitemap.component.pooling.grow 4
+ *
* @author a href=mailto:[EMAIL PROTECTED]Davanum Srinivas/a
* @author a href=mailto:[EMAIL PROTECTED]Carsten Ziegeler/a
* @author a href=mailto:[EMAIL PROTECTED]Nicola Ken Barozzi/a
1.65 +25 -0 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.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- blocks-build.xsl 8 Apr 2004 09:31:57 - 1.64
+++ blocks-build.xsl 3 May 2004 13:07:26 - 1.65
@@ -413,6 +413,31 @@
xpatch file=${{build.webapp}}/WEB-INF/web.xml srcdir=${{blocks}}
include name={$block-name}/conf/*.xweb/
/xpatch
+ !-- generate sitemap entries --
+ sitemap-components sitemap=${{build.webapp}}/sitemap.xmap
+ source=${{blocks}}/{$block-name}/java
+ block={$block-name}
+xsl:if test=@status='unstable'
+ xsl:attribute name=stablefalse/xsl:attribute
+/xsl:if
+xsl:if test=@status='deprecated'
+ xsl:attribute name=deprecatedtrue/xsl:attribute
+/xsl:if
+ /sitemap-components
+
+ !-- TODO - this is the wrong place for documentation, but currently
blocks
+ don't have own docs! --
+ !-- generate sitemap components docs --
+ sitemap-components docDir=${{build.context}}/xdocs/userdocs
+ source=${{blocks}}/{$block-name}/java
+ block={$block-name}
+xsl:if test=@status='unstable'
+ xsl:attribute name=stablefalse/xsl:attribute
+/xsl:if
+xsl:if test=@status='deprecated'
+ xsl:attribute name=deprecatedtrue/xsl:attribute
+/xsl:if
+ /sitemap-components
/target
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
cziegeler2004/05/03 07:07:12
Modified:tools/src blocks-build.xsl
Log:
Fix problem with dir
Revision ChangesPath
1.66 +1 -0 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.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- blocks-build.xsl 3 May 2004 13:07:26 - 1.65
+++ blocks-build.xsl 3 May 2004 14:07:12 - 1.66
@@ -427,6 +427,7 @@
!-- TODO - this is the wrong place for documentation, but currently
blocks
don't have own docs! --
+ mkdir dir=${{build.context}}/xdocs/userdocs/
!-- generate sitemap components docs --
sitemap-components docDir=${{build.context}}/xdocs/userdocs
source=${{blocks}}/{$block-name}/java
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
stephan 2004/03/23 11:23:07
Modified:tools/src blocks-build.xsl
Log:
Allow to share codebase to other blocks.
Revision ChangesPath
1.59 +2 -0 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.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- blocks-build.xsl 20 Mar 2004 17:29:49 - 1.58
+++ blocks-build.xsl 23 Mar 2004 19:23:06 - 1.59
@@ -527,6 +527,8 @@
include name=lib/*.jar/
/fileset
pathelement location=${{build.blocks}}/{$block-name}/mocks/
+pathelement location=${{build.blocks}}/{$block-name}/dest/
+pathelement location=${{build.blocks}}/{$block-name}/samples/
xsl:for-each select=$cocoon-block-dependencies
path
refid={substring-after(@project,'cocoon-block-')}.classpath/
/xsl:for-each
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
joerg 2004/03/20 09:29:49
Modified:tools/src blocks-build.xsl
Log:
reverted one classpath for all as this can break blocks esp. with mocks,
see http://marc.theaimsgroup.com/?t=10796044081r=1w=4 for more info
Revision ChangesPath
1.58 +21 -7 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.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- blocks-build.xsl 18 Mar 2004 11:54:13 - 1.57
+++ blocks-build.xsl 20 Mar 2004 17:29:49 - 1.58
@@ -43,7 +43,7 @@
path location=${{build.mocks}}/
path location=${{build.dest}}/
pathelement path=${{build.webapp.webinf}}/classes//
-
+!--
xsl:for-each select=module/project[starts-with(@name,
'cocoon-block-')]
xsl:variable name=block-name
select=substring-after(@name,'cocoon-block-')/
fileset dir=${{blocks}}/{$block-name}
@@ -52,7 +52,7 @@
pathelement location=${{build.blocks}}/{$block-name}/dest/
pathelement location=${{build.blocks}}/{$block-name}/samples/
pathelement location=${{build.blocks}}/{$block-name}/mocks/
-/xsl:for-each
+/xsl:for-each--
/path
path id=test.classpath
@@ -251,6 +251,9 @@
include name=*.jar/
/fileset
path refid=classpath /
+ xsl:for-each select=$cocoon-blocks
+path
refid={substring-after(@name,'cocoon-block-')}.classpath/
+ /xsl:for-each
/classpath
/javadoc
/target
@@ -315,7 +318,7 @@
target=${{target.vm}}
nowarn=${{compiler.nowarn}}
compiler=${{compiler}}
-classpath refid=classpath/
+classpath refid={$block-name}.classpath/
/javac
/then
/if
@@ -348,7 +351,7 @@
!-- Currently, we have no JVM dependent sources
src path=${{blocks}}/{$block-name}/java${{dependend.vm}}/
--
-classpath refid=classpath/
+classpath refid={$block-name}.classpath/
exclude name=**/samples/**/*.java/
/javac
@@ -385,7 +388,7 @@
!-- Currently, we have no JVM dependent sources
src path=${{blocks}}/{$block-name}/java${{dependend.vm}}/
--
-classpath refid=classpath/
+classpath refid={$block-name}.classpath/
include name=**/samples/**/*.java/
/javac
/target
@@ -517,6 +520,17 @@
/xsl:if
mkdir dir=${{build.blocks}}/{$block-name}/dest/
+
+ path id={$block-name}.classpath
+path refid=classpath/
+fileset dir=${{blocks}}/{$block-name}
+ include name=lib/*.jar/
+/fileset
+pathelement location=${{build.blocks}}/{$block-name}/mocks/
+xsl:for-each select=$cocoon-block-dependencies
+ path
refid={substring-after(@project,'cocoon-block-')}.classpath/
+/xsl:for-each
+ /path
/target
target name=[EMAIL PROTECTED]
unless=unless.exclude.block.{$block-name}
@@ -551,7 +565,7 @@
compiler=${{compiler}}
src path=${{blocks}}/{$block-name}/test/
classpath
- path refid=classpath/
+ path refid={$block-name}.classpath/
path refid=test.classpath/
pathelement location=${{build.test}}/
/classpath
@@ -560,7 +574,7 @@
junit printsummary=yes haltonfailure=yes fork=yes
jvmarg value=-Djava.endorsed.dirs=lib/endorsed/
classpath
- path refid=classpath/
+ path refid={$block-name}.classpath/
path refid=test.classpath/
pathelement location=${{build.test}}/
pathelement location=${{build.blocks}}/{$block-name}/test/
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
joerg 2004/03/18 03:54:13
Modified:tools/src blocks-build.xsl
Log:
allow arbitrary packages in gump.xml, use case: users might use Cocoon build
system for their blocks, http://marc.theaimsgroup.com/?t=10795344963r=1w=4
Revision ChangesPath
1.57 +1 -1 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.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- blocks-build.xsl 17 Mar 2004 19:51:14 - 1.56
+++ blocks-build.xsl 18 Mar 2004 11:54:13 - 1.57
@@ -367,7 +367,7 @@
jar jarfile=${{build.blocks}}/{$block-name}-block.jar index=true
fileset dir=${{build.blocks}}/{$block-name}/dest
- include name=org/**/
+ include name={translate(package/text(), '.', '/')}/**/
include name=META-INF/**/
/fileset
/jar
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
cziegeler2004/03/17 10:48:49
Modified:tools/src blocks-build.xsl
Log:
Changing the order decreases the build time on my system by 30%!
Revision ChangesPath
1.53 +13 -13cocoon-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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- blocks-build.xsl 16 Mar 2004 14:27:35 - 1.52
+++ blocks-build.xsl 17 Mar 2004 18:48:49 - 1.53
@@ -382,19 +382,6 @@
target name={$block-name}-compile
depends={$block-name}-build,{$block-name}-prepare,{$block-name}-mocks
- copy filtering=on todir=${{build.blocks}}/{$block-name}/dest
-fileset dir=${{blocks}}/{$block-name}/java
- patternset refid=unprocessed.sources/
-/fileset
- /copy
-
- copy filtering=off todir=${{build.blocks}}/{$block-name}/dest
-fileset dir=${{blocks}}/{$block-name}/java
- include name=**/Manifest.mf/
- include name=META-INF/**/
-/fileset
- /copy
-
!-- This is a little bit tricky:
As the javac task checks, if a src directory is available and
stops if its not available, we use the following property
@@ -426,6 +413,19 @@
classpath refid=classpath/
exclude name=**/samples/**/*.java/
/javac
+
+ copy filtering=on todir=${{build.blocks}}/{$block-name}/dest
+fileset dir=${{blocks}}/{$block-name}/java
+ patternset refid=unprocessed.sources/
+/fileset
+ /copy
+
+ copy filtering=off todir=${{build.blocks}}/{$block-name}/dest
+fileset dir=${{blocks}}/{$block-name}/java
+ include name=**/Manifest.mf/
+ include name=META-INF/**/
+/fileset
+ /copy
jar jarfile=${{build.blocks}}/{$block-name}-block.jar index=true
fileset dir=${{build.blocks}}/{$block-name}/dest
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
cziegeler2004/03/17 11:30:29
Modified:tools/src blocks-build.xsl
Log:
Build time from 6:45 to 2:50 - and hopefully everything is still working...
Revision ChangesPath
1.55 +26 -36cocoon-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.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- blocks-build.xsl 17 Mar 2004 19:15:08 - 1.54
+++ blocks-build.xsl 17 Mar 2004 19:30:29 - 1.55
@@ -298,11 +298,21 @@
/target
target name=[EMAIL PROTECTED]
unless=unless.exclude.block.{$block-name}
- xsl:if test=depend
-xsl:attribute name=dependsxsl:value-of
select=@name/xsl:for-each
select=depend[contains(@project,'cocoon-block-')]xsl:text,/xsl:textxsl:value-of
select=@project/-patch/xsl:for-each/xsl:attribute
- /xsl:if
+ xsl:attribute name=dependsxsl:value-of
select=$block-name/-preparexsl:if test=depend,xsl:value-of
select=@name/xsl:for-each
select=depend[contains(@project,'cocoon-block-')]xsl:text,/xsl:textxsl:value-of
select=@project/-patch/xsl:for-each/xsl:if/xsl:attribute
- antcall target={$block-name}-patches/
+ xpatch file=${{build.webapp}}/sitemap.xmap srcdir=${{blocks}}
+include name={$block-name}/conf/*.xmap/
+ /xpatch
+ xpatch file=${{build.webapp}}/WEB-INF/cocoon.xconf
srcdir=${{blocks}} addcomments=true
+include name={$block-name}/conf/*.xconf/
+ /xpatch
+ xpatch file=${{build.webapp}}/WEB-INF/logkit.xconf
srcdir=${{blocks}}
+include name={$block-name}/conf/*.xlog/
+ /xpatch
+ xpatch file=${{build.webapp}}/WEB-INF/web.xml srcdir=${{blocks}}
+include name={$block-name}/conf/*.xweb/
+ /xpatch
+
/target
target name=[EMAIL PROTECTED]
unless=unless.exclude.block.{$block-name}
@@ -310,7 +320,9 @@
xsl:attribute name=dependsxsl:value-of
select=@name/xsl:for-each
select=depend[contains(@project,'cocoon-block-')]xsl:text,/xsl:textxsl:value-of
select=@project/-roles/xsl:for-each/xsl:attribute
/xsl:if
- antcall target={$block-name}-roles/
+ xpatch file=${{build.dest}}/org/apache/cocoon/cocoon.roles
srcdir=${{blocks}}
+include name={$block-name}/conf/*.xroles/
+ /xpatch
/target
target name=[EMAIL PROTECTED]
unless=unless.exclude.block.{$block-name}
@@ -502,27 +514,6 @@
/javac
/target
-target name={$block-name}-roles
unless=unless.exclude.block.{$block-name}
- xpatch file=${{build.dest}}/org/apache/cocoon/cocoon.roles
srcdir=${{blocks}}
-include name={$block-name}/conf/*.xroles/
- /xpatch
-/target
-
-target name={$block-name}-patches depends={$block-name}-prepare
unless=unless.exclude.block.{$block-name}
- xpatch file=${{build.webapp}}/sitemap.xmap srcdir=${{blocks}}
-include name={$block-name}/conf/*.xmap/
- /xpatch
- xpatch file=${{build.webapp}}/WEB-INF/cocoon.xconf
srcdir=${{blocks}} addcomments=true
-include name={$block-name}/conf/*.xconf/
- /xpatch
- xpatch file=${{build.webapp}}/WEB-INF/logkit.xconf
srcdir=${{blocks}}
-include name={$block-name}/conf/*.xlog/
- /xpatch
- xpatch file=${{build.webapp}}/WEB-INF/web.xml srcdir=${{blocks}}
-include name={$block-name}/conf/*.xweb/
- /xpatch
-/target
-
target name=[EMAIL PROTECTED]
unless=unless.exclude.block.{$block-name}
xsl:if test=depend
xsl:attribute name=depends
@@ -585,16 +576,15 @@
target name=[EMAIL PROTECTED]
unless=unless.exclude.block.{$block-name}
!-- Test if this block has Anteater tests --
- available property={$block-name}.has.anteater-tests
file=${{blocks}}/{$block-name}/test/anteater/
-
- antcall target={$block-name}-prepare-anteater-tests/
-/target
-
-target name={$block-name}-prepare-anteater-tests
if={$block-name}.has.anteater-tests
- copy todir=${{build.test}}/anteater
-fileset
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
cziegeler2004/03/17 11:51:14
Modified:tools/src blocks-build.xsl
Log:
Removed all antcalls - very fast build now (at least compared to the old
system)
Now, let the flame war begin (if something is not working)
Revision ChangesPath
1.56 +164 -158 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.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- blocks-build.xsl 17 Mar 2004 19:30:29 - 1.55
+++ blocks-build.xsl 17 Mar 2004 19:51:14 - 1.56
@@ -269,21 +269,16 @@
target name=[EMAIL PROTECTED]
unless=unless.exclude.block.{$block-name}/
target name=[EMAIL PROTECTED]
unless=unless.exclude.block.{$block-name}
- xsl:if test=depend
-xsl:attribute name=depends
+ xsl:attribute name=depends
+xsl:if test=depend
+ xsl:value-of select=$block-name/xsl:text-prepare,/xsl:text
xsl:value-of select=@name/,xsl:value-of
select=@name/-excludedxsl:text/
xsl:for-each select=$cocoon-block-dependencies
xsl:text,/xsl:text
xsl:value-of select=concat(@project, '-compile')/
/xsl:for-each
-/xsl:attribute
- /xsl:if
-
- !-- Test if this block has special build --
- available property={$block-name}.has.build
file=${{blocks}}/{$block-name}/build.xml/
-
- !-- Test if this block has mocks --
- available property={$block-name}.has.mocks type=dir
file=${{blocks}}/{$block-name}/mocks//
+/xsl:if
+ /xsl:attribute
xsl:if test=@status='unstable'
echo message= WARNING
===/
@@ -294,11 +289,119 @@
echo
message=/
/xsl:if
- antcall target={$block-name}-compile/
+ !-- Test if this block has special build --
+ if
+available file=${{blocks}}/{$block-name}/build.xml/
+then
+ ant inheritAll=true
+ inheritRefs=false
+ target=main
+ antfile=${{blocks}}/{$block-name}/build.xml
+property name=block.dir value=${{blocks}}/{$block-name}/
+ /ant
+/then
+ /if
+
+ !-- Test if this block has mocks --
+ if
+available type=dir file=${{blocks}}/{$block-name}/mocks//
+then
+ mkdir dir=${{build.blocks}}/{$block-name}/mocks/
+ javac srcdir=${{blocks}}/{$block-name}/mocks
+ destdir=${{build.blocks}}/{$block-name}/mocks
+ debug=${{compiler.debug}}
+ optimize=${{compiler.optimize}}
+ deprecation=${{compiler.deprecation}}
+ target=${{target.vm}}
+ nowarn=${{compiler.nowarn}}
+ compiler=${{compiler}}
+classpath refid=classpath/
+ /javac
+/then
+ /if
+
+ !-- This is a little bit tricky:
+ As the javac task checks, if a src directory is available and
+ stops if its not available, we use the following property
+ to either point to a jdk dependent directory or - if not
+ available - to the usual java source directory.
+ If someone knows a better solution...
+ --
+ !-- Currently, we have no JVM dependent sources
+ condition property=dependend.vm value=${{target.vm}}
+available file=${{blocks}}/{$block-name}/java${{target.vm}}/
+ /condition
+ condition property=dependend.vm value=
+not
+ available file=${{blocks}}/{$block-name}/java${{target.vm}}/
+/not
+ /condition
+ --
+ javac destdir=${{build.blocks}}/{$block-name}/dest
+ debug=${{compiler.debug}}
+ optimize=${{compiler.optimize}}
+ deprecation=${{compiler.deprecation}}
+ target=${{target.vm}}
+ nowarn=${{compiler.nowarn}}
+ compiler=${{compiler}}
+src path=${{blocks}}/{$block-name}/java/
+!-- Currently, we have no JVM dependent sources
+src path=${{blocks}}/{$block-name}/java${{dependend.vm}}/
+--
+classpath refid=classpath/
+exclude name=**/samples/**/*.java/
+ /javac
+
+ copy filtering=on todir=${{build.blocks}}/{$block-name}/dest
+fileset dir=${{blocks}}/{$block-name}/java
+ patternset refid=unprocessed.sources/
+/fileset
+ /copy
+
+ copy filtering=off todir=${{build.blocks}}/{$block-name}/dest
+fileset dir=${{blocks}}/{$block-name}/java
+ include name=**/Manifest.mf/
+ include
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
stephan 2004/03/11 07:41:43
Modified:tools/src blocks-build.xsl
Log:
Apply all xconf file in one shoot.
Revision ChangesPath
1.51 +5 -7 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.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- blocks-build.xsl 10 Mar 2004 09:44:34 - 1.50
+++ blocks-build.xsl 11 Mar 2004 15:41:43 - 1.51
@@ -241,16 +241,14 @@
xsl:for-each select=$cocoon-blocks
xsl:variable name=block-name
select=substring-after(@name,'cocoon-block-')/
include name={$block-name}/conf/*.xmap
unless=unless.exclude.block.{$block-name}/
- include name={$block-name}/conf/*.xpipe
unless=unless.exclude.block.{$block-name}/
/xsl:for-each
/xpatch
- !-- This is much slower, but preserves the dependencies --
- xsl:for-each select=$cocoon-blocks
-xsl:variable name=block-name
select=substring-after(@name,'cocoon-block-')/
-xpatch file=${{build.webapp}}/WEB-INF/cocoon.xconf
srcdir=${{blocks}} addcomments=true
+ xpatch file=${{build.webapp}}/WEB-INF/cocoon.xconf
srcdir=${{blocks}} addcomments=true
+xsl:for-each select=$cocoon-blocks
+ xsl:variable name=block-name
select=substring-after(@name,'cocoon-block-')/
include name={$block-name}/conf/*.xconf
unless=unless.exclude.block.{$block-name}/
-/xpatch
- /xsl:for-each
+/xsl:for-each
+ /xpatch
xpatch file=${{build.webapp}}/WEB-INF/logkit.xconf
srcdir=${{blocks}}
xsl:for-each select=$cocoon-blocks
xsl:variable name=block-name
select=substring-after(@name,'cocoon-block-')/
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
stephan 2004/03/10 01:44:34
Modified:tools/src blocks-build.xsl
Log:
Minor typo.
Revision ChangesPath
1.50 +1 -1 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.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- blocks-build.xsl 10 Mar 2004 09:36:15 - 1.49
+++ blocks-build.xsl 10 Mar 2004 09:44:34 - 1.50
@@ -30,7 +30,7 @@
include name=*.jar/
/fileset
!-- Currently, we have no JVM dependent libraries
- fileset dir=${{lib.core}/jvm${target.vm}}
+ fileset dir=${{lib.core}}/jvm${{target.vm}}
include name=*.jar/
/fileset
--
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
antonio 2004/03/08 02:06:58
Modified:tools/targets docs-build.xml
src/blocks/scratchpad/garbage build.xml
src/documentation/xdocs/userdocs/concepts modules-ref.xml
src/documentation/xdocs/faq faq-debugging.xml
tools/src blocks-build.xsl
Log:
Update links to javadoc 1.4.2
(Javadoc 1.4.1 reached End of Life)
Revision ChangesPath
1.7 +1 -1 cocoon-2.1/tools/targets/docs-build.xml
Index: docs-build.xml
===
RCS file: /home/cvs//cocoon-2.1/tools/targets/docs-build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- docs-build.xml8 Mar 2004 06:07:15 - 1.6
+++ docs-build.xml8 Mar 2004 10:06:58 - 1.7
@@ -205,7 +205,7 @@
link offline=true href=http://avalon.apache.org/api;
packagelistloc=${resources.javadoc}/avalon/
link offline=true
href=http://xml.apache.org/xerces2-j/javadocs/api;
packagelistloc=${resources.javadoc}/xerces/
link offline=true href=http://xml.apache.org/xalan-j/apidocs;
packagelistloc=${resources.javadoc}/xalan/
- link offline=true href=http://java.sun.com/j2se/1.4.1/docs/api;
packagelistloc=${resources.javadoc}/j2se/
+ link offline=true href=http://java.sun.com/j2se/1.4.2/docs/api;
packagelistloc=${resources.javadoc}/j2se/
link offline=true
href=http://java.sun.com/j2ee/sdk_1.3/techdocs/api;
packagelistloc=${resources.javadoc}/j2ee/
packageset dir=${java}
1.3 +2 -2 cocoon-2.1/src/blocks/scratchpad/garbage/build.xml
Index: build.xml
===
RCS file: /home/cvs//cocoon-2.1/src/blocks/scratchpad/garbage/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 6 Mar 2004 02:26:17 - 1.2
+++ build.xml 8 Mar 2004 10:06:58 - 1.3
@@ -247,10 +247,10 @@
version=true
!--
- | Links to other JavaDocs on the web (J2SDK 1.4.1 and JXPATH).
+ | Links to other JavaDocs on the web (J2SDK 1.4.2 and JXPATH).
+--
link href=http://jakarta.apache.org/commons/jxpath/apidocs//
- link href=http://java.sun.com/j2se/1.4.1/docs/api/
+ link href=http://java.sun.com/j2se/1.4.2/docs/api/
!--
| Visual extravaganza...
1.3 +1 -1
cocoon-2.1/src/documentation/xdocs/userdocs/concepts/modules-ref.xml
Index: modules-ref.xml
===
RCS file:
/home/cvs//cocoon-2.1/src/documentation/xdocs/userdocs/concepts/modules-ref.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- modules-ref.xml 6 Mar 2004 02:25:50 - 1.2
+++ modules-ref.xml 8 Mar 2004 10:06:58 - 1.3
@@ -111,7 +111,7 @@
codelt;format/gt;/code tags work fine./note
noteSee also:
-link
href=http://java.sun.com/j2se/1.4.1/docs/api/java/text/SimpleDateFormat.html;Java
+link
href=http://java.sun.com/j2se/1.4.2/docs/api/java/text/SimpleDateFormat.html;Java
Date Format/link./note
/section
1.4 +1 -1 cocoon-2.1/src/documentation/xdocs/faq/faq-debugging.xml
Index: faq-debugging.xml
===
RCS file:
/home/cvs//cocoon-2.1/src/documentation/xdocs/faq/faq-debugging.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- faq-debugging.xml 6 Mar 2004 02:25:57 - 1.3
+++ faq-debugging.xml 8 Mar 2004 10:06:58 - 1.4
@@ -84,7 +84,7 @@
codejdb -connect com.sun.jdi.SocketAttach:port=8000/code
instead.
br/
More information on this can be found in the
-link
href=http://java.sun.com/j2se/1.4.1/docs/guide/jpda/conninv.html;
+link
href=http://java.sun.com/j2se/1.4.2/docs/guide/jpda/conninv.html;
JPDA documentation/link.
/p
note
1.48 +2 -2 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.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- blocks-build.xsl 8 Mar 2004 06:07:15 - 1.47
+++ blocks-build.xsl 8 Mar 2004 10:06:58 - 1.48
@@ -173,7 +173,7 @@
splitindex=true
windowtitle={string('${Name}')} API {string('${version}')}
[{string('${TODAY}')}]
doctitle={string('${Name}')} API {string('${version}')}
- bottom=Copyright #169; {string('${year}')} Apache
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
sylvain 2004/02/11 13:34:22
Modified:tools/src blocks-build.xsl
Log:
Fix link to other APIs in Javadoc generation
Revision ChangesPath
1.46 +7 -6 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.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- blocks-build.xsl 3 Feb 2004 11:12:05 - 1.45
+++ blocks-build.xsl 11 Feb 2004 21:34:22 - 1.46
@@ -163,12 +163,13 @@
useexternalfile=yes
additionalparam={string('${javadoc.additionalparam}')}
maxmemory=128m
-
-link offline=true href=http://avalon.apache.org/api;
packagelistloc=${resources.javadoc}/avalon/
-link offline=true
href=http://xml.apache.org/xerces2-j/javadocs/api;
packagelistloc=${resources.javadoc}/xerces/
-link offline=true href=http://xml.apache.org/xalan-j/apidocs;
packagelistloc=${resources.javadoc}/xalan/
-link offline=true href=http://java.sun.com/j2se/1.4.1/docs/api;
packagelistloc=${resources.javadoc}/j2se/
-link offline=true
href=http://java.sun.com/j2ee/sdk_1.3/techdocs/api;
packagelistloc=${resources.javadoc}/j2ee/
+
+link offline=true href=http://avalon.apache.org/framework/api;
packagelistloc=${{resources.javadoc}}/avalon-framework/
+link offline=true href=http://avalon.apache.org/excalibur/api;
packagelistloc=${{resources.javadoc}}/avalon-excalibur/
+link offline=true
href=http://xml.apache.org/xerces2-j/javadocs/api;
packagelistloc=${{resources.javadoc}}/xerces/
+link offline=true href=http://xml.apache.org/xalan-j/apidocs;
packagelistloc=${{resources.javadoc}}/xalan/
+link offline=true href=http://java.sun.com/j2se/1.4.1/docs/api;
packagelistloc=${{resources.javadoc}}/j2se/
+link offline=true
href=http://java.sun.com/j2ee/sdk_1.3/techdocs/api;
packagelistloc=${{resources.javadoc}}/j2ee/
tag name=avalon.component scope=types description=Avalon
component /
tag name=avalon.service scope=types
description=Implements service:; /
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/tools/src blocks-build.xsl
antonio 2003/12/20 02:02:39
Modified:tools/targets standalone-demo-build.xml docs-build.xml
compile-build.xml webapp-build.xml
instrumentation-build.xml admin-build.xml
tools/src blocks-build.xsl
Log:
Adding index=true in jar building + some beautify
Revision ChangesPath
1.2 +5 -4 cocoon-2.1/tools/targets/standalone-demo-build.xml
Index: standalone-demo-build.xml
===
RCS file: /home/cvs//cocoon-2.1/tools/targets/standalone-demo-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- standalone-demo-build.xml 18 Nov 2003 17:20:23 - 1.1
+++ standalone-demo-build.xml 20 Dec 2003 10:02:39 - 1.2
@@ -55,8 +55,9 @@
/echo
!-- all done --
-echo--- standalone-demo build ready!
-/echo
-echoSee ${readme.txt} for more info./echo
-
echo--/echo
+echo--- standalone-demo build ready!
-
+See ${readme.txt} for more info.
+--
+/echo
/target
1.3 +9 -7 cocoon-2.1/tools/targets/docs-build.xml
Index: docs-build.xml
===
RCS file: /home/cvs//cocoon-2.1/tools/targets/docs-build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- docs-build.xml19 Nov 2003 20:20:50 - 1.2
+++ docs-build.xml20 Dec 2003 10:02:39 - 1.3
@@ -63,15 +63,18 @@
!-- If generated docs are already up-to-date, print a message saying so.
--
target name=docs_done depends=docs_check if=docs.notrequired
-echo
message=-/
-echo message=Not rebuilding docs, as they are up-to-date:/
-echo message= ${build.docs}/index.html is more recent than/
-echo message= status.xml, ${documentation}/xdocs/*.xml/
-echo
message=-/
+echo-
+Not rebuilding docs, as they are up-to-date:
+ ${build.docs}/index.html is more recent than
+ status.xml, ${documentation}/xdocs/*.xml
+-
+/echo
/target
!-- Create docs --
- target name=docs depends=validate-jars, prepare-docs, validate-xdocs,
docs_done, javadocs, forrest unless=docs.notrequired description=Builds the
documentation
+ target name=docs
+ depends=validate-jars, prepare-docs, validate-xdocs, docs_done,
javadocs, forrest
+ unless=docs.notrequired description=Builds the documentation
!-- The docs are created using forrest, so we simply copy them for now
--
mkdir dir=${build.docs}/
@@ -206,4 +209,3 @@
inheritRefs=false
target=javadocs/
/target
-
1.6 +16 -12cocoon-2.1/tools/targets/compile-build.xml
Index: compile-build.xml
===
RCS file: /home/cvs//cocoon-2.1/tools/targets/compile-build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- compile-build.xml 26 Nov 2003 16:29:57 - 1.5
+++ compile-build.xml 20 Dec 2003 10:02:39 - 1.6
@@ -1,7 +1,8 @@
-!-- === Compilation Targets
=== --
+!-- === Compilation Targets =
--
!-- compiles everything --
- target name=compile depends=compile-core, compile-deprecated,
compile-tests/
+ target name=compile
+ depends=compile-core, compile-deprecated, compile-tests/
!-- compiles the core --
target name=compile-core depends=prepare
@@ -40,13 +41,14 @@
/target
!-- compiles deprecated code --
- target name=compile-deprecated depends=prepare
unless=unless.exclude.deprecated
+ target name=compile-deprecated depends=prepare
+ unless=unless.exclude.deprecated
mkdir dir=${build.deprecated}/
xpatch file=${build.dest}/org/apache/cocoon/cocoon.roles
srcdir=${deprecated.conf}
includes=**/*.xroles/
-
+
javac srcdir=${deprecated.src}
destdir=${build.deprecated}
debug=${compiler.debug}
@@ -59,7 +61,7 @@
target name=compile-tests depends=compile-core, compile-deprecated
mkdir dir=${build.test}/
-
+
!-- Copy test files to build test dir --
copy todir=${build.test} filtering=on
fileset dir=${test} excludes=**/*.java/
@@ -87,14
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
unico 2003/11/22 01:12:14
Modified:tools/src blocks-build.xsl
Log:
include tools.lib jars in javadoc classpath and add avalon meta tag
declaration elements to reduce number of javadoc warnings
Revision ChangesPath
1.40 +18 -4 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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- blocks-build.xsl 19 Nov 2003 15:20:16 - 1.39
+++ blocks-build.xsl 22 Nov 2003 09:12:14 - 1.40
@@ -169,6 +169,15 @@
link offline=true href=http://java.sun.com/j2se/1.4.1/docs/api;
packagelistloc=${resources.javadoc}/j2se/
link offline=true
href=http://java.sun.com/j2ee/sdk_1.3/techdocs/api;
packagelistloc=${resources.javadoc}/j2ee/
+tag name=avalon.component scope=types description=Avalon
component /
+tag name=avalon.service scope=types
description=Implements service:; /
+!-- FIXME: javadoc or ant seems to not understand these
+tag name=x-avalon.info scope=types
description=Shorthand: /
+tag name=x-avalon.lifestyle scope=types
description=Lifestyle: /
+--
+tag name=avalon.context scope=methods description=Requires
entry: /
+tag name=avalon.dependency scope=methods description=Requires
component: /
+
packageset dir={string('${java}')}
include name=**/
/packageset
@@ -180,10 +189,15 @@
include name=**/
/packageset
/xsl:for-each
-classpath refid=classpath/
-xsl:for-each select=$cocoon-blocks
- classpath
refid={substring-after(@name,'cocoon-block-')}.classpath/
-/xsl:for-each
+classpath
+ fileset dir={string('${tools.lib}')}
+include name=*.jar/
+ /fileset
+ path refid=classpath /
+ xsl:for-each select=$cocoon-blocks
+path
refid={substring-after(@name,'cocoon-block-')}.classpath/
+ /xsl:for-each
+/classpath
/javadoc
/target
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
vgritsenko2003/11/16 19:14:54
Modified:tools/src blocks-build.xsl
Log:
javac with fork=true fails if directory name has space...
Revision ChangesPath
1.38 +4 -4 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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- blocks-build.xsl 22 Oct 2003 19:56:35 - 1.37
+++ blocks-build.xsl 17 Nov 2003 03:14:54 - 1.38
@@ -505,14 +505,14 @@
fileset dir={string('${blocks}')}/{$block-name}/test
excludes=**/*.java/
/copy
- javac srcdir={string('${blocks}')}/{$block-name}/test
- destdir={string('${build.blocks}')}/{$block-name}/test
- fork=true
+ javac destdir={string('${build.blocks}')}/{$block-name}/test
debug={string('${compiler.debug}')}
optimize={string('${compiler.optimize}')}
deprecation={string('${compiler.deprecation}')}
target={string('${target.vm}')}
- nowarn={string('${compiler.nowarn}')}
+ nowarn={string('${compiler.nowarn}')}
+ compiler={string('${compiler}')}
+src path={string('${blocks}')}/{$block-name}/test/
classpath
path refid=test.classpath/
path refid={$block-name}.classpath/
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
haul2003/10/13 05:40:19
Modified:tools/src blocks-build.xsl
Log:
check not only for block samples by testing samples/sitemap.xmap but also
conf/{$block-name}.xsamples
Revision ChangesPath
1.35 +2 -1 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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- blocks-build.xsl 11 Sep 2003 22:55:56 - 1.34
+++ blocks-build.xsl 13 Oct 2003 12:40:19 - 1.35
@@ -13,7 +13,7 @@
/fileset
fileset dir={string('${lib.endorsed}')}
include name=*.jar/
-/fileset
+/fileset
!-- Currently, we have no JVM dependent libraries
fileset dir={string('${lib.core}/jvm${target.vm}')}
include name=*.jar/
@@ -303,6 +303,7 @@
!-- Test if this block has samples --
available property={$block-name}.has.samples
file={string('${blocks}')}/{$block-name}/samples/sitemap.xmap/
+ available property={$block-name}.has.samples
file={string('${blocks}')}/{$block-name}/conf/{$block-name}.xsamples/
antcall target={$block-name}-samples/
/target
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
haul2003/10/13 05:54:14
Modified:tools/src blocks-build.xsl
Log:
revert last change since it is superfluous :-(
Revision ChangesPath
1.36 +0 -1 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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- blocks-build.xsl 13 Oct 2003 12:40:19 - 1.35
+++ blocks-build.xsl 13 Oct 2003 12:54:14 - 1.36
@@ -303,7 +303,6 @@
!-- Test if this block has samples --
available property={$block-name}.has.samples
file={string('${blocks}')}/{$block-name}/samples/sitemap.xmap/
- available property={$block-name}.has.samples
file={string('${blocks}')}/{$block-name}/conf/{$block-name}.xsamples/
antcall target={$block-name}-samples/
/target
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
gcasper 2003/09/11 15:55:56
Modified:src/targets test-build.xml
src/test/anteater all-tests.xml
tools/src blocks-build.xsl
Log:
Enabled Anteater tests per block
Revision ChangesPath
1.19 +10 -2 cocoon-2.1/src/targets/test-build.xml
Index: test-build.xml
===
RCS file: /home/cvs/cocoon-2.1/src/targets/test-build.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- test-build.xml11 Sep 2003 17:08:38 - 1.18
+++ test-build.xml11 Sep 2003 22:55:56 - 1.19
@@ -21,7 +21,7 @@
/target
!-- Anteater tests --
- target name=anteater-tests
+ target name=anteater-tests depends=block-anteater-tests
property name=host value=localhost/
property name=port value=/
property name=base value=//
@@ -42,7 +42,7 @@
jvmarg value=-Danteater.resources=${anteater.home}/resources/
jvmarg
value=-Danteater.report=${anteater.home}/resources/scripts/report.xml/
jvmarg value=-Djava.endorsed.dirs=${anteater.home}/lib/
- arg line=-f src/test/anteater/all-tests.xml -Dhost=${host}
-Dport=${port} -Dbase=${base}/
+ arg line=-f ${build.test}/anteater/all-tests.xml -Dhost=${host}
-Dport=${port} -Dbase=${base}/
/java
/target
@@ -56,3 +56,11 @@
/target
+ target name=block-anteater-tests depends=prepare-blocks
+
+ant antfile=${build.temp}/blocks-build.xml
+ inheritAll=true
+ inheritRefs=false
+ target=prepare-anteater-tests/
+
+ /target
1.4 +6 -14 cocoon-2.1/src/test/anteater/all-tests.xml
Index: all-tests.xml
===
RCS file: /home/cvs/cocoon-2.1/src/test/anteater/all-tests.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- all-tests.xml 31 Aug 2003 16:32:34 - 1.3
+++ all-tests.xml 11 Sep 2003 22:55:56 - 1.4
@@ -10,12 +10,11 @@
Description:
- To write a new Anteater test, just create a new Ant XML file and
- define a target whose name is the same as the filename, except for
- the .xml suffix. Then go in the top level directory of Cocoon and
+ To write a new Anteater test, just create a new Ant XML file with
+ a default target. Then go in the top level directory of Cocoon and
type:
- ./build.sh test
+ ./build.sh anteater-tests
The newly added test file will be picked up and executed
auto-magically.
@@ -29,16 +28,9 @@
taskdef resource=net/sf/antcontrib/antcontrib.properties/
target name=init
-property name=port value=8100/
property name=cocoon value=http://${host}:${port}/${base}/
-property name=src-webapp-dir value=../../webapp/
-property name=deploy-dir value=../../../build/webapp/
- /target
-
- target name=deploy
-servletContainer port=${port}/
-deploy path=/cocoon webapp=${deploy-dir}/
-sleep seconds=5/
+property name=src-webapp-dir value=../../../../src/webapp/
+property name=deploy-dir value=../../../../build/webapp/
/target
target name=all depends=init
@@ -53,6 +45,6 @@
target name=runtest depends=init
basename property=target file=${name} suffix=.xml/
echo message=running test ${target} in dir ${basedir}/
-ant antfile=${target}.xml dir=${basedir} target=${target}
inheritAll=yes/
+ant antfile=${target}.xml dir=${basedir} inheritAll=yes/
/target
/project
1.34 +24 -0 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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- blocks-build.xsl 8 Sep 2003 22:25:27 - 1.33
+++ blocks-build.xsl 11 Sep 2003 22:55:56 - 1.34
@@ -103,6 +103,16 @@
/xsl:attribute
/target
+target name=prepare-anteater-tests
+ xsl:attribute name=depends
+xsl:textinit/xsl:text
+xsl:for-each select=$cocoon-blocks
+ xsl:text,/xsl:text
+ xsl:value-of select=concat(@name, '-prepare-anteater-tests')/
+/xsl:for-each
+ /xsl:attribute
+/target
+
!-- Check if javadocs have to be generated --
target name=javadocs-check
mkdir dir={string('${build.javadocs}')}/
@@ -528,6 +538,20 @@
/fileset
/batchtest
/junit
+/target
+target name=[EMAIL PROTECTED]
unless=unless.exclude.block.{$block-name}
+
+ !-- Test if this block has Anteater tests --
+ available property={$block-name}.has.anteater-tests
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
joerg 2003/09/08 15:25:28
Modified:tools/src blocks-build.xsl
Log:
extracting variables from repeated evaluation of cocoon blocks
formatting
Revision ChangesPath
1.33 +505 -458 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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- blocks-build.xsl 4 Sep 2003 12:42:44 - 1.32
+++ blocks-build.xsl 8 Sep 2003 22:25:27 - 1.33
@@ -1,486 +1,533 @@
?xml version=1.0?
xsl:stylesheet version=1.0
xmlns:xsl=http://www.w3.org/1999/XSL/Transform;
- xsl:output method=xml indent=yes /
+ xsl:output method=xml indent=yes/
- xsl:template match=/
- project default=compile basedir=. name=blocks
- descriptionAutogenerated Ant build file that builds
blocks./description
-
- path id=classpath
-fileset dir={string('${lib.core}')}
- include name=*.jar/
-/fileset
-fileset dir={string('${lib.endorsed}')}
- include name=*.jar/
-/fileset
-!-- Currently, we have no JVM dependent libraries
- fileset dir={string('${lib.core}/jvm${target.vm}')}
- include name=*.jar/
- /fileset
---
-fileset dir={string('${lib.optional}')}
- include name=*.jar/
-/fileset
-fileset dir={string('${build.blocks}')}
- include name=*.jar/
-/fileset
-path location={string('${build.mocks}')}/
-path location={string('${build.dest}')}/
- /path
-
- path id=test.classpath
-fileset dir={string('${tools.lib}')}
- include name=*.jar/
-/fileset
- /path
-
- !-- Files, which should no compiled or otherwise processed --
- patternset id=unprocessed.sources
-exclude name=**/*.java/
-exclude name=**/*.xconf/
-exclude name=**/*.xroles/
-exclude name=**/*.xmap/
-exclude name=**/*.xpipe/
-exclude name=**/*.xlog/
-exclude name=**/*.xweb/
-exclude name=**/package.html/
- /patternset
-
- target name=init
- xsl:for-each
select=module/project[contains(@name,'cocoon-block-')]
- xsl:variable name=block-name
select=substring-after(@name,'cocoon-block-') /
- condition property=unless.exclude.block.{$block-name}
- istrue
value={string('${exclude.block.')}{$block-name}{string('}')}/
- /condition
- /xsl:for-each
- /target
-
- xsl:apply-templates select=module /
- /project
- /xsl:template
-
- xsl:template match=module
- target name=compile
-xsl:attribute name=dependsinitxsl:for-each
select=project[contains(@name,'cocoon-block-')]xsl:text,/xsl:textxsl:value-of
select=@name/-compile/xsl:for-each/xsl:attribute
- /target
-
- target name=samples
-xsl:attribute
name=dependsinitxsl:text,/xsl:textpatch-samplesxsl:for-each
select=project[contains(@name,'cocoon-block-')]xsl:text,/xsl:textxsl:value-of
select=@name/-samples/xsl:for-each/xsl:attribute
- /target
-
- target name=lib
-xsl:attribute name=dependsinitxsl:for-each
select=project[contains(@name,'cocoon-block-')]xsl:text,/xsl:textxsl:value-of
select=@name/-lib/xsl:for-each/xsl:attribute
- /target
-
- target name=tests
-xsl:attribute name=dependsinitxsl:for-each
select=project[contains(@name,'cocoon-block-')]xsl:text,/xsl:textxsl:value-of
select=@name/-tests/xsl:for-each/xsl:attribute
- /target
+ xsl:template match=/
+project default=compile basedir=. name=blocks
+ descriptionAutogenerated Ant build file that builds
blocks./description
+
+ path id=classpath
+fileset dir={string('${lib.core}')}
+ include name=*.jar/
+/fileset
+fileset dir={string('${lib.endorsed}')}
+ include name=*.jar/
+/fileset
+!-- Currently, we have no JVM dependent libraries
+ fileset dir={string('${lib.core}/jvm${target.vm}')}
+ include name=*.jar/
+ /fileset
+--
+fileset dir={string('${lib.optional}')}
+ include name=*.jar/
+/fileset
+fileset dir={string('${build.blocks}')}
+ include name=*.jar/
+/fileset
+path location={string('${build.mocks}')}/
+path location={string('${build.dest}')}/
+ /path
+
+ path id=test.classpath
+fileset
