cziegeler 2004/03/10 00:43:23
Modified: tools/targets init-build.xml admin-build.xml
standalone-demo-build.xml forrest-build.xml
docs-build.xml test-build.xml compile-build.xml
ide-build.xml samples-build.xml
instrumentation-build.xml dist-build.xml
webapp-build.xml validate-build.xml
. blocks.properties build.sh build.bat
announcement.xml build.xml mount-table.xml.sample
build.properties cli.xconf forrest.properties
cocoon.bat status.xml INSTALL.txt LICENSE.txt
gump.xml cocoon.sh
Added: tools/targets tools-build.xml upgrade-build.xml
. NOTICE.txt
Log:
Add license to main directory (and add changes from 2.1.x branch)
Revision Changes Path
1.4 +15 -0 cocoon-2.2/tools/targets/init-build.xml
Index: init-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/tools/targets/init-build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- init-build.xml 26 Dec 2003 10:32:24 -0000 1.3
+++ init-build.xml 10 Mar 2004 08:43:22 -0000 1.4
@@ -1,4 +1,19 @@
<?xml version="1.0"?>
+<!--
+ 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-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<project name="init">
<description>
1.4 +15 -0 cocoon-2.2/tools/targets/admin-build.xml
Index: admin-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/tools/targets/admin-build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- admin-build.xml 26 Dec 2003 10:32:24 -0000 1.3
+++ admin-build.xml 10 Mar 2004 08:43:22 -0000 1.4
@@ -1,4 +1,19 @@
<?xml version="1.0"?>
+<!--
+ 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-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<project name="admin">
<description>
1.3 +16 -1 cocoon-2.2/tools/targets/standalone-demo-build.xml
Index: standalone-demo-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/tools/targets/standalone-demo-build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- standalone-demo-build.xml 26 Dec 2003 10:32:24 -0000 1.2
+++ standalone-demo-build.xml 10 Mar 2004 08:43:22 -0000 1.3
@@ -1,4 +1,19 @@
<?xml version="1.0"?>
+<!--
+ 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-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<project name="standalone">
<!--
ant include file for "standalone-demo" build
1.3 +15 -0 cocoon-2.2/tools/targets/forrest-build.xml
Index: forrest-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/tools/targets/forrest-build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- forrest-build.xml 26 Dec 2003 10:32:24 -0000 1.2
+++ forrest-build.xml 10 Mar 2004 08:43:22 -0000 1.3
@@ -1,4 +1,19 @@
<?xml version="1.0"?>
+<!--
+ 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-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<project name="forrest">
<description>
1.4 +15 -0 cocoon-2.2/tools/targets/docs-build.xml
Index: docs-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/tools/targets/docs-build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- docs-build.xml 26 Dec 2003 10:32:24 -0000 1.3
+++ docs-build.xml 10 Mar 2004 08:43:22 -0000 1.4
@@ -1,4 +1,19 @@
<?xml version="1.0"?>
+<!--
+ 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-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<project name="docs">
<description>
1.4 +15 -0 cocoon-2.2/tools/targets/test-build.xml
Index: test-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/tools/targets/test-build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- test-build.xml 26 Dec 2003 10:32:24 -0000 1.3
+++ test-build.xml 10 Mar 2004 08:43:22 -0000 1.4
@@ -1,4 +1,19 @@
<?xml version="1.0"?>
+<!--
+ 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-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<project name="test">
<description>
1.4 +15 -0 cocoon-2.2/tools/targets/compile-build.xml
Index: compile-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/tools/targets/compile-build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- compile-build.xml 26 Dec 2003 10:32:24 -0000 1.3
+++ compile-build.xml 10 Mar 2004 08:43:22 -0000 1.4
@@ -1,4 +1,19 @@
<?xml version="1.0"?>
+<!--
+ 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-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<project name="compile">
<description>
1.10 +15 -0 cocoon-2.2/tools/targets/ide-build.xml
Index: ide-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/tools/targets/ide-build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ide-build.xml 25 Jan 2004 00:50:56 -0000 1.9
+++ ide-build.xml 10 Mar 2004 08:43:22 -0000 1.10
@@ -1,4 +1,19 @@
<?xml version="1.0"?>
+<!--
+ 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-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<project name="ide">
<description>
1.4 +15 -0 cocoon-2.2/tools/targets/samples-build.xml
Index: samples-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/tools/targets/samples-build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- samples-build.xml 26 Dec 2003 10:32:24 -0000 1.3
+++ samples-build.xml 10 Mar 2004 08:43:22 -0000 1.4
@@ -1,4 +1,19 @@
<?xml version="1.0"?>
+<!--
+ 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-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<project name="samples">
<description>
1.3 +15 -0 cocoon-2.2/tools/targets/instrumentation-build.xml
Index: instrumentation-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/tools/targets/instrumentation-build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- instrumentation-build.xml 26 Dec 2003 10:32:24 -0000 1.2
+++ instrumentation-build.xml 10 Mar 2004 08:43:22 -0000 1.3
@@ -1,4 +1,19 @@
<?xml version="1.0"?>
+<!--
+ 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-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<project name="instrumentation">
<target name="start-instrumentation-client" depends="init">
<property name="lib.instrumentation" value="tools/instrumentation/lib"/>
1.3 +15 -0 cocoon-2.2/tools/targets/dist-build.xml
Index: dist-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/tools/targets/dist-build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dist-build.xml 26 Dec 2003 10:32:24 -0000 1.2
+++ dist-build.xml 10 Mar 2004 08:43:22 -0000 1.3
@@ -1,4 +1,19 @@
<?xml version="1.0"?>
+<!--
+ 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-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<project name="dist">
<description>
1.5 +15 -0 cocoon-2.2/tools/targets/webapp-build.xml
Index: webapp-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/tools/targets/webapp-build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- webapp-build.xml 26 Dec 2003 10:32:24 -0000 1.4
+++ webapp-build.xml 10 Mar 2004 08:43:22 -0000 1.5
@@ -1,4 +1,19 @@
<?xml version="1.0"?>
+<!--
+ 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-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<project name="webapp">
<description>
1.4 +15 -0 cocoon-2.2/tools/targets/validate-build.xml
Index: validate-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/tools/targets/validate-build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- validate-build.xml 26 Dec 2003 10:32:24 -0000 1.3
+++ validate-build.xml 10 Mar 2004 08:43:22 -0000 1.4
@@ -1,4 +1,19 @@
<?xml version="1.0"?>
+<!--
+ 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-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<project name="validation">
<description>
1.1 cocoon-2.2/tools/targets/tools-build.xml
Index: tools-build.xml
===================================================================
<?xml version="1.0"?>
<!--
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-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project name="tools">
<description>
Tools provided by Ant which could be helpful
</description>
<target
name="correctLinefeed"
description="Make sure LF is used as line feed">
<echo
message="-------------------------------------------------------------------------------"/>
<echo message="Make sure you don't have any binaries (except *.jpg,
*.gif, *.jar and *.zip in the directory (or any subdirectory) which you want
to correct."/>
<echo
message="-------------------------------------------------------------------------------"/>
<input message="Please enter the basedir which should be corrected:"
addproperty="target.dir"/>
<fixcrlf srcdir="${target.dir}"
eol="lf"
includes="**/*"
excludes="**/*.jpg,**/*.gif,**/*.jar,**/*.zip"
/>
</target>
</project>
1.1 cocoon-2.2/tools/targets/upgrade-build.xml
Index: upgrade-build.xml
===================================================================
<?xml version="1.0"?>
<!--
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-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project name="upgrade">
<tstamp/>
<description>
Upgrade targets that help to convert between different Cocoon versions
</description>
<!-- Namespace-upgrade from Woody to CocoonForms -->
<!-- - namespace change
* from xmlns:wd="http://apache.org/cocoon/woody/definition/1.0";
to xmlns:fd="http://apache.org/cocoon/forms/1.0#definition";
* from xmlns:wb="http://apache.org/cocoon/woody/binding/1.0";
to xmlns:fb="http://apache.org/cocoon/forms/1.0#binding";
* from xmlns:wi="http://apache.org/cocoon/woody/instance/1.0";
to xmlns:fi="http://apache.org/cocoon/forms/1.0#instance";
* from xmlns:wt="http://apache.org/cocoon/woody/template/1.0";
to xmlns:ft="http://apache.org/cocoon/forms/1.0#template";>
TODO (RP): If somebody knows how to make a timestamp including the
seconds
we could drop the check for an existing backup
-->
<target
name="woody2CocoonForms-renaming"
description="Updates all namespaces from Woody to CocoonForms">
<input message="Please enter the basedir which should be updated:"
addproperty="target.dir"/>
<!-- check if the backup directory doesn't exist already?-->
<available file="${target.dir}" type="dir" property="target.exists"/>
<fail unless="target.exists" message="The entered directory doesn't
exist!"/>
<property name="timestamp" value="${DSTAMP}${TSTAMP}"/>
<property name="backup.dir"
value="./build/temp/backup_${DSTAMP}${TSTAMP}"/>
<property name="temp_output" value="./build/temp/output_${timestamp}"/>
<echo message=" "/>
<echo
message="---------------------------------------------------------"/>
<echo message="The directory has been backed up at ${backup.dir}"/>
<echo message=" "/>
<echo message="All .xml, .xsl, .xmap and .js/.flow files in the directory
${target.dir} (or any subdirectory) will be updated to the new namespace
declarations."/>
<echo
message="---------------------------------------------------------"/>
<echo message=" "/>
<!-- check if the backup directory doesn't exist already?-->
<available file="${backup.dir}" type="dir" property="backup.exists"/>
<fail if="backup.exists" message="Backup already exists! Attention: If
you start this process more than once in a minute the backup directy may
already exist! In order to avoid damaging an existing backup the transformation
process is stopped. Please start it again some seconds later"/>
<!-- create a backup -->
<copy todir="${backup.dir}">
<fileset dir="${target.dir}">
<include name="**/*.xml"/>
<include name="**/*.xsl"/>
<include name="**/*.xmap"/>
<include name="**/*.js"/>
<include name="**/*.flow"/>
</fileset>
</copy>
<replace dir="${target.dir}">
<include name="**/*.xml"/>
<include name="**/*.xsl"/>
<exclude name="${backup.dir}"/>
<replacefilter
token="http://apache.org/cocoon/woody/instance/1.0";
value="http://apache.org/cocoon/forms/1.0#instance"/>
<replacefilter
token="http://apache.org/cocoon/woody/binding/1.0";
value="http://apache.org/cocoon/forms/1.0#binding"/>
<replacefilter
token="http://apache.org/cocoon/woody/template/1.0";
value="http://apache.org/cocoon/forms/1.0#template"/>
<replacefilter
token="http://apache.org/cocoon/woody/definition/1.0";
value="http://apache.org/cocoon/forms/1.0#definition"/>
<replacefilter
token="wi:"
value="fi:"/>
<replacefilter
token="wb:"
value="fb:"/>
<replacefilter
token="wt:"
value="ft:"/>
<replacefilter
token="wd:"
value="fd:"/>
<replacefilter
token="xmlns:wi"
value="xmlns:fi"/>
<replacefilter
token="xmlns:wb"
value="xmlns:fb"/>
<replacefilter
token="xmlns:wt"
value="xmlns:ft"/>
<replacefilter
token="xmlns:wd"
value="xmlns:fd"/>
</replace>
<replace dir="${target.dir}">
<include name="**/*.xsl"/>
<exclude name="${backup.dir}"/>
<replacetoken><![CDATA[exclude-result-prefixes="wi"]]></replacetoken>
<replacevalue><![CDATA[exclude-result-prefixes="fi"]]></replacevalue>
</replace>
<!-- updating sitemaps -->
<replace dir="${target.dir}">
<include name="**/*.xmap"/>
<replacefilter
token="org.apache.cocoon.woody.generation.WoodyGenerator"
value="org.apache.cocoon.forms.generation.FormsGenerator"/>
<replacefilter
token="org.apache.cocoon.woody.transformation.WoodyTemplateTransformer"
value="org.apache.cocoon.forms.transformation.FormsTemplateTransformer"/>
<!--+
| - hints for FormsTransformer and FormsGenerator
| - logger
| - forms() function
+-->
<replacefilter
token="woody"
value="forms"/>
<replacefilter
token="woody-samples-styling.xsl"
value="forms-samples-styling.xsl"/>
</replace>
<!-- updating flowscripts -->
<replace dir="${target.dir}">
<include name="**/*.js"/>
<include name="**/*.flow"/>
<!-- Java packages -->
<replacefilter
token="resource://org/apache/cocoon/woody/flow/javascript/woody2.js"
value="resource://org/apache/cocoon/forms/flow/javascript/forms.js"/>
<replacefilter
token="org/apache/cocoon/woody"
value="org/apache/cocoon/forms"/>
<replacefilter
token="org.apache.cocoon.woody"
value="org.apache.cocoon.forms"/>
</replace>
</target>
</project>
1.37 +57 -21 cocoon-2.2/blocks.properties
Index: blocks.properties
===================================================================
RCS file: /home/cvs/cocoon-2.2/blocks.properties,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- blocks.properties 15 Oct 2003 09:12:19 -0000 1.36
+++ blocks.properties 10 Mar 2004 08:43:22 -0000 1.37
@@ -1,16 +1,31 @@
+# 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-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
#------------------------------------------------------------------------------#
# Cocoon Blocks
#
#------------------------------------------------------------------------------#
-# Remove blocks from your cocoon distribution by uncommenting the
+# Remove blocks from your cocoon distribution by uncommenting the
# corresponding exclude property.
-# NOTE: Don't modify this file directly but make a copy named
+# NOTE: Don't modify this file directly but make a copy named
# 'local.blocks.properties' and modify that. The build system will override
# these properties with the ones in the 'local.blocks.properties' file.
-# NOTE: "dependency" indicates blocks that are required by other blocks.
-# disabling batik, for example, will prevent fop from compiling.
+# NOTE: "[dependency]" indicates blocks that are required by other blocks.
+# Disabling batik, for example, will result in a RuntimeException when using
+# fop. On the other hand some dependencies come only from the block samples.
# Stable blocks
----------------------------------------------------------------
@@ -20,15 +35,21 @@
# developers are committed to back compatibility. In short, stuff that you
# can depend on.
+#-----[dependency]: "authentication-fw" depends on "session-fw".
+#-----[dependency]: "authentication-fw" is needed by "portal", "portal-fw".
exclude.block.authentication-fw=true
-
-#dependency: fop needs batik
+#-----[dependency]: "batik" is needed by "fop", "scratchpad".
exclude.block.batik=true
exclude.block.bsf=true
exclude.block.chaperon=true
+#-----[dependency]: "databases" is needed by "hsqldb", "jms", "ojb",
"petstore", "repository", "xmldb".
exclude.block.databases=true
+#-----[dependency]: "fop" depends on "batik".
exclude.block.fop=true
+#-----[dependency]: "hsqldb" depends on "databases".
+#-----[dependency]: "hsqldb" is needed by "jms", "petstore".
exclude.block.hsqldb=true
+#-----[dependency]: "html" is needed by "portal".
exclude.block.html=true
exclude.block.itext=true
exclude.block.jfor=true
@@ -37,63 +58,78 @@
exclude.block.linkrewriter=true
exclude.block.lucene=true
exclude.block.naming=true
+exclude.block.paranoid=true
exclude.block.php=true
exclude.block.poi=true
+#-----[dependency]: "portal-fw" depends on "authentication-fw", "session-fw".
exclude.block.portal-fw=true
exclude.block.profiler=true
exclude.block.python=true
-
-#dependency: authentication-fw needs session-fw
+#-----[dependency]: "session-fw" is needed by "authentication-fw", "portal",
"portal-fw".
exclude.block.session-fw=true
-
-dependency: scratchpad needs slide
-exclude.block.slide=true
exclude.block.swf=true
+#-----[dependency]: "velocity" is needed by "petstore", "scratchpad".
exclude.block.velocity=true
exclude.block.web3=true
+#-----[dependency]: "xmldb" depends on "databases".
exclude.block.xmldb=true
-
# Unstable blocks
--------------------------------------------------------------
-# unstable blocks are currently under development and do not guarantee that
the
-# contracts they expose (API, xml schema, properties, behavior) will remain
+# Unstable blocks are currently under development and do not guarantee that
the
+# contracts they expose (API, xml schema, properties, behavior) will remain
# constant in time. Developers are not committed to back-compatibility just
yet.
-# This doesn't necessarily mean the blocks implementation is unstable or
+# This doesn't necessarily mean the blocks implementation is unstable or
# the code can't be trusted for production, but use with care and watch
# its development as things might change over time before they are marked
# stable.
+#-----[dependency]: "apples" depends on "forms".
exclude.block.apples=true
+#-----[dependency]: "asciiart" is needed by "mail".
exclude.block.asciiart=true
exclude.block.axis=true
-
-#dependency: scratchpad needs cron
+#-----[dependency]: "cron" is needed by "scratchpad".
exclude.block.cron=true
exclude.block.deli=true
+#-----[dependency]: "eventcache" is needed by "jms", "repository", "slide".
exclude.block.eventcache=true
+#-----[dependency]: "jms" depends on "databases", "eventcache", "hsqldb".
+#-----[dependency]: "jms" is needed by "slide".
+exclude.block.jms=true
+#-----[dependency]: "forms" is needed by "apples", "petstore".
+exclude.block.forms=true
exclude.block.linotype=true
+#-----[dependency]: "mail" depends on "asciiart".
exclude.block.mail=true
exclude.block.midi=true
-# Before include this block, see:
http://wiki.cocoondev.org/Wiki.jsp?page=OJBBlock
+#-----[dependency]: "ojb" depends on "databases".
exclude.block.ojb=true
+#-----[dependency]: "petstore" depends on "databases", "hsqldb", "velocity",
"forms".
exclude.block.petstore=true
+#-----[dependency]: "portal" depends on "authentication-fw", "html",
"session-fw".
exclude.block.portal=true
exclude.block.precept=true
exclude.block.proxy=true
exclude.block.qdox=true
+#-----[dependency]: "repository" depends on "databases", "eventcache".
+#-----[dependency]: "repository" is needed by "slide", "webdav".
+exclude.block.repository=true
+#-----[dependency]: "scratchpad" depends on "batik", "cron", "velocity".
exclude.block.scratchpad=true
+#-----[dependency]: "slide" depends on "eventcache", "jms", "repository".
+exclude.block.slide=true
exclude.block.slop=true
exclude.block.stx=true
exclude.block.taglib=true
+#-----[dependency]: "webdav" depends on "repository".
exclude.block.webdav=true
-exclude.block.woody=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.woody=true
1.6 +16 -3 cocoon-2.2/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/cocoon-2.2/build.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.sh 5 Mar 2004 00:44:44 -0000 1.5
+++ build.sh 10 Mar 2004 08:43:22 -0000 1.6
@@ -1,5 +1,18 @@
#!/bin/sh
-
+# 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-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
chmod u+x ./tools/bin/antRun
chmod u+x ./tools/bin/ant
@@ -25,8 +38,8 @@
# ----- Restore ANT_HOME
export ANT_HOME=$OLD_ANT_HOME
-unset OLD_ANT_HOME=
+unset OLD_ANT_HOME
# ----- Restore CLASSPATH
export CLASSPATH=$OLD_CLASSPATH
-unset OLD_CLASSPATH=
+unset OLD_CLASSPATH
1.8 +15 -1 cocoon-2.2/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/cocoon-2.2/build.bat,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.bat 5 Mar 2004 00:44:44 -0000 1.7
+++ build.bat 10 Mar 2004 08:43:22 -0000 1.8
@@ -1,4 +1,18 @@
@echo off
+rem Copyright 1999-2004 The Apache Software Foundation
+rem
+rem Licensed under the Apache License, Version 2.0 (the "License");
+rem you may not use this file except in compliance with the License.
+rem You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+rem
rem
----------------------------------------------------------------------------
rem build.bat - Win32 Build Script for Apache Cocoon
rem
1.5 +15 -1 cocoon-2.2/announcement.xml
Index: announcement.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/announcement.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- announcement.xml 5 Aug 2003 09:49:57 -0000 1.4
+++ announcement.xml 10 Mar 2004 08:43:22 -0000 1.5
@@ -1,5 +1,19 @@
<?xml version="1.0"?>
+<!--
+ 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-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<!--
Release Announcement Template
CVS $Id$
1.35 +22 -1 cocoon-2.2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/build.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- build.xml 26 Dec 2003 10:32:24 -0000 1.34
+++ build.xml 10 Mar 2004 08:43:22 -0000 1.35
@@ -1,4 +1,19 @@
<?xml version="1.0"?>
+<!--
+ 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-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<!--
===========================================================================
* =========================== *
@@ -50,6 +65,12 @@
<!-- Instrumentation targets -->
<import file="tools/targets/instrumentation-build.xml" />
<!-- ===================================================================
-->
+ <!-- Upgrade targets -->
+ <import file="tools/targets/upgrade-build.xml" />
+ <!-- ===================================================================
-->
+ <!-- Tools targets -->
+ <import file="tools/targets/tools-build.xml" />
+ <!-- ===================================================================
-->
<!-- ================== Apache Forrest targets =======================
-->
1.2 +15 -0 cocoon-2.2/mount-table.xml.sample
Index: mount-table.xml.sample
===================================================================
RCS file: /home/cvs/cocoon-2.2/mount-table.xml.sample,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mount-table.xml.sample 3 Mar 2004 12:43:31 -0000 1.1
+++ mount-table.xml.sample 10 Mar 2004 08:43:23 -0000 1.2
@@ -1,3 +1,18 @@
+<!--
+ 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-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<mount-table>
<!--
The mount table allows to mount directories external to the Cocoon
webapp without
1.33 +32 -6 cocoon-2.2/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/cocoon-2.2/build.properties,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- build.properties 7 Jan 2004 10:13:29 -0000 1.32
+++ build.properties 10 Mar 2004 08:43:23 -0000 1.33
@@ -1,3 +1,17 @@
+# 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-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
#----------------------------------------------
# Cocoon Build Properties
#----------------------------------------------
@@ -11,13 +25,12 @@
exclude.webapp.documentation=true
exclude.webapp.javadocs=true
-exclude.webapp.idldocs=true
#exclude.webapp.samples=true
# ---- Build Exclusions
--------------------------------------------------------
-# Don't set this to false as we currently have no deprecated stuff!
exclude.deprecated=true
+exclude.documentation=true
exclude.javadocs=true
# ---- Configuration
-----------------------------------------------------------
@@ -30,13 +43,24 @@
# ---- Validation
--------------------------------------------------------------
-validate.config=true
-validate.xdocs=true
-validate.jars=true
+#exclude.validate.config=true
+#exclude.validate.xdocs=true
+#exclude.validate.jars=true
# ---- Forrest
-----------------------------------------------------------------
-forrest.home=../xml-forrest/build/dist/shbat/
+# set $FORREST_HOME and $PATH as instructed by Forrest
+
+# ---- Anteater
----------------------------------------------------------------
+
+anteater.home = /default-from-build.properties/anteater-0.9.16
+anteater.target.host = localhost
+anteater.target.port = 8888
+anteater.target.base.path = /
+anteater.option.haltonerror = true
+
+# disable some long-running tests by default
+# anteater.test.bug26186InternalRequestMemoryLeak.enabled = true
# ---- Build
-------------------------------------------------------------------
@@ -56,6 +80,7 @@
build.deprecated=${build}/deprecated
build.samples=${build}/samples
build.temp=${build}/temp
+build.mounttable=../../mount-table.xml
build.docs.loglevel=ERROR
build.docs.printer.loglevel=ERROR
@@ -107,6 +132,7 @@
documentation=${src}/documentation
docs=${documentation}/xdocs
images=${documentation}/images
+blocks=${src}${file.separator}blocks
samples=${src}/samples
webapp=${src}/webapp
webapp.samples=${webapp}/samples
1.8 +90 -20 cocoon-2.2/cli.xconf
Index: cli.xconf
===================================================================
RCS file: /home/cvs/cocoon-2.2/cli.xconf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cli.xconf 26 Sep 2003 17:08:08 -0000 1.7
+++ cli.xconf 10 Mar 2004 08:43:23 -0000 1.8
@@ -1,5 +1,19 @@
<?xml version="1.0"?>
+<!--
+ 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-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<!--+
| This is the Apache Cocoon command line configuration file.
| Here you give the command line interface details of where
@@ -32,7 +46,8 @@
| greater flexibility. If you require a stable and
| consistent method for accessing the CLI, it is recommended
| that you use the command line parameters to configure
- | the CLI.</note>
+ | the CLI. See documentation at:
+ | /userdocs/offline/index.html and Wiki:CommandLine
|
| CVS: $Id$
+-->
@@ -50,7 +65,7 @@
|
| The work directory is used by Cocoon to store temporary
| files and cache files.
- |
+ |
| The destination directory is where generated pages will
| be written (assuming the 'simple' mapper is used, see
| below)
@@ -59,6 +74,15 @@
<config-file>WEB-INF/cocoon.xconf</config-file>
<work-dir>build/work</work-dir>
<dest-dir>build/dest</dest-dir>
+
+ <!--+
+ | A checksum file can be used to store checksums for pages
+ | as they are generated. When the site is next generated,
+ | files will not be written if their checksum has not changed.
+ | This means that it will be easier to detect which files
+ | need to be uploaded to a server, using the timestamp.
+ +-->
+ <!-- <checksums-uri>build/work/checksums</checksums-uri>-->
<!--+
| Broken link reporting options:
@@ -68,13 +92,13 @@
| <broken-links type="xml" report="filename"/>
| Ignore broken links (default):
| <broken-links type="none"/>
- |
+ |
| Two attributes to this node specify whether a page should
| be generated when an error has occured. 'generate' specifies
| whether a page should be generated (default: true) and
| extension specifies an extension that should be appended
| to the generated page's filename (default: none)
- |
+ |
| Using this, a quick scan through the destination directory
| will show broken links, by their filename extension.
+-->
@@ -122,21 +146,48 @@
<!--+
| Specifies a user agent string to the sitemap when
| generating the site.
+ |
+ | A generic term for a web browser is "user agent". Any
+ | user agent, when connecting to a web server, will provide
+ | a string to identify itself (e.g. as Internet Explorer or
+ | Mozilla). It is possible to have Cocoon serve different
+ | content depending upon the user agent string provided by
+ | the browser. If your site does this, then you may want to
+ | use this <user-agent> entry to provide a 'fake' user agent
+ | to Cocoon, so that it generates the correct version of your
+ | site.
+ |
+ | For most sites, this can be ignored.
+-->
<!--
- <user-agent>xxx</user-agent>
+ <user-agent>Cocoon Command Line Environment 2.1</user-agent>
-->
<!--+
| Specifies an accept string to the sitemap when generating
| the site.
+ | User agents can specify to an HTTP server what types of content
+ | (by mime-type) they are able to receive. E.g. a browser may be
+ | able to handle jpegs, but not pngs. The HTTP accept header
+ | allows the server to take the browser's capabilities into account,
+ | and only send back content that it can handle.
+ |
+ | For most sites, this can be ignored.
+-->
+
<accept>*/*</accept>
<!--+
| Specifies which URIs should be included or excluded, according
| to wildcard patterns.
|
+ | These includes/excludes are only relevant when you are following
+ | links. A link URI must match an include pattern (if one is given)
+ | and not match an exclude pattern, if it is to be followed by
+ | Cocoon. It can be useful, for example, where there are links in
+ | your site to pages that are not generated by Cocoon, such as
+ | references to api-documentation.
+ |
| By default, all URIs are included. If both include and exclude
| patterns are specified, a URI is first checked against the
| include patterns, and then against the exclude patterns.
@@ -152,44 +203,65 @@
| and regexp matching. If you have requirements for these, contact
| [EMAIL PROTECTED]
+-->
+
<include pattern="**"/>
<exclude pattern="docs/apidocs/**"/>
-<!-- <include-links extension=".html"/>-->
+ <!-- <include-links extension=".html"/>-->
<!--+
| <uri> nodes specify the URIs that should be generated, and
| where required, what should be done with the generated pages.
+ | They describe the way the URI of the generated file is created
+ | from the source page's URI. There are three ways that a generated
+ | file URI can be created: append, replace and insert.
|
- | Append: append the generated page's URI to the end of the
- | source URI:
+ | The "type" attribute specifies one of (append|replace|insert):
+ |
+ | append:
+ | Append the generated page's URI to the end of the source URI:
|
| <uri type="append" src-prefix="documents/" src="index.html"
| dest="build/dest/"/>
|
- | Replace: Completely ignore the generated page's URI - just
+ | This means that
+ | (1) the "documents/index.html" page is generated
+ | (2) the file will be written to "build/dest/documents/index.html"
+ |
+ | replace:
+ | Completely ignore the generated page's URI - just
| use the destination URI:
|
| <uri type="replace" src-prefix="documents/" src="index.html"
| dest="build/dest/docs.html"/>
+ |
+ | This means that
+ | (1) the "documents/index.html" page is generated
+ | (2) the result is written to "build/dest/docs.html"
+ | (3) this works only for "single" pages - and not when links
+ | are followed
|
- | Insert: Insert generated page's URI into the destination
+ | insert:
+ | Insert generated page's URI into the destination
| URI at the point marked with a * (example uses fictional
| zip protocol)
|
| <uri type="insert" src-prefix="documents/" src="index.html"
| dest="zip://*.zip/page.html"/>
|
- | If in any of these scenarios, the dest attribute is omitted,
+ | This means that
+ | (1)
+ |
+ | In any of these scenarios, if the dest attribute is omitted,
| the value provided globally using the <dest-dir> node will
- | be used.
+ | be used instead.
+-->
<uri type="replace"
src-prefix="samples/"
src="hello-world/hello.html"
dest="build/dest/hello-world.html"/>
-
+
<!--+
| <uri> nodes can be grouped together in a <uris> node. This
| enables a group of URIs to share properties. The following
@@ -215,6 +287,7 @@
| <uris> nodes are processed. Thus, one xconf file can be
| used to manage multiple sites.
+-->
+
<uris name="docs" follow-links="true">
<uri type="append" src-prefix="docs/" src="index.html"
dest="build/dest/" />
@@ -222,23 +295,20 @@
<uris name="samples"
follow-links="false"
- confirm-extensions="true"
src-prefix="samples/"
dest="build/dest/examples/"
type="append"
>
- <uri src=""/>
<uri src="hello-world/hello.html"/>
<uri src="hello-world/hello.xml"/>
</uris>
<!--+
- | File containing URIs (plain text, one per
- | line).
+ | File containing URIs (plain text, one per line).
+-->
<!--
- <uri-file></uri-file>
+ <uri-file>uris.txt</uri-file>
-->
-
</cocoon>
+
1.27 +14 -0 cocoon-2.2/forrest.properties
Index: forrest.properties
===================================================================
RCS file: /home/cvs/cocoon-2.2/forrest.properties,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- forrest.properties 4 Jan 2004 12:49:38 -0000 1.26
+++ forrest.properties 10 Mar 2004 08:43:23 -0000 1.27
@@ -1,3 +1,17 @@
+# 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-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
##############
# Properties used by forrest.build.xml for building the website
##############
1.18 +20 -2 cocoon-2.2/cocoon.bat
Index: cocoon.bat
===================================================================
RCS file: /home/cvs/cocoon-2.2/cocoon.bat,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- cocoon.bat 5 Mar 2004 02:24:35 -0000 1.17
+++ cocoon.bat 10 Mar 2004 08:43:23 -0000 1.18
@@ -1,4 +1,18 @@
@echo off
+rem Copyright 1999-2004 The Apache Software Foundation
+rem
+rem Licensed under the Apache License, Version 2.0 (the "License");
+rem you may not use this file except in compliance with the License.
+rem You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+rem
::
-----------------------------------------------------------------------------
:: Cocoon Win32 Shell Script
::
@@ -43,7 +57,7 @@
if not "%EXEC%" == "" goto gotExec
if not "%OS%" == "Windows_NT" goto noExecNT
-set EXEC=start "Cocoon" /D. /MAX
+set EXEC=start "Cocoon" /D.
goto gotExec
:noExecNT
set EXEC=
@@ -78,6 +92,10 @@
if not "%JAVA_DEBUG_PORT%" == "" goto gotDebugPort
set JAVA_DEBUG_PORT=8000
:gotDebugPort
+
+:: ----- Ensure desktop.ini is activated
---------------------------------------
+
+attrib +s %COCOON_HOME%
:: ----- Set Up The Classpath
--------------------------------------------------
1.189 +16 -1 cocoon-2.2/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/status.xml,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- status.xml 9 Mar 2004 00:57:27 -0000 1.188
+++ status.xml 10 Mar 2004 08:43:23 -0000 1.189
@@ -1,4 +1,19 @@
<?xml version="1.0"?>
+<!--
+ 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-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<!DOCTYPE status [
<!ELEMENT status (developers, todo, changes)>
<!ELEMENT developers (person+)>
1.7 +9 -4 cocoon-2.2/INSTALL.txt
Index: INSTALL.txt
===================================================================
RCS file: /home/cvs/cocoon-2.2/INSTALL.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- INSTALL.txt 2 Sep 2003 07:42:58 -0000 1.6
+++ INSTALL.txt 10 Mar 2004 08:43:23 -0000 1.7
@@ -9,8 +9,13 @@
Great, this file is for you.
+ 1) Unpack the distribution
+ Obviously you've done this already, but if you got errors when unpacking
+ the archive with tar, you might need to use gnutar instead. Our archives
+ contain long paths and filenames which cause problems with some versions
+ of the tar command.
- 1) Set your JAVA_HOME environment
+ 2) Set your JAVA_HOME environment
You have to set your JAVA_HOME environment to point to the root directory
of
the Java Virtual Machine (JDK 1.3.x or later) installed on your machine.
@@ -23,11 +28,11 @@
your mileage may vary depending on your shell, but you know how to setup
environments, right?
- 2) Build Cocoon by typing "build" or "./build.sh"
+ 3) Build Cocoon by typing "build" or "./build.sh"
- 3) Run Cocoon by typing "cocoon servlet" or "./cocoon.sh servlet"
+ 4) Run Cocoon by typing "cocoon servlet" or "./cocoon.sh servlet"
- 4) Open http://localhost:8888/ with your browser
+ 5) Open http://localhost:8888/ with your browser
That's it!
1.2 +200 -49 cocoon-2.2/LICENSE.txt
Index: LICENSE.txt
===================================================================
RCS file: /home/cvs/cocoon-2.2/LICENSE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LICENSE.txt 5 Mar 2004 08:04:28 -0000 1.1
+++ LICENSE.txt 10 Mar 2004 08:43:23 -0000 1.2
@@ -1,50 +1,201 @@
-/*
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
- include the following acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
- used to endorse or promote products derived from this software without
- prior written permission. For written permission, please contact
- [EMAIL PROTECTED]
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation and was originally created by
- Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
- Software Foundation, please see <http://www.apache.org/>.
-
-*/
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
1.94 +16 -2 cocoon-2.2/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/gump.xml,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- gump.xml 25 Feb 2004 22:56:36 -0000 1.93
+++ gump.xml 10 Mar 2004 08:43:23 -0000 1.94
@@ -1,12 +1,26 @@
<?xml version="1.0"?>
+<!--
+ 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-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<!--+
| Cocoon GUMP Descriptor
|
| CVS $Id$
+-->
-<module name="cocoon-2.1">
+<module name="cocoon-2.2">
<url href="http://cocoon.apache.org/"/>
<description>Java XML Framework</description>
1.11 +16 -1 cocoon-2.2/cocoon.sh
Index: cocoon.sh
===================================================================
RCS file: /home/cvs/cocoon-2.2/cocoon.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cocoon.sh 5 Mar 2004 02:24:35 -0000 1.10
+++ cocoon.sh 10 Mar 2004 08:43:23 -0000 1.11
@@ -1,4 +1,18 @@
#!/bin/sh
+# 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-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
#
-----------------------------------------------------------------------------
# Cocoon Unix Shell Script
#
@@ -100,6 +114,7 @@
if [ "$JAVA_PROFILE_ARGS" = "" ] ; then
JAVA_PROFILE_ARGS='-Xrunhprof:heap=all,cpu=samples,thread=y,depth=3'
fi
+
# ----- Set platform specific variables
1.1 cocoon-2.2/NOTICE.txt
Index: NOTICE.txt
===================================================================
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
It consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation. Please visit the
project homepage (http://cocoon.apache.org) for more information.
Cocoon was originally created by Stefano Mazzocchi <[EMAIL PROTECTED]>.
