cziegeler 01/11/23 01:11:52
Modified: . build.xml changes.xml
Added: src/org/apache/cocoon/generation naming.sitemap php.sitemap
xmldb.sitemap
src/org/apache/cocoon/serialization jfor.sitemap
src/org/apache/cocoon/transformation naming.sitemap
xt.sitemap
Removed: bin st.class
bin/src st.java
Log:
Finished moving to new SitemapTool task
Revision Changes Path
1.100 +77 -134 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- build.xml 2001/11/22 15:43:40 1.99
+++ build.xml 2001/11/23 09:11:51 1.100
@@ -91,47 +91,10 @@
Some components are optional and require special jar files to be compiled
and added to the web application. Some if these jars are already included
in the distribution while others not.
+For each optional package which is not available, a warning is
+printed.
-Here is a list of the optional components:
-Generators
-
-- Php Generator : Requires the php package (not included in the dist)
- <map:generate name="php"
src="org.apache.cocoon.generation.PhpGenerator"/>
-
-- HTML Generator : Requires the JTidy package (included in the dist)
- <map:generator name="html"
src="org.apache.cocoon.generation.HTMLGenerator" label="content"/>
-
-- ParentCM Generator : Requires the jndi package (not included in the dist)
- <map:generator name="parentcm"
src="org.apache.cocoon.samples.parentcm.Generator"/>
-
-- XML:DB Generators: Require the XML:DB API and a valid implementation
- (not included in the dist)
- <map:generator name="xmldb"
src="org.apache.cocoon.generation.XMLDBGenerator"/>
- <map:generator name="xmldbcollection"
src="org.apache.cocoon.generation.XMLDBCollectionGenerator"/>
-
-Transformers
-
-- XT transformer : Requires the XT package (included in the dist)
- <map:transformer name="xt"
src="org.apache.cocoon.transformation.XTTransformer"/>
-
-- LDAP transformer: Requires the jndi package (not included in the dist)
- <map:transformer name="ldap"
src="org.apache.cocoon.transformation.LDAPTransformer"/>
-
-
-Serializers
-
-- fo2pdf serializer : Requires the FOP package (included in the dist)
- <map:serializer name="fo2pdf"
src="org.apache.cocoon.serialization.FOPSerializer" mime-type="application/pdf"/>
-- fo2ps serializer : Requires the FOP package (included in the dist)
- <map:serializer name="fo2ps"
src="org.apache.cocoon.serialization.FOPSerializer"
mime-type="application/postscript"/>
-- fo2pcl serializer : Requires the FOP package (included in the dist)
- <map:serializer name="fo2pcl"
src="org.apache.cocoon.serialization.FOPSerializer"
mime-type="application/vnd.hp-PCL"/>
-- fo2rtf serializer : Requires the JFOR package (not included in the dist)
- <map:serializer name="fo2rtf"
src="org.apache.cocoon.serialization.RTFSerializer" mime-type="application/msword"/>
-
-
-
Happy hacking from the Apache Cocoon 2 Dev Team :)
============================================================================ -->
@@ -283,26 +246,20 @@
<available property="ifx.driver.present"
classname="com.informix.jdbc.IfxResultSet">
<classpath refid="classpath"/>
</available>
- <available property="xmldb.present" classname="org.xmldb.api.DatabaseManager">
- <classpath refid="classpath"/>
- </available>
- <ClassAvailable classpathref="classpath" property="jfor.present"
classname="org.jfor.jfor.converter.Converter"/>
+ <ClassAvailable classpathref="classpath"
+ property="xmldb.present"
+ classname="org.xmldb.api.DatabaseManager"/>
+
+ <ClassAvailable classpathref="classpath"
+ property="jfor.present"
+ classname="org.jfor.jfor.converter.Converter"/>
+
<available property="servlet.present"
classname="javax.servlet.http.HttpServlet">
<classpath refid="classpath"/>
</available>
- <available property="php.present"
- classname="net.php.servlet">
- <classpath refid="classpath"/>
- </available>
-
- <available property="xt.present"
- classname="com.jclark.xsl.sax.XMLProcessorImpl">
- <classpath refid="classpath"/>
- </available>
-
<available property="rhino.present"
classname="org.mozilla.javascript.tools.jsc.Main">
<classpath refid="classpath"/>
@@ -333,16 +290,20 @@
<classpath refid="classpath"/>
</available>
- <ClassAvailable classpathref="classpath"
- property="naming.present"
- classname="javax.naming.Context"/>
-
<available property="weblogic.present"
classname="weblogic.servlet.internal.ServletContextImpl">
<classpath refid="classpath"/>
</available>
<ClassAvailable classpathref="classpath"
+ property="xt.present"
+ classname="com.jclark.xsl.sax.XMLProcessorImpl"/>
+
+ <ClassAvailable classpathref="classpath"
+ property="naming.present"
+ classname="javax.naming.Context"/>
+
+ <ClassAvailable classpathref="classpath"
property="svg.present"
classname="org.apache.batik.transcoder.Transcoder"/>
@@ -381,6 +342,56 @@
<!-- =================================================================== -->
<!-- Warnings -->
<!-- =================================================================== -->
+ <target name="jfor-warn" unless="jfor.present"
+ description="Outputs a warning if org.jfor.jfor.* classes are missing during
compilation">
+ <antcall target="op-warning">
+ <param name="thing" value="JFOR"/>
+ <param name="recovery"
+ value="Get the JFOR package and place the jar in the lib dir"/>
+ <param name="message"
+ value="JFOR is required for the fo2rtf serializer."/>
+ </antcall>
+ </target>
+ <target name="xmldb-warn" unless="xmldb.present"
+ description="Outputs a warning if org.xmldb.api.* classes are missing during
compilation">
+ <antcall target="op-warning">
+ <param name="thing" value="XMLDB"/>
+ <param name="recovery"
+ value="Get the xmldb package and place the jar in the lib dir"/>
+ <param name="message"
+ value="XMLDB is required for the xmldb and xmldbcollection
generator."/>
+ </antcall>
+ </target>
+ <target name="xt-warn" unless="xt.present"
+ description="Outputs a warning if com.jclark.xsl.* classes are missing during
compilation">
+ <antcall target="op-warning">
+ <param name="thing" value="XT"/>
+ <param name="recovery"
+ value="Get the xt package and place the jar in the lib dir"/>
+ <param name="message"
+ value="XT is required for the xt transformer."/>
+ </antcall>
+ </target>
+ <target name="php-warn" unless="php.present"
+ description="Outputs a warning if net.php.* classes are missing during
compilation">
+ <antcall target="op-warning">
+ <param name="thing" value="Php"/>
+ <param name="recovery"
+ value="Get the php servlet and place the jar in the lib dir"/>
+ <param name="message"
+ value="Php is required for the php generator."/>
+ </antcall>
+ </target>
+ <target name="naming-warn" unless="naming.present"
+ description="Outputs a warning if javax.naming.* classes are missing during
compilation">
+ <antcall target="op-warning">
+ <param name="thing" value="JDNI"/>
+ <param name="recovery"
+ value="Get the jndi.jar from Sun and place the jar in the lib dir"/>
+ <param name="message"
+ value="JNDI is required for the ldap generator and the parentcm
generator."/>
+ </antcall>
+ </target>
<target name="svg-warn" unless="svg.present"
description="Outputs a warning if org.apache.batik.* classes are missing
during compilation">
<antcall target="op-warning">
@@ -425,7 +436,8 @@
<!-- =================================================================== -->
<!-- Print out warnings for optional components -->
<!-- =================================================================== -->
- <target name="optional-warnings" depends="svg-warn, fop-warn, tidy-warn,
maybeupload-warn"
+ <target name="optional-warnings"
+ depends="jfor-warn, xmldb-warn, xt-warn, php-warn, naming-warn, svg-warn,
fop-warn, tidy-warn, maybeupload-warn"
description="Outputs warnings if some optional jars are missing from the
environment">
</target>
@@ -453,6 +465,7 @@
<exclude name="**/fop.sitemap" unless="fop.present"/>
<exclude name="**/XT*.java" unless="xt.present"/>
+ <exclude name="**/xt.sitemap" unless="xt.present"/>
<exclude name="**/SVG*.java" unless="svg.present"/>
@@ -461,7 +474,8 @@
<exclude name="**/Jstyle*" unless="jstyle.present"/>
<exclude name="**/Php*" unless="php.present"/>
-
+ <exclude name="**/php.sitemap" unless="php.present"/>
+
<exclude name="**/Ora*.java" unless="ora.driver.present"/>
<exclude name="**/Ifx*.java" unless="ifx.driver.present"/>
@@ -470,12 +484,15 @@
<exclude name="**/LDAPTransformer*.java" unless="naming.present"/>
<exclude name="**/samples/parentcm/*.java" unless="naming.present"/>
+ <exclude name="**/naming.sitemap" unless="naming.present"/>
<exclude name="**/JSPEngineImplWLS.java" unless="weblogic.present"/>
<exclude name="**/XMLDB*.java" unless="xmldb.present"/>
+ <exclude name="**/xmldb.sitemap" unless="xmldb.present"/>
<exclude name="**/RTFSerializer.java" unless="jfor.present"/>
+ <exclude name="**/jfor.sitemap" unless="jfor.present"/>
<exclude name="**/xpath/XPathProcessorImpl*" unless="xpath.present"/>
@@ -788,83 +805,9 @@
</target>
<!-- =================================================================== -->
- <!-- Prepares the webapp sitemap if php is available -->
- <!-- =================================================================== -->
- <target name="prepare-webapp-php" depends="copy-webapp" if="php.present">
- <java classname="st">
- <arg line="-i ${build.war}/sitemap.xmap -o ${build.war}/sitemap.xmap -a
generators php org.apache.cocoon.generation.PhpGenerator"/>
- <classpath>
- <pathelement location="${bin.dir}"/>
- </classpath>
- </java>
- </target>
-
- <!-- =================================================================== -->
- <!-- Prepares the webapp sitemap if xt is available -->
- <!-- =================================================================== -->
- <target name="prepare-webapp-xt" depends="copy-webapp" if="xt.present">
- <java classname="st">
- <arg line="-i ${build.war}/sitemap.xmap -o ${build.war}/sitemap.xmap -a
transformers xt org.apache.cocoon.transformation.XTTransformer"/>
- <classpath>
- <pathelement location="${bin.dir}"/>
- </classpath>
- </java>
- </target>
-
- <!-- =================================================================== -->
- <!-- Prepares the webapp sitemap if JFOR is available -->
- <!-- =================================================================== -->
- <target name="prepare-webapp-jfor" depends="copy-webapp" if="jfor.present">
- <java classname="st">
- <arg line="-i ${build.war}/sitemap.xmap -o ${build.war}/sitemap.xmap -a
serializers fo2rtf org.apache.cocoon.serialization.RTFSerializer"/>
- <classpath>
- <pathelement location="${bin.dir}"/>
- </classpath>
- </java>
- </target>
-
- <!-- =================================================================== -->
- <!-- Prepares the webapp sitemap if jndi is available -->
- <!-- =================================================================== -->
- <target name="prepare-webapp-naming" depends="copy-webapp" if="naming.present">
- <java classname="st">
- <arg line="-i ${build.war}/sitemap.xmap -o ${build.war}/sitemap.xmap -a
transformers ldap org.apache.cocoon.transformation.LDAPTransformer"/>
- <classpath>
- <pathelement location="${bin.dir}"/>
- </classpath>
- </java>
- <java classname="st">
- <arg line="-i ${build.war}/sitemap.xmap -o ${build.war}/sitemap.xmap -a
generators parentcm org.apache.cocoon.samples.parentcm.Generator"/>
- <classpath>
- <pathelement location="${bin.dir}"/>
- </classpath>
- </java>
- </target>
-
- <!-- =================================================================== -->
- <!-- Prepares the webapp sitemap if XML:DB is available -->
- <!-- =================================================================== -->
- <target name="prepare-webapp-xmldb" depends="copy-webapp"
- if="xmldb.present">
- <property name="xmldb.conf"
value="<driver>org.dbxml.client.xmldb.DatabaseImpl</driver><base>xmldb:dbxml:///db/</base>"/>
- <java classname="st">
- <arg line="-i ${build.war}/sitemap.xmap -o ${build.war}/sitemap.xmap -a
generators xmldb org.apache.cocoon.generation.XMLDBGenerator ${xmldb.conf}"/>
- <classpath>
- <pathelement location="${bin.dir}"/>
- </classpath>
- </java>
- <java classname="st">
- <arg line="-i ${build.war}/sitemap.xmap -o ${build.war}/sitemap.xmap -a
generators xmldbcollection org.apache.cocoon.generation.XMLDBCollectionGenerator
${xmldb.conf}"/>
- <classpath>
- <pathelement location="${bin.dir}"/>
- </classpath>
- </java>
- </target>
-
- <!-- =================================================================== -->
<!-- Prepares the webapp directories -->
<!-- =================================================================== -->
- <target name="prepare-webapp" depends="copy-webapp, prepare-webapp-php,
prepare-webapp-xt, prepare-webapp-naming, prepare-webapp-xmldb, prepare-webapp-jfor">
+ <target name="prepare-webapp" depends="copy-webapp">
<!-- Invoke the SitemapTool to add optional entries -->
<SitemapTool directory="${build.src}"
extension="sitemap"
1.51 +6 -1 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- changes.xml 2001/11/16 14:09:56 1.50
+++ changes.xml 2001/11/23 09:11:51 1.51
@@ -4,7 +4,7 @@
<!--
History of Cocoon changes
- $Id: changes.xml,v 1.50 2001/11/16 14:09:56 giacomo Exp $
+ $Id: changes.xml,v 1.51 2001/11/23 09:11:51 cziegeler Exp $
-->
<changes title="History of Changes">
@@ -27,6 +27,11 @@
</devs>
<release version="2.1-dev" date="@date@">
+ <action dev="CZ" type="update">
+ Restructured build system. A new ant task (SitemapTool) adds entries
+ of optional components to the sitemap. Warnings for not available
+ optional components are printed out.
+ </action>
<action dev="GP" type="update">
Made the concept of views work as proposed in the original proposal. There
is now the possibility to attach a label attribute with multiple values
separated
1.1 xml-cocoon2/src/org/apache/cocoon/generation/naming.sitemap
Index: naming.sitemap
===================================================================
category:generators|componentName:parentcm|componentClass:org.apache.cocoon.samples.parentcm.Generator
1.1 xml-cocoon2/src/org/apache/cocoon/generation/php.sitemap
Index: php.sitemap
===================================================================
category:generators|componentName:php|componentClass:org.apache.cocoon.generation.PhpGenerator
1.1 xml-cocoon2/src/org/apache/cocoon/generation/xmldb.sitemap
Index: xmldb.sitemap
===================================================================
category:generators|componentName:xmldb|componentClass:org.apache.cocoon.generation.XMLDBGenerator
category:generators|componentName:xmldbcollection|componentClass:org.apache.cocoon.generation.XMLDBCollectionGenerator
1.1 xml-cocoon2/src/org/apache/cocoon/serialization/jfor.sitemap
Index: jfor.sitemap
===================================================================
mimeType:application/msword|category:serializers|componentName:fo2rtf|componentClass:org.apache.cocoon.serialization.RTFSerializer
1.1 xml-cocoon2/src/org/apache/cocoon/transformation/naming.sitemap
Index: naming.sitemap
===================================================================
category:transformers|componentName:ldap|componentClass:org.apache.cocoon.transformation.LDAPTransformer
1.1 xml-cocoon2/src/org/apache/cocoon/transformation/xt.sitemap
Index: xt.sitemap
===================================================================
category:transformers|componentName:xt|componentClass:org.apache.cocoon.transformation.XTTransformer
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
