dims 01/09/06 13:56:33
Modified: . Tag: cocoon_20_branch build.xml
webapp Tag: cocoon_20_branch sitemap.xmap
webapp/WEB-INF Tag: cocoon_20_branch web.xml
webapp/docs/samples Tag: cocoon_20_branch samples.xml
xdocs Tag: cocoon_20_branch docs-book.xml site-book.xml
Added: src/org/apache/cocoon/samples/parentcm Tag: cocoon_20_branch
Configurator.java Generator.java
ParentComponentManager.java Time.java
TimeComponent.java
webapp/stylesheets/parentcm Tag: cocoon_20_branch time.xsl
xdocs Tag: cocoon_20_branch parent-component-manager.xml
Removed: src/org/apache/cocoon/components Tag: cocoon_20_branch
ParentComponentManager.java
Log:
Patch for "[Patch][Update] Parent Component Manager - updated documentation"
from "Leo Sutic" <[EMAIL PROTECTED]>
Revision Changes Path
No revision
No revision
1.8.2.33 +7 -2 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.8.2.32
retrieving revision 1.8.2.33
diff -u -r1.8.2.32 -r1.8.2.33
--- build.xml 2001/09/06 17:15:41 1.8.2.32
+++ build.xml 2001/09/06 20:56:32 1.8.2.33
@@ -413,16 +413,21 @@
<!-- =================================================================== -->
<target name="package" depends="compile" description="Generates the jar package">
<jar jarfile="${build.dir}/${name}.jar" manifest="${build.src}/Manifest.mf">
- <fileset dir="${build.dest}" includes="org/**"/>
+ <fileset dir="${build.dest}" includes="org/**"
excludes="org/apache/cocoon/samples/**"/>
</jar>
</target>
<!-- =================================================================== -->
<!-- Copies the webapp directories -->
<!-- =================================================================== -->
- <target name="copy-webapp" depends="prepare">
+ <target name="copy-webapp" depends="prepare,compile">
<mkdir dir="${build.war}"/>
+ <mkdir dir="${build.war}/WEB-INF/classes"/>
+ <copy todir="${build.war}/WEB-INF/classes" filtering="off">
+ <fileset dir="${build.dest}" includes="org/apache/cocoon/samples/**"/>
+ </copy>
+
<copy todir="${build.war}" filtering="on">
<fileset dir="${webapp.dir}">
<exclude name="**/*.gif"/>
No revision
No revision
1.1.2.1 +0 -0
xml-cocoon2/src/org/apache/cocoon/samples/parentcm/Configurator.java
Index: Configurator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/samples/parentcm/Configurator.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0
xml-cocoon2/src/org/apache/cocoon/samples/parentcm/Generator.java
Index: Generator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/samples/parentcm/Generator.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0
xml-cocoon2/src/org/apache/cocoon/samples/parentcm/ParentComponentManager.java
Index: ParentComponentManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/samples/parentcm/ParentComponentManager.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 xml-cocoon2/src/org/apache/cocoon/samples/parentcm/Time.java
Index: Time.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/samples/parentcm/Time.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0
xml-cocoon2/src/org/apache/cocoon/samples/parentcm/TimeComponent.java
Index: TimeComponent.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/samples/parentcm/TimeComponent.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
No revision
No revision
1.11.2.33 +23 -15 xml-cocoon2/webapp/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/sitemap.xmap,v
retrieving revision 1.11.2.32
retrieving revision 1.11.2.33
diff -u -r1.11.2.32 -r1.11.2.33
--- sitemap.xmap 2001/09/06 14:19:20 1.11.2.32
+++ sitemap.xmap 2001/09/06 20:56:33 1.11.2.33
@@ -19,6 +19,7 @@
<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">
@@ -542,7 +543,7 @@
<map:act type="form-validator">
<map:parameter name="descriptor"
value="context:///docs/samples/formvalidation/descriptor.xml"/>
<map:parameter name="validate-set" value="car-reservation"/>
- <map:redirect-to resource="dynamic-page"
target="docs/samples/formvalidation/OK"/>
+ <map:redirect-to resource="dynamic-page"
target="docs/samples/formvalidation/OK"/>
</map:act>
<map:redirect-to resource="dynamic-page"
target="docs/samples/formvalidation/ERROR"/>
</map:match>
@@ -568,22 +569,22 @@
<map:act type="session-isvalid">
<map:match type="sessionstate" pattern="1">
- <map:match type="next-page" pattern="1">
- <map:redirect-to resource="dynamic-page1"
target="docs/samples/session-state"/>
- </map:match>
- <map:match type="next-page" pattern="2">
- <map:redirect-to resource="dynamic-page1"
target="docs/samples/session-state"/>
- </map:match>
- </map:match>
+ <map:match type="next-page" pattern="1">
+ <map:redirect-to resource="dynamic-page1"
target="docs/samples/session-state"/>
+ </map:match>
+ <map:match type="next-page" pattern="2">
+ <map:redirect-to resource="dynamic-page1"
target="docs/samples/session-state"/>
+ </map:match>
+ </map:match>
<map:match type="sessionstate" pattern="2">
- <map:match type="next-page" pattern="1">
- <map:redirect-to resource="dynamic-page1"
target="docs/samples/session-state"/>
- </map:match>
- <map:match type="next-page" pattern="2">
- <map:redirect-to resource="dynamic-page1"
target="docs/samples/session-state"/>
- </map:match>
- </map:match>
+ <map:match type="next-page" pattern="1">
+ <map:redirect-to resource="dynamic-page1"
target="docs/samples/session-state"/>
+ </map:match>
+ <map:match type="next-page" pattern="2">
+ <map:redirect-to resource="dynamic-page1"
target="docs/samples/session-state"/>
+ </map:match>
+ </map:match>
<map:redirect-to resource="dynamic-page2"
target="docs/samples/session-state/state0"/>
</map:act>
@@ -635,6 +636,13 @@
</map:generate>
<map:transform src="stylesheets/news/news.xsl"/>
<map:serialize type="html"/>
+ </map:match>
+
+ <!-- ========================= Parent Component Manager
================================ -->
+ <map:match pattern="parentcm">
+ <map:generate type="parentcm" src="{1}"/>
+ <map:transform src="stylesheets/parentcm/time.xsl"/>
+ <map:serialize/>
</map:match>
<!-- ========================= Server ================================ -->
No revision
No revision
1.1.1.1.2.9 +8 -1 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.1.1.1.2.8
retrieving revision 1.1.1.1.2.9
diff -u -r1.1.1.1.2.8 -r1.1.1.1.2.9
--- web.xml 2001/09/05 22:18:16 1.1.1.1.2.8
+++ web.xml 2001/09/06 20:56:33 1.1.1.1.2.9
@@ -115,6 +115,9 @@
<!-- For Database Driver: -->
@database-driver@
+
+ <!-- For parent ComponentManager sample: -->
+ org.apache.cocoon.samples.parentcm.Configurator
</param-value>
</init-param>
@@ -176,10 +179,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
+ 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.components.ParentComponentManager/InitParameter</param-value>
+
<param-value>org.apache.cocoon.samples.parentcm.ParentComponentManager/org/apache/cocoon/samples/parentcm/ParentCMConfiguration</param-value>
</init-param>
<!--
No revision
No revision
1.3.2.8 +13 -8 xml-cocoon2/webapp/docs/samples/samples.xml
Index: samples.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/docs/samples/samples.xml,v
retrieving revision 1.3.2.7
retrieving revision 1.3.2.8
diff -u -r1.3.2.7 -r1.3.2.8
--- samples.xml 2001/09/05 22:18:16 1.3.2.7
+++ samples.xml 2001/09/06 20:56:33 1.3.2.8
@@ -76,11 +76,11 @@
Example of complex XSLT usage.
</sample>
<sample name="SVG welcome page" href="welcome-svg">
- A version of this page rendered as a series of SVG
- images embedded within an HTML page. This example
- uses the 'fragment extractor' transformer and generator
- to automatically extract the images and feed them through
- a separate pipeline.
+ A version of this page rendered as a series of SVG
+ images embedded within an HTML page. This example
+ uses the 'fragment extractor' transformer and generator
+ to automatically extract the images and feed them through
+ a separate pipeline.
</sample>
<sample name="sub sitemap" href="sub/welcome">
Example of a page served by a sub sitemap.
@@ -133,13 +133,18 @@
<sample name="Yahoo Screen Scrape" href="yahoo">
An example of HTML Generator scraping a part of the Yahoo main page.
</sample>
+ <sample name="Parent Component Manager" href="parentcm">
+ An example showing the use of a parent component manager. For this sample to
work,
+ Cocoon2 must have been built with the include.webapp.libs flag set to true.
(Otherwise
+ the sample classes are not found.)
+ </sample>
</group>
<group name="Web Applications">
<sample name="Protected Area" href="protected/login">
- An example web-application built around db-authenticator,
- form-validator, session-validator and session-invalidator
- actions.
+ An example web-application built around db-authenticator,
+ form-validator, session-validator and session-invalidator
+ actions.
</sample>
</group>
No revision
No revision
1.1.2.1 +0 -0 xml-cocoon2/webapp/stylesheets/parentcm/time.xsl
Index: time.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/stylesheets/parentcm/time.xsl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
No revision
No revision
1.3.2.21 +1 -0 xml-cocoon2/xdocs/docs-book.xml
Index: docs-book.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/xdocs/docs-book.xml,v
retrieving revision 1.3.2.20
retrieving revision 1.3.2.21
diff -u -r1.3.2.20 -r1.3.2.21
--- docs-book.xml 2001/09/05 22:18:18 1.3.2.20
+++ docs-book.xml 2001/09/06 20:56:33 1.3.2.21
@@ -70,6 +70,7 @@
<page id="datasources" label="Using Databases" source="datasources.xml"/>
<page id="extending" label="Extending C2" source="extending.xml"/>
<page id="avalon" label="Avalon" source="avalon.xml"/>
+ <page id="parent-component-manager" label="Parent CM"
source="parent-component-manager.xml"/>
<page id="i18n" label="Internationalization" source="i18n-transformer.xml"/>
<separator/>
<page id="xsp" label="XSP" source="xsp.xml"/>
1.3.2.23 +1 -0 xml-cocoon2/xdocs/site-book.xml
Index: site-book.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/xdocs/site-book.xml,v
retrieving revision 1.3.2.22
retrieving revision 1.3.2.23
diff -u -r1.3.2.22 -r1.3.2.23
--- site-book.xml 2001/09/05 22:18:18 1.3.2.22
+++ site-book.xml 2001/09/06 20:56:33 1.3.2.23
@@ -73,6 +73,7 @@
<page id="datasources" label="Using Databases" source="datasources.xml"/>
<page id="extending" label="Extending C2" source="extending.xml"/>
<page id="avalon" label="Avalon" source="avalon.xml"/>
+ <page id="parent-component-manager" label="Parent CM"
source="parent-component-manager.xml"/>
<page id="i18n" label="Internationalization" source="i18n-transformer.xml"/>
<separator/>
<page id="xsp" label="XSP" source="xsp.xml"/>
No revision
No revision
1.1.2.1 +0 -0 xml-cocoon2/xdocs/parent-component-manager.xml
Index: parent-component-manager.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/xdocs/parent-component-manager.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
