cziegeler 01/09/19 01:33:07
Modified: . build.xml
webapp sitemap.xmap
webapp/WEB-INF web.xml
Log:
ParentCM is now optional, javax.naming package is not required anymore, making C2
jdk1.2 compilable
Revision Changes Path
1.60 +10 -0 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- build.xml 2001/09/10 12:39:38 1.59
+++ build.xml 2001/09/19 08:33:07 1.60
@@ -101,6 +101,9 @@
- 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"/>
@@ -316,6 +319,7 @@
<exclude name="**/JSPEngineImplWLS.java" unless="weblogic.present"/>
<exclude name="**/XMLDB*.java" unless="xmldb.present"/>
<exclude name="**/browser/*.x*"/>
+ <exclude name="**/samples/parentcm/*.java" unless="naming.present"/>
</fileset>
</copy>
</target>
@@ -625,6 +629,12 @@
<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>
1.52 +0 -1 xml-cocoon2/webapp/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/sitemap.xmap,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sitemap.xmap 2001/09/18 14:47:00 1.51
+++ sitemap.xmap 2001/09/19 08:33:07 1.52
@@ -19,7 +19,6 @@
<map:generator name="velocity"
src="org.apache.cocoon.generation.VelocityGenerator"/>
<map:generator name="jsp"
src="org.apache.cocoon.generation.JspGenerator"/>
<map:generator name="stream"
src="org.apache.cocoon.generation.StreamGenerator"/>
- <map:generator name="parentcm"
src="org.apache.cocoon.samples.parentcm.Generator"/>
</map:generators>
<map:transformers default="xslt">
1.14 +4 -3 xml-cocoon2/webapp/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/WEB-INF/web.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- web.xml 2001/09/06 20:56:21 1.13
+++ web.xml 2001/09/19 08:33:07 1.14
@@ -116,8 +116,9 @@
<!-- For Database Driver: -->
@database-driver@
- <!-- For parent ComponentManager sample: -->
+ <!-- For parent ComponentManager sample:
org.apache.cocoon.samples.parentcm.Configurator
+ -->
</param-value>
</init-param>
@@ -180,14 +181,14 @@
Cocoon honors the Loggable and Initializable interfaces for this class,
if it implements them.
- Currently the parent CM is set to the Parent CM sample, which will look up
+ If you uncomment the following lines the parent CM is set to the Parent CM
sample, which will look up
a configuration via JNDI at
org/apache/cocoon/samples/parentcm/ParentCMConfiguration
and use it.
- -->
<init-param>
<param-name>parent-component-manager</param-name>
<param-value>org.apache.cocoon.samples.parentcm.ParentComponentManager/org/apache/cocoon/samples/parentcm/ParentCMConfiguration</param-value>
</init-param>
+ -->
<!--
This parameter allows you to startup Cocoon2 immediately after startup
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
