You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2007/12/17 23:58:13 UTC
svn commit: r605033 - in
/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources:
COB-INF/modules/ META-INF/cocoon/avalon/
Author: vgritsenko
Date: Mon Dec 17 14:58:09 2007
New Revision: 605033
URL: http://svn.apache.org/viewvc?rev=605033&view=rev
Log:
show actual accessor in the 'accessor' column
Added:
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/avalon/cocoon-core-main-sample-modules-input.xconf (props changed)
- copied unchanged from r604031, cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/avalon/cocoon-core-additional-sample-modules-input.xconf
Removed:
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/avalon/cocoon-core-additional-sample-modules-input.xconf
Modified:
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/forrestconf.xml
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/menu2page.xsl
cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/sitemap.xmap
Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/forrestconf.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/forrestconf.xml?rev=605033&r1=605032&r2=605033&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/forrestconf.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/forrestconf.xml Mon Dec 17 14:58:09 2007
@@ -15,11 +15,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!--+
- | Demo file for XMLFileModule
- |
- | @version $Id$
- +-->
+
+<!--
+ - Demo file for XMLFileModule
+ -
+ - $Id$
+ -->
<forrestconf version="1.0">
<skin>forrest-site</skin>
<base-url>http://localhost:8787/cocoon</base-url>
Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/menu2page.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/menu2page.xsl?rev=605033&r1=605032&r2=605033&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/menu2page.xsl (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/menu2page.xsl Mon Dec 17 14:58:09 2007
@@ -42,7 +42,7 @@
<xsl:template match="menu-item[@desc]">
<tr>
<td><a href="{@href}"><xsl:value-of select="@label"/></a></td>
- <td><xsl:value-of select="@desc" /></td>
+ <td><xsl:value-of select="@desc"/></td>
</tr>
</xsl:template>
</xsl:stylesheet>
Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/sitemap.xmap?rev=605033&r1=605032&r2=605033&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/COB-INF/modules/sitemap.xmap Mon Dec 17 14:58:09 2007
@@ -109,41 +109,40 @@
<map:match pattern="content/request.xml">
<map:generate type="jx" src="properties.xml">
- <map:parameter name="attributeNames" value="{request:attributeNames}"/>
- <map:parameter name="authType" value="{request:authType}"/>
- <map:parameter name="characterEncoding" value="{request:characterEncoding}"/>
- <map:parameter name="cookieMap" value="{request:cookieMap}"/>
- <map:parameter name="cookies" value="{request:cookies}"/>
- <map:parameter name="contentLength" value="{request:contentLength}"/>
- <map:parameter name="contentType" value="{request:contentType}"/>
- <map:parameter name="contextPath" value="{request:contextPath}"/>
- <map:parameter name="headers" value="{request:headers}"/>
- <map:parameter name="headerNames" value="{request:headerNames}"/>
- <map:parameter name="locale" value="{request:locale}"/>
- <map:parameter name="locales" value="{request:locales}"/>
- <map:parameter name="method" value="{request:method}"/>
- <!--map:parameter name="parameter-map" value="{request:parameterMap}"/-->
- <map:parameter name="parameterNames" value="{request:parameterNames}"/>
- <map:parameter name="pathInfo" value="{request:pathInfo}"/>
- <map:parameter name="pathTranslated" value="{request:pathTranslated}"/>
- <map:parameter name="protocol" value="{request:protocol}"/>
- <map:parameter name="queryString" value="{request:queryString}"/>
- <map:parameter name="remoteAddr" value="{request:remoteAddr}"/>
- <map:parameter name="remoteHost" value="{request:remoteHost}"/>
- <map:parameter name="remoteUser" value="{request:remoteUser}"/>
- <map:parameter name="requestURI" value="{request:requestURI}"/>
- <map:parameter name="requestedSessionId" value="{request:requestedSessionId}"/>
- <map:parameter name="requestedSessionIdFromCookie" value="{request:requestedSessionIdFromCookie}"/>
- <map:parameter name="requestedSessionIdFromURL" value="{request:requestedSessionIdFromURL}"/>
- <map:parameter name="requestedSessionIdValid" value="{request:requestedSessionIdValid}"/>
- <map:parameter name="scheme" value="{request:scheme}"/>
- <map:parameter name="secure" value="{request:secure}"/>
- <map:parameter name="serverName" value="{request:serverName}"/>
- <map:parameter name="serverPort" value="{request:serverPort}"/>
- <map:parameter name="servletPath" value="{request:servletPath}"/>
- <map:parameter name="session [truncated]" value="{request:concat('org. ... .', substring(session, 36))}"/>
- <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
- <map:parameter name="userPrincipal" value="{request:userPrincipal}"/>
+ <map:parameter name="request:attributeNames" value="{request:attributeNames}"/>
+ <map:parameter name="request:authType" value="{request:authType}"/>
+ <map:parameter name="request:characterEncoding" value="{request:characterEncoding}"/>
+ <map:parameter name="request:cookieMap" value="{request:cookieMap}"/>
+ <map:parameter name="request:cookies" value="{request:cookies}"/>
+ <map:parameter name="request:contentLength" value="{request:contentLength}"/>
+ <map:parameter name="request:contentType" value="{request:contentType}"/>
+ <map:parameter name="request:contextPath" value="{request:contextPath}"/>
+ <map:parameter name="request:headers" value="{request:headers}"/>
+ <map:parameter name="request:headerNames" value="{request:headerNames}"/>
+ <map:parameter name="request:locale" value="{request:locale}"/>
+ <map:parameter name="request:locales" value="{request:locales}"/>
+ <map:parameter name="request:method" value="{request:method}"/>
+ <map:parameter name="request:parameterNames" value="{request:parameterNames}"/>
+ <map:parameter name="request:pathInfo" value="{request:pathInfo}"/>
+ <map:parameter name="request:pathTranslated" value="{request:pathTranslated}"/>
+ <map:parameter name="request:protocol" value="{request:protocol}"/>
+ <map:parameter name="request:queryString" value="{request:queryString}"/>
+ <map:parameter name="request:remoteAddr" value="{request:remoteAddr}"/>
+ <map:parameter name="request:remoteHost" value="{request:remoteHost}"/>
+ <map:parameter name="request:remoteUser" value="{request:remoteUser}"/>
+ <map:parameter name="request:requestURI" value="{request:requestURI}"/>
+ <map:parameter name="request:requestedSessionId" value="{request:requestedSessionId}"/>
+ <map:parameter name="request:requestedSessionIdFromCookie" value="{request:requestedSessionIdFromCookie}"/>
+ <map:parameter name="request:requestedSessionIdFromURL" value="{request:requestedSessionIdFromURL}"/>
+ <map:parameter name="request:requestedSessionIdValid" value="{request:requestedSessionIdValid}"/>
+ <map:parameter name="request:scheme" value="{request:scheme}"/>
+ <map:parameter name="request:secure" value="{request:secure}"/>
+ <map:parameter name="request:serverName" value="{request:serverName}"/>
+ <map:parameter name="request:serverPort" value="{request:serverPort}"/>
+ <map:parameter name="request:servletPath" value="{request:servletPath}"/>
+ <!--<map:parameter name="session [truncated]" value="{request:concat('org. ... .', substring(session, 36))}"/>-->
+ <map:parameter name="request:sitemapURI" value="{request:sitemapURI}"/>
+ <map:parameter name="request:userPrincipal" value="{request:userPrincipal}"/>
</map:generate>
<map:transform src="properties2page.xsl">
<map:parameter name="title" value="Request Input Module (RequestModule)"/>
@@ -153,8 +152,8 @@
<map:match pattern="content/baselink.xml">
<map:generate type="jx" src="properties.xml">
- <map:parameter name="sitemapAsBase" value="{baselink:SitemapBaseLink}"/>
- <map:parameter name="requestAsBase" value="{baselink:RequestBaseLink}"/>
+ <map:parameter name="baselink:SitemapBaseLink" value="{baselink:SitemapBaseLink}"/>
+ <map:parameter name="baselink:RequestBaseLink" value="{baselink:RequestBaseLink}"/>
</map:generate>
<map:transform src="properties2page.xsl">
<map:parameter name="title" value="BaseLink Input Module (BaseLinkModule)"/>
@@ -168,8 +167,8 @@
<map:match pattern="content/requestparam.xml">
<map:generate type="jx" src="properties.xml">
- <map:parameter name="foo" value="{request-param:foo}"/>
- <map:parameter name="bar" value="{request-param:bar}"/>
+ <map:parameter name="request-param:foo" value="{request-param:foo}"/>
+ <map:parameter name="request-param:bar" value="{request-param:bar}"/>
</map:generate>
<map:transform src="properties2page.xsl">
<map:parameter name="title" value="Request Parameter Input Module (RequestParameterModule)"/>
@@ -182,12 +181,12 @@
<map:match pattern="content/session.xml">
<map:generate type="jx" src="properties.xml">
- <map:parameter name="attributeNames" value="{session:attributeNames}"/>
- <map:parameter name="creationTime" value="{session:creationTime}"/>
- <map:parameter name="lastAccessedTime" value="{session:lastAccessedTime}"/>
- <map:parameter name="maxInactiveInterval" value="{session:maxInactiveInterval}"/>
- <map:parameter name="id" value="{session:id}"/>
- <map:parameter name="new" value="{session:new}"/>
+ <map:parameter name="session:attributeNames" value="{session:attributeNames}"/>
+ <map:parameter name="session:creationTime" value="{session:creationTime}"/>
+ <map:parameter name="session:lastAccessedTime" value="{session:lastAccessedTime}"/>
+ <map:parameter name="session:maxInactiveInterval" value="{session:maxInactiveInterval}"/>
+ <map:parameter name="session:id" value="{session:id}"/>
+ <map:parameter name="session:new" value="{session:new}"/>
</map:generate>
<map:transform src="properties2page.xsl">
<map:parameter name="title" value="Session Input Module (SessionModule)"/>
@@ -198,33 +197,33 @@
<map:match pattern="content/system-property.xml">
<map:generate type="jx" src="properties.xml">
- <map:parameter name="java.version" value="{system-property:java.version}"/>
- <map:parameter name="java.vendor" value="{system-property:java.vendor}"/>
- <map:parameter name="java.vendor.url" value="{system-property:java.vendor.url}"/>
- <map:parameter name="java.home" value="{system-property:java.home}"/>
- <map:parameter name="java.vm.specification.version" value="{system-property:java.vm.specification.version}"/>
- <map:parameter name="java.vm.specification.vendor" value="{system-property:java.vm.specification.vendor}"/>
- <map:parameter name="java.vm.specification.name" value="{system-property:java.vm.specification.name}"/>
- <map:parameter name="java.vm.version" value="{system-property:java.vm.version}"/>
- <map:parameter name="java.vm.vendor" value="{system-property:java.vm.vendor}"/>
- <map:parameter name="java.vm.name" value="{system-property:java.vm.name}"/>
- <map:parameter name="java.specification.version" value="{system-property:java.specification.version}"/>
- <map:parameter name="java.specification.vendor" value="{system-property:java.specification.vendor}"/>
- <map:parameter name="java.specification.name" value="{system-property:java.specification.name}"/>
- <map:parameter name="java.specification.name" value="{system-property:java.specification.name}"/>
- <map:parameter name="java.class.path" value="{system-property:java.class.path}"/>
- <map:parameter name="java.ext.dirs" value="{system-property:java.ext.dirs}"/>
- <map:parameter name="os.name" value="{system-property:os.name}"/>
- <map:parameter name="os.arch" value="{system-property:os.arch}"/>
- <map:parameter name="os.version" value="{system-property:os.version}"/>
- <map:parameter name="file.separator" value="{system-property:file.separator}"/>
- <map:parameter name="path.separator" value="{system-property:path.separator}"/>
- <map:parameter name="line.separator" value="{system-property:line.separator}"/>
- <map:parameter name="user.name" value="{system-property:user.name}"/>
- <map:parameter name="user.home" value="{system-property:user.home}"/>
- <map:parameter name="user.dir" value="{system-property:user.dir}"/>
+ <map:parameter name="system-property:java.version" value="{system-property:java.version}"/>
+ <map:parameter name="system-property:java.vendor" value="{system-property:java.vendor}"/>
+ <map:parameter name="system-property:java.vendor.url" value="{system-property:java.vendor.url}"/>
+ <map:parameter name="system-property:java.home" value="{system-property:java.home}"/>
+ <map:parameter name="system-property:java.vm.specification.version" value="{system-property:java.vm.specification.version}"/>
+ <map:parameter name="system-property:java.vm.specification.vendor" value="{system-property:java.vm.specification.vendor}"/>
+ <map:parameter name="system-property:java.vm.specification.name" value="{system-property:java.vm.specification.name}"/>
+ <map:parameter name="system-property:java.vm.version" value="{system-property:java.vm.version}"/>
+ <map:parameter name="system-property:java.vm.vendor" value="{system-property:java.vm.vendor}"/>
+ <map:parameter name="system-property:java.vm.name" value="{system-property:java.vm.name}"/>
+ <map:parameter name="system-property:java.specification.version" value="{system-property:java.specification.version}"/>
+ <map:parameter name="system-property:java.specification.vendor" value="{system-property:java.specification.vendor}"/>
+ <map:parameter name="system-property:java.specification.name" value="{system-property:java.specification.name}"/>
+ <map:parameter name="system-property:java.specification.name" value="{system-property:java.specification.name}"/>
+ <map:parameter name="system-property:java.class.path" value="{system-property:java.class.path}"/>
+ <map:parameter name="system-property:java.ext.dirs" value="{system-property:java.ext.dirs}"/>
+ <map:parameter name="system-property:os.name" value="{system-property:os.name}"/>
+ <map:parameter name="system-property:os.arch" value="{system-property:os.arch}"/>
+ <map:parameter name="system-property:os.version" value="{system-property:os.version}"/>
+ <map:parameter name="system-property:file.separator" value="{system-property:file.separator}"/>
+ <map:parameter name="system-property:path.separator" value="{system-property:path.separator}"/>
+ <map:parameter name="system-property:line.separator" value="{system-property:line.separator}"/>
+ <map:parameter name="system-property:user.name" value="{system-property:user.name}"/>
+ <map:parameter name="system-property:user.home" value="{system-property:user.home}"/>
+ <map:parameter name="system-property:user.dir" value="{system-property:user.dir}"/>
<!-- Function call -->
- <map:parameter name="users-home-base" value="{system-property:substring-before(user.home, user.name)}"/>
+ <map:parameter name="system-property:substring-before(user.home, user.name)" value="{system-property:substring-before(user.home, user.name)}"/>
</map:generate>
<map:transform src="properties2page.xsl">
<map:parameter name="title" value="System Properties Input Module (SystemPropertiesModule)"/>
@@ -234,9 +233,9 @@
<map:match pattern="content/xml.xml">
<map:generate type="jx" src="properties.xml">
- <map:parameter name="/forrestconf/@version" value="{myxml:/forrestconf/@version}"/>
- <map:parameter name="/forrestconf/skin" value="{myxml:/forrestconf/skin}"/>
- <map:parameter name="/*/base-url" value="{myxml:/*/base-url}"/>
+ <map:parameter name="myxml:/forrestconf/@version" value="{myxml:/forrestconf/@version}"/>
+ <map:parameter name="myxml:/forrestconf/skin" value="{myxml:/forrestconf/skin}"/>
+ <map:parameter name="myxml:/*/base-url" value="{myxml:/*/base-url}"/>
<!--
<map:parameter name="slashdot-headline" value="{slashdot:/*:RDF/item[1]/title}"/>
-->
@@ -252,8 +251,8 @@
<map:match pattern="content/defaults.xml">
<map:generate type="jx" src="properties.xml">
- <map:parameter name="skin" value="{defaults:skin}"/>
- <map:parameter name="base-url" value="{defaults:base-url}"/>
+ <map:parameter name="defaults:skin" value="{defaults:skin}"/>
+ <map:parameter name="defaults:base-url" value="{defaults:base-url}"/>
</map:generate>
<map:transform src="properties2page.xsl">
<map:parameter name="title" value="Defaults Input Module (DefaultsModule)"/>
@@ -266,7 +265,7 @@
<map:match pattern="content/chain.xml">
<map:generate type="jx" src="properties.xml">
- <map:parameter name="skin" value="{chain:skin}"/>
+ <map:parameter name="chain:skin" value="{chain:skin}"/>
</map:generate>
<map:transform src="properties2page.xsl">
<map:parameter name="title" value="Chaining Input module (ChainMetaModule)"/>
@@ -283,7 +282,7 @@
<map:match pattern="content/cookie.xml">
<map:act type="cookie-locale"/>
<map:generate type="jx" src="properties.xml">
- <map:parameter name="locale" value="{cookie:locale}"/>
+ <map:parameter name="cookie:locale" value="{cookie:locale}"/>
</map:generate>
<map:transform src="properties2page.xsl">
<map:parameter name="title" value="Cookie module (CookieModule)"/>
@@ -298,8 +297,8 @@
<map:match pattern="content/date.xml">
<map:generate type="jx" src="properties.xml">
- <map:parameter name="format-in-cocoon.xconf" value="{date:date}"/>
- <map:parameter name="format-inline" value="{date:MMM d, yyyy}"/>
+ <map:parameter name="date:date" value="{date:date}"/>
+ <map:parameter name="date:MMM d, yyyy" value="{date:MMM d, yyyy}"/>
</map:generate>
<map:transform src="properties2page.xsl">
<map:parameter name="title" value="Date Input module (DateMetaModule)"/>
@@ -312,7 +311,7 @@
<map:match pattern="content/session-attr.xml">
<map:generate type="jx" src="properties.xml">
- <map:parameter name="fruit" value="{session-attr:fruit}"/>
+ <map:parameter name="session-attr:fruit" value="{session-attr:fruit}"/>
</map:generate>
<map:transform src="properties2page.xsl">
<map:parameter name="title" value="Session Attribute Input Module (SessionAttributeModule)"/>
@@ -324,9 +323,9 @@
<map:match pattern="content/randomnumber.xml">
<map:generate type="jx" src="properties.xml">
- <map:parameter name="default" value="{random:x}"/>
- <map:parameter name="from 100 to 500" value="{random-100-to-500:y}"/>
- <map:parameter name="from 5000 to 10000" value="{random-5000-to-10000:z}"/>
+ <map:parameter name="random:x" value="{random:x}"/>
+ <map:parameter name="random-100-to-500:y" value="{random-100-to-500:y}"/>
+ <map:parameter name="random-5000-to-10000:z" value="{random-5000-to-10000:z}"/>
</map:generate>
<map:transform src="properties2page.xsl">
<map:parameter name="title" value="Random number module (RandomNumberModule)"/>
@@ -338,9 +337,9 @@
<map:match pattern="content/realpath.xml">
<map:generate type="jx" src="properties.xml">
- <map:parameter name="/" value="{realpath:/}"/>
- <map:parameter name="/images" value="{realpath:/images}"/>
- <map:parameter name="/WEB-INF" value="{realpath:/WEB-INF}"/>
+ <map:parameter name="realpath:/" value="{realpath:/}"/>
+ <map:parameter name="realpath:/images" value="{realpath:/images}"/>
+ <map:parameter name="realpath:/WEB-INF" value="{realpath:/WEB-INF}"/>
</map:generate>
<map:transform src="properties2page.xsl">
<map:parameter name="title" value="RealPath Module (RealPathModule)"/>
@@ -352,12 +351,12 @@
<map:match pattern="content/properties.xml">
<map:generate type="jx" src="properties.xml">
- <map:parameter name="name" value="{cocoon-properties:name}"/>
- <map:parameter name="Name" value="{cocoon-properties:Name}"/>
- <map:parameter name="fullname" value="{cocoon-properties:fullname}"/>
- <map:parameter name="version" value="{cocoon-properties:version}"/>
- <map:parameter name="released.version" value="{cocoon-properties:released.version}"/>
- <map:parameter name="year" value="{cocoon-properties:year}"/>
+ <map:parameter name="cocoon-properties:name" value="{cocoon-properties:name}"/>
+ <map:parameter name="cocoon-properties:Name" value="{cocoon-properties:Name}"/>
+ <map:parameter name="cocoon-properties:fullname" value="{cocoon-properties:fullname}"/>
+ <map:parameter name="cocoon-properties:version" value="{cocoon-properties:version}"/>
+ <map:parameter name="cocoon-properties:released.version" value="{cocoon-properties:released.version}"/>
+ <map:parameter name="cocoon-properties:year" value="{cocoon-properties:year}"/>
</map:generate>
<map:transform src="properties2page.xsl">
<map:parameter name="title" value="Properties File Module (PropertiesFileModule)"/>
@@ -370,8 +369,8 @@
<map:match pattern="content/url-encode.xml">
<map:generate type="jx" src="properties.xml">
- <map:parameter name="foo bar" value="{url-encode:foo bar}"/>
- <map:parameter name="foo/bar" value="{url-encode:foo/bar}"/>
+ <map:parameter name="url-encode:foo bar" value="{url-encode:foo bar}"/>
+ <map:parameter name="url-encode:foo/bar" value="{url-encode:foo/bar}"/>
</map:generate>
<map:transform src="properties2page.xsl">
<map:parameter name="title" value="URL Encoding Module (URLEncodeModule)"/>
@@ -383,8 +382,8 @@
<map:match pattern="content/url-decode.xml">
<map:generate type="jx" src="properties.xml">
- <map:parameter name="foo%20bar" value="{url-decode:foo%20bar}"/>
- <map:parameter name="foo%2Fbar" value="{url-decode:foo%2Fbar}"/>
+ <map:parameter name="url-decode:foo%20bar" value="{url-decode:foo%20bar}"/>
+ <map:parameter name="url-decode:foo%2Fbar" value="{url-decode:foo%2Fbar}"/>
</map:generate>
<map:transform src="properties2page.xsl">
<map:parameter name="title" value="URL Decoding Module (URLDecodeModule)"/>
@@ -396,7 +395,7 @@
<map:match pattern="content/naming.xml">
<map:generate type="jx" src="properties.xml">
- <map:parameter name="java:comp/env/greeting" value="{naming:java:comp/env/greeting}"/>
+ <map:parameter name="naming:java:comp/env/greeting" value="{naming:java:comp/env/greeting}"/>
</map:generate>
<map:transform src="properties2page.xsl">
<map:parameter name="title" value="Naming Module (NamingInputModule)"/>
@@ -409,9 +408,9 @@
<map:match pattern="content/global.xml">
<map:generate type="jx" src="properties.xml">
- <map:parameter name="global-sitemap" value="{global:global-sitemap}"/>
- <map:parameter name="global-sub-sitemap" value="{global:global-sub-sitemap}"/>
- <map:parameter name="global-sitemap-override" value="{global:global-sitemap-override}"/>
+ <map:parameter name="global:global-sitemap" value="{global:global-sitemap}"/>
+ <map:parameter name="global:global-sub-sitemap" value="{global:global-sub-sitemap}"/>
+ <map:parameter name="global:global-sitemap-override" value="{global:global-sitemap-override}"/>
</map:generate>
<map:transform src="properties2page.xsl">
<map:parameter name="title" value="Global Input Module (GlobalInputModule)"/>
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/avalon/cocoon-core-main-sample-modules-input.xconf
------------------------------------------------------------------------------
eol:style = 'native'
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/avalon/cocoon-core-main-sample-modules-input.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-main-sample/src/main/resources/META-INF/cocoon/avalon/cocoon-core-main-sample-modules-input.xconf
------------------------------------------------------------------------------
svn:keywords = Id Revision Author Date