pier 2003/02/05 05:33:50
Modified: . INSTALL-SRC.txt build.xml
src/blocks/linkrewriter/samples/sitedemo README.txt
src/blocks/slide README
src/documentation/xdocs/ctwig ctwig-installing.xml
src/documentation/xdocs/faq faq-databases.xml
faq-install.xml
src/documentation/xdocs/howto howto-i18n-xmlform.xml
howto-paginator-transformer.xml
src/documentation/xdocs/howto/xmlform-wizard
howto-xmlform-wizard-5.xml howto-xmlform-wizard.xml
src/documentation/xdocs/installing index.xml
src/documentation/xdocs/userdocs/transformers
sourcewriting-transformer.xml
src/scratchpad/webapp/samples/editor README
src/webapp/samples/docs/samples sample-dynamic.xml
Log:
Removed the build property "include.webapp.libs", and defaulting its
value to "true" (as in 99% of the cases, that's what we want).
If someone wants to build its WAR _without_ JAR libraries, there is
now a new property called "exclude.webapp.libs", in line with all the
other "exclude.webapp.xxxx" properties.
All documentation referring to "include.webapp.libs" has been updated
as well.
Revision Changes Path
1.2 +5 -5 xml-cocoon2/INSTALL-SRC.txt
Index: INSTALL-SRC.txt
===================================================================
RCS file: /home/cvs/xml-cocoon2/INSTALL-SRC.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- INSTALL-SRC.txt 27 Aug 2002 13:14:17 -0000 1.1
+++ INSTALL-SRC.txt 5 Feb 2003 13:33:47 -0000 1.2
@@ -48,8 +48,8 @@
To create the package and automatically install it in your servlet
container, do
- [unix] ./build.sh -Dinclude.webapp.libs=yes
-Dinstall.war=$TOMCAT_HOME/webapps install
- [win32] .\build.bat -Dinclude.webapp.libs=yes
-Dinstall.war=%TOMCAT_HOME%\webapps install
+ [unix] ./build.sh -Dinstall.war=$TOMCAT_HOME/webapps install
+ [win32] .\build.bat -Dinstall.war=%TOMCAT_HOME%\webapps install
This creates the "cocoon.war" file in '$TOMCAT_HOME/webapps' which
is the absolute path to the location where the "cocoon.war" file
@@ -63,8 +63,8 @@
To do this you simply have to type, depending on your operating system
- [unix] ./build.sh -Dinclude.webapp.libs=yes
-Dinstall.war=$TOMCAT_HOME/webapps webapp
- [win32] .\build.bat -Dinclude.webapp.libs=yes
-Dinstall.war=%TOMCAT_HOME%\webapps webapp
+ [unix] ./build.sh -Dinstall.war=$TOMCAT_HOME/webapps webapp
+ [win32] .\build.bat -Dinstall.war=%TOMCAT_HOME%\webapps webapp
This will create the "cocoon.war" file in the './build/cocoon'
directory. It also changes all references to that directory in the
@@ -145,7 +145,7 @@
c) Use "-Dcompile.xsp=yes" in your build command line when you are
building your WAR file. For example:
- ./build.sh -Dcompile.xsp=yes -Dinclude.webapp.libs=yes
-Dinstall.war=$TOMCAT_HOME/webapps install
+ ./build.sh -Dcompile.xsp=yes -Dinstall.war=$TOMCAT_HOME/webapps install
4) Why is cocoon.war so big?
1.318 +7 -14 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -r1.317 -r1.318
--- build.xml 2 Feb 2003 05:24:04 -0000 1.317
+++ build.xml 5 Feb 2003 13:33:47 -0000 1.318
@@ -344,9 +344,6 @@
</condition>
<fail if="do.abort">Build aborted by user.</fail>
- <!-- tell the install target to include webapp libs in dist -->
- <property name="include.webapp.libs" value="true"/>
-
<!-- call install target -->
<antcall target="install"/>
</target>
@@ -369,9 +366,6 @@
</condition>
<fail if="do.abort">Build aborted by user.</fail>
- <!-- tell the install target to include all libs in dist -->
- <property name="include.webapp.libs" value="true"/>
-
<!-- call install target -->
<antcall target="install"/>
</target>
@@ -1424,7 +1418,7 @@
<!-- =================================================================== -->
<!-- Prepares the webapp directories for scratchpad -->
<!-- =================================================================== -->
- <target name="prepare-webapp-scratchpad" depends="copy-webapp"
if="include.webapp.libs">
+ <target name="prepare-webapp-scratchpad" depends="copy-webapp"
unless="exclude.webapp.libs">
<if>
<istrue value="${cocoon.webapp.scratchpad.include}"/>
<then>
@@ -1492,7 +1486,7 @@
<!-- =================================================================== -->
<!-- Prepares the libraries for the war package -->
<!-- =================================================================== -->
- <target name="copy-webapp-libs" depends="copy-tools-lib, check-jars"
if="include.webapp.libs">
+ <target name="copy-webapp-libs" depends="copy-tools-lib, check-jars"
unless="exclude.webapp.libs">
<copy todir="${build.war}/WEB-INF/lib">
<fileset dir="${lib.dir}/endorsed">
<include name="*.jar"/>
@@ -1526,7 +1520,7 @@
</copy>
</target>
- <target name="prepare-webapp-libs" depends="package-core, package-samples,
copy-webapp-libs" if="include.webapp.libs">
+ <target name="prepare-webapp-libs" depends="package-core, package-samples,
copy-webapp-libs" unless="exclude.webapp.libs">
<copy file="${build.dir}/${name}.jar"
tofile="${build.war}/WEB-INF/lib/${name}-${version}.jar"/>
<copy file="${build.dir}/${name}-samples.jar"
todir="${build.war}/WEB-INF/lib/"/>
@@ -1535,7 +1529,7 @@
<!-- =================================================================== -->
<!-- Prepares the scratchpad libraries for the war package -->
<!-- =================================================================== -->
- <target name="copy-scratchpad-libs" depends="copy-webapp-libs"
if="include.webapp.libs">
+ <target name="copy-scratchpad-libs" depends="copy-webapp-libs"
unless="exclude.webapp.libs">
<if>
<istrue value="${cocoon.webapp.scratchpad.include}"/>
<then>
@@ -1549,7 +1543,7 @@
</if>
</target>
- <target name="prepare-scratchpad-libs" depends="copy-scratchpad-libs,
prepare-webapp-libs" if="include.webapp.libs">
+ <target name="prepare-scratchpad-libs" depends="copy-scratchpad-libs,
prepare-webapp-libs" unless="exclude.webapp.libs">
<if>
<istrue value="${cocoon.webapp.scratchpad.include}"/>
<then>
@@ -1638,7 +1632,7 @@
<property name="exclude.webapp.samples" value="true"/>
<property name="exclude.webapp.documentation" value="true"/>
<property name="exclude.webapp.javadocs" value="true"/>
- <property name="include.webapp.libs" value="true"/>
+ <property name="exclude.webapp.libs" value="false"/>
<antcall target="webapp"/>
</target>
@@ -2575,7 +2569,6 @@
description="Run Jetty with configuration set by the jetty.run property"
depends="init">
- <property name="include.webapp.libs" value="true"/>
<antcall target="webapp-local"/>
<copy file="${tools.dir}/jetty/conf/jettyconf.xml"
1.2 +1 -1 xml-cocoon2/src/blocks/linkrewriter/samples/sitedemo/README.txt
Index: README.txt
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/blocks/linkrewriter/samples/sitedemo/README.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.txt 22 Jan 2003 13:15:45 -0000 1.1
+++ README.txt 5 Feb 2003 13:33:48 -0000 1.2
@@ -8,7 +8,7 @@
To install:
-1) run 'build.sh -Dinclude.webapp.libs=yes webapp-local'
+1) run 'build.sh webapp-local'
2) copy this directory into build/cocoon/webapp/samples/
3) Edit build/cocoon/webapp/WEB-INF/cocoon.xconf, and add the following section
inside /cocoon/input-modules:
1.2 +1 -1 xml-cocoon2/src/blocks/slide/README
Index: README
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/blocks/slide/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README 31 Jan 2003 18:08:42 -0000 1.1
+++ README 5 Feb 2003 13:33:48 -0000 1.2
@@ -8,7 +8,7 @@
2. Install the Web Application via in Tomcat
- ./build.sh -Dinclude.webapp.libs=yes -Dinstall.war=$TOMCAT_HOME/webapps
-Dinclude.scratchpad.libs=yes install
+ ./build.sh -Dinstall.war=$TOMCAT_HOME/webapps -Dinclude.scratchpad.libs=yes install
3. Start Tomcat
1.4 +2 -2 xml-cocoon2/src/documentation/xdocs/ctwig/ctwig-installing.xml
Index: ctwig-installing.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/ctwig/ctwig-installing.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ctwig-installing.xml 5 Jun 2002 18:08:21 -0000 1.3
+++ ctwig-installing.xml 5 Feb 2003 13:33:48 -0000 1.4
@@ -31,11 +31,11 @@
<ul>
<li>Set JAVA_HOME</li>
<li>Create the WAR using
- <code>.\build.bat
-Dinclude.webapp.libs=yes webapp</code>
+ <code>.\build.bat webapp</code>
What this does is to create the web
application and packaged cocoon.war under the {COCOON_HOME}/build/cocoon folder.
</li>
<li>Optionally make the SQL examples work out
of the box. If you perform this step using
- <code>.\build.bat
-Dinclude.webapp.libs=yes -Dinstall.war={{TOMCAT_HOME}\webapps} install</code>
+ <code>.\build.bat
-Dinstall.war={{TOMCAT_HOME}\webapps} install</code>
then it will basically copy the
cocoon.war file across to the Tomcat webapps folder ready for immediate use.
</li>
<li>Add any additional components (I like FOP
for example)</li>
1.5 +0 -1 xml-cocoon2/src/documentation/xdocs/faq/faq-databases.xml
Index: faq-databases.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/faq/faq-databases.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- faq-databases.xml 15 Nov 2002 13:36:23 -0000 1.4
+++ faq-databases.xml 5 Feb 2003 13:33:48 -0000 1.5
@@ -47,7 +47,6 @@
system:</p>
<source>
./build.sh \
- -Dinclude.webapp.libs=yes \
-Dinstall.war=path/to/tomcat/webapps install
</source>
1.3 +1 -1 xml-cocoon2/src/documentation/xdocs/faq/faq-install.xml
Index: faq-install.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/faq/faq-install.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- faq-install.xml 22 Jul 2002 23:52:35 -0000 1.2
+++ faq-install.xml 5 Feb 2003 13:33:48 -0000 1.3
@@ -110,7 +110,7 @@
distribution.
</p>
<p>
- Even better, build Cocoon with "build -Dinclude.webapp.libs webapp". This
build creates a complete WAR file with all necessary libraries included.
+ Even better, build Cocoon with "build webapp". This build creates a complete
WAR file with all necessary libraries included.
</p>
</answer>
</faq>
1.6 +1 -1 xml-cocoon2/src/documentation/xdocs/howto/howto-i18n-xmlform.xml
Index: howto-i18n-xmlform.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/documentation/xdocs/howto/howto-i18n-xmlform.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- howto-i18n-xmlform.xml 12 Dec 2002 08:05:52 -0000 1.5
+++ howto-i18n-xmlform.xml 5 Feb 2003 13:33:49 -0000 1.6
@@ -80,7 +80,7 @@
<p>Cocoon 2.1 CVS to be installed with the command:</p>
- <source>build -Dinclude.webapp.libs=true webapp</source>
+ <source>build webapp</source>
<p>You will need to understand and be familiar with XSL, i18n, XForms, XPath,
and Schematron. If you
are unfamiliar with these technologies, it is advised that you learn
1.3 +1 -1
xml-cocoon2/src/documentation/xdocs/howto/howto-paginator-transformer.xml
Index: howto-paginator-transformer.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/documentation/xdocs/howto/howto-paginator-transformer.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- howto-paginator-transformer.xml 3 Jul 2002 20:28:04 -0000 1.2
+++ howto-paginator-transformer.xml 5 Feb 2003 13:33:49 -0000 1.3
@@ -32,7 +32,7 @@
Make sure you have the version 2.0.3 or greater of Cocoon. The PaginatorTransformer
component source is located in the scratchpad area. Therefore, you need to use the
following command to build a deployable cocoon.war which includes the scratchpad
libraries.
</p>
<source>
-./build.sh -Dinclude.webapp.libs=yes -Dinclude.scratchpad.libs=yes webapp
+./build.sh -Dinclude.scratchpad.libs=yes webapp
</source>
<p>
During the build process, the necessary configuration details for the
PaginatorTransformer component are automatically copied to cocoon.xconf of cocoon.war.
This means that you don't need to manually configure cocoon.xconf. However, if you are
adding the paginator samples to Cocoon webapp that was <strong>not</strong> generated
by the above build command, add the following snippet to your cocoon.xconf file,
located in the WEB-INF directory of your deployed webapp.
1.6 +1 -3
xml-cocoon2/src/documentation/xdocs/howto/xmlform-wizard/howto-xmlform-wizard-5.xml
Index: howto-xmlform-wizard-5.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/documentation/xdocs/howto/xmlform-wizard/howto-xmlform-wizard-5.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- howto-xmlform-wizard-5.xml 18 Dec 2002 21:05:10 -0000 1.5
+++ howto-xmlform-wizard-5.xml 5 Feb 2003 13:33:49 -0000 1.6
@@ -169,9 +169,7 @@
<p>To build your webapp, use the command:</p>
<source>
-
-build webapp -Dinclude.webapp.libs=true webapp
-
+build webapp
</source>
<p>If you are using Tomcat, for example, place cocoon.war in your
1.9 +1 -1
xml-cocoon2/src/documentation/xdocs/howto/xmlform-wizard/howto-xmlform-wizard.xml
Index: howto-xmlform-wizard.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/documentation/xdocs/howto/xmlform-wizard/howto-xmlform-wizard.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- howto-xmlform-wizard.xml 4 Jul 2002 20:04:04 -0000 1.8
+++ howto-xmlform-wizard.xml 5 Feb 2003 13:33:49 -0000 1.9
@@ -92,7 +92,7 @@
<p>Cocoon 2.1 CVS to be installed with the command:</p>
- <source>build -Dinclude.webapp.libs=true webapp</source>
+ <source>build webapp</source>
<p>You will need to understand and be familiar with XML, XSL, HTML,
Java, JavaBeans, XForms, XPath, Schematron and Cocoon actions. If you
1.34 +9 -10 xml-cocoon2/src/documentation/xdocs/installing/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/installing/index.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- index.xml 1 Dec 2002 04:53:26 -0000 1.33
+++ index.xml 5 Feb 2003 13:33:49 -0000 1.34
@@ -247,9 +247,9 @@
</p>
<source>
[unix]
-./build.sh -Dinclude.webapp.libs=yes -Dinstall.war={path-to-webapps-dir} install
+./build.sh -Dinstall.war={path-to-webapps-dir} install
[win32]
-.\build.bat -Dinclude.webapp.libs=yes -Dinstall.war={path-to-webapps-dir} install
+.\build.bat -Dinstall.war={path-to-webapps-dir} install
</source>
<p>
Please note that this might not work with all servlet engines
@@ -529,15 +529,15 @@
<ul>
<li><strong>target:</strong> webapp</li>
- <li><strong>required properties:</strong> include.webapp.libs</li>
+ <li><strong>required properties:</strong> none</li>
<li><strong>buildfile:</strong> build.xml</li>
</ul>
<p>To do this you simply have to type:</p>
<source>
-[unix] ./build.sh -Dinclude.webapp.libs=yes webapp
-[win32] .\build.bat -Dinclude.webapp.libs=yes webapp</source>
+[unix] ./build.sh webapp
+[win32] .\build.bat webapp</source>
<p>this will create the <code>cocoon.war</code> file in the
<code>./build/cocoon</code> directory. Follow instructions in the next
@@ -548,17 +548,16 @@
<li>exclude.webapp.samples : to exclude the samples</li>
<li>exclude.webapp.documentation : to exclude the documentation</li>
<li>exclude.webapp.javadocs : to exclude the java docs</li>
+ <li>exclude.webapp.libs : to exclude the jar libraries</li>
</ul>
<p>So, if you first remove all libraries from the <code>./lib/local</code>
and the <code>./lib/optional</code> directory except the
<code>servlet.jar</code>
and then type:</p>
<source>
-[unix] ./build.sh -Dinclude.webapp.libs=yes
- -Dexclude.webapp.samples=yes
+[unix] ./build.sh -Dexclude.webapp.samples=yes
-Dexclude.webapp.documenation=yes
-Dexclude.webapp.javadocs=yes webapp
-[win32] .\build.bat -Dinclude.webapp.libs=yes
- -Dexclude.webapp.samples=yes
+[win32] .\build.bat -Dexclude.webapp.samples=yes
-Dexclude.webapp.documenation=yes
-Dexclude.webapp.javadocs=yes webapp</source>
<p>you get a minimal Cocoon web application without any samples or
documentation.
@@ -778,7 +777,7 @@
</li>
<li>
- Build Cocoon webapp: <code>build -Dinclude.webapp.libs=yes webapp</code>
+ Build Cocoon webapp: <code>build webapp</code>
</li>
<li>
1.4 +1 -1
xml-cocoon2/src/documentation/xdocs/userdocs/transformers/sourcewriting-transformer.xml
Index: sourcewriting-transformer.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/documentation/xdocs/userdocs/transformers/sourcewriting-transformer.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sourcewriting-transformer.xml 15 Nov 2002 23:34:29 -0000 1.3
+++ sourcewriting-transformer.xml 5 Feb 2003 13:33:49 -0000 1.4
@@ -20,7 +20,7 @@
<li>Class:
org.apache.cocoon.transformation.SourceWritingTransformer</li>
<li>Cacheable: no.</li>
</ul>
- <p>If you have built Cocoon with the ScratchPad included
(using: <code>./build.sh -Dinclude.webapp.libs=yes -Dinclude.scratchpad.libs=yes
webapp</code>), there is a set of samples set up, including tests at
<code>http://localhost:8080/cocoon/mount/editor/tests</code> and a demonstration
editor at <code>http://localhost:8080/cocoon/mount/editor/edit/</code></p>
+ <p>If you have built Cocoon with the ScratchPad included
(using: <code>./build.sh -Dinclude.scratchpad.libs=yes webapp</code>), there is a set
of samples set up, including tests at
<code>http://localhost:8080/cocoon/mount/editor/tests</code> and a demonstration
editor at <code>http://localhost:8080/cocoon/mount/editor/edit/</code></p>
<note>Please beware of putting these samples on a
public-facing server.</note>
</s1>
<s1 title="The Tags">
1.2 +2 -2 xml-cocoon2/src/scratchpad/webapp/samples/editor/README
Index: README
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/scratchpad/webapp/samples/editor/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README 1 Jul 2002 15:09:17 -0000 1.1
+++ README 5 Feb 2003 13:33:49 -0000 1.2
@@ -5,7 +5,7 @@
You could use the following command:
-./build.sh -Dinclude.webapp.libs=yes -Dinclude.scratchpad.libs=yes webapp
+./build.sh -Dinclude.scratchpad.libs=yes webapp
This ensures the scratchpad libraries are included in the build.
@@ -86,4 +86,4 @@
Thanks
-Jeremy Quinn <[EMAIL PROTECTED]>
\ No newline at end of file
+Jeremy Quinn <[EMAIL PROTECTED]>
1.3 +3 -3 xml-cocoon2/src/webapp/samples/docs/samples/sample-dynamic.xml
Index: sample-dynamic.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/docs/samples/sample-dynamic.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sample-dynamic.xml 17 Jan 2003 11:29:22 -0000 1.2
+++ sample-dynamic.xml 5 Feb 2003 13:33:50 -0000 1.3
@@ -42,8 +42,8 @@
<!-- FIX ME
<sample name="Parent Component Manager" href="parentcm">
An example showing the use of a parent component manager. For this sample to
work,
- Cocoon must have been built with the include.webapp.libs flag set to true.
(Otherwise
- the sample classes are not found.)
+ Cocoon must have been built without the exclude.webapp.libs flag set to true.
+ (Otherwise the sample classes are not found.)
</sample>
-->
</group>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
