You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2008/03/28 17:36:04 UTC
svn commit: r642285 - in
/cocoon/trunk/blocks/cocoon-template/cocoon-template-sample: ./
src/main/resources/COB-INF/ src/main/resources/COB-INF/it/
Author: reinhard
Date: Fri Mar 28 09:35:52 2008
New Revision: 642285
URL: http://svn.apache.org/viewvc?rev=642285&view=rev
Log:
. Testcase for COCOON-2187
. SVN ignore
Added:
cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/it/
cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/it/parameter-from-sitemap-with-import.jx (with props)
cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/it/parameter-from-sitemap.jx (with props)
Modified:
cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/ (props changed)
cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/sitemap.xmap
Propchange: cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Mar 28 09:35:52 2008
@@ -1,5 +1,7 @@
-target
-*.iml
-.classpath
-.project
-.settings
+target
+*.iml
+.classpath
+.project
+.settings
+.externalToolBuilders
+maven-eclipse.xml
Added: cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/it/parameter-from-sitemap-with-import.jx
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/it/parameter-from-sitemap-with-import.jx?rev=642285&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/it/parameter-from-sitemap-with-import.jx (added)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/it/parameter-from-sitemap-with-import.jx Fri Mar 28 09:35:52 2008
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<page xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+ <p1>
+ <jx:import uri="servlet:/it/${cocoon.parameters.doc}"/>
+ </p1>
+ <p2>${cocoon.parameters.doc}</p2>
+</page>
+
Propchange: cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/it/parameter-from-sitemap-with-import.jx
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/it/parameter-from-sitemap-with-import.jx
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/it/parameter-from-sitemap-with-import.jx
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/it/parameter-from-sitemap.jx
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/it/parameter-from-sitemap.jx?rev=642285&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/it/parameter-from-sitemap.jx (added)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/it/parameter-from-sitemap.jx Fri Mar 28 09:35:52 2008
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<parameters>
+ <parameter name="abc">${cocoon.parameters.abc}</parameter>
+</parameters>
Propchange: cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/it/parameter-from-sitemap.jx
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/it/parameter-from-sitemap.jx
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/it/parameter-from-sitemap.jx
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/sitemap.xmap?rev=642285&r1=642284&r2=642285&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-sample/src/main/resources/COB-INF/sitemap.xmap Fri Mar 28 09:35:52 2008
@@ -73,5 +73,20 @@
</map:serialize>
</map:match>
</map:pipeline>
+
+ <map:pipeline>
+ <map:match pattern="it/parameter-from-sitemap">
+ <map:generate src="it/parameter-from-sitemap.jx" type="jx">
+ <map:parameter name="abc" value="123" />
+ </map:generate>
+ <map:serialize type="xml" />
+ </map:match>
+ <map:match pattern="it/parameter-from-sitemap-with-import">
+ <map:generate src="it/parameter-from-sitemap-with-import.jx" type="jx">
+ <map:parameter name="doc" value="parameter-from-sitemap" />
+ </map:generate>
+ <map:serialize type="xml" />
+ </map:match>
+ </map:pipeline>
</map:pipelines>
</map:sitemap>