cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r410131 - in /cocoon/trunk/blocks: cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/ cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/modules/ coc...
Date Mon, 29 May 2006 17:48:18 GMT
Author: cziegeler
Date: Mon May 29 10:48:16 2006
New Revision: 410131

URL: http://svn.apache.org/viewvc?rev=410131&view=rev
Log:
Use new property and configuration mechanism

Added:
    cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/modules/properties/
    cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/modules/properties/variables.properties
  (with props)
    cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/properties/
    cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/properties/variables.properties
  (with props)
    cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/properties/
    cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/properties/variables.properties
  (with props)
    cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/src/main/resources/COB-INF/properties/
    cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/src/main/resources/COB-INF/properties/variables.properties
  (with props)
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/davmap/properties/
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/davmap/properties/variables.properties
  (with props)
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/flowsample/properties/
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/flowsample/properties/variables.properties
  (with props)
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step1/properties/
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step1/properties/variables.properties
  (with props)
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step2/properties/
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step2/properties/variables.properties
  (with props)
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step3/properties/
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step3/properties/variables.properties
  (with props)
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step4/properties/
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step4/properties/variables.properties
  (with props)
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step5/properties/
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step5/properties/variables.properties
  (with props)
Modified:
    cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/modules/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/davmap/sitemap.xmap
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/flowsample/sitemap.xmap
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step1/sitemap.xmap
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step2/sitemap.xmap
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step3/sitemap.xmap
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step4/sitemap.xmap
    cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step5/sitemap.xmap

Added: cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/modules/properties/variables.properties
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/modules/properties/variables.properties?rev=410131&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/modules/properties/variables.properties
(added)
+++ cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/modules/properties/variables.properties
Mon May 29 10:48:16 2006
@@ -0,0 +1,18 @@
+#  Copyright 2006 The Apache Software Foundation
+#
+#  Licensed 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.
+#
+
+# (Re)Define global parameters, used in the input modules demo.
+global-sub-sitemap=This value is defined in the samples/modules/sitemap.xmap
+global-sitemap-override=This value was defined in the samples/sitemap.xmap, but was overridden
by samples/modules/sitemap.xmap

Propchange: cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/modules/properties/variables.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/modules/properties/variables.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/modules/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/modules/sitemap.xmap?rev=410131&r1=410130&r2=410131&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/modules/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/modules/sitemap.xmap
Mon May 29 10:48:16 2006
@@ -23,7 +23,7 @@
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
   <!-- =========================== Components ============================== -->
-  <map:components>
+  <map:components property-dir="properties">
     <map:actions>
       <!-- Action to store locale name as cookie. -->
       <map:action name="cookie-locale" src="org.apache.cocoon.acting.LocaleAction">
@@ -49,16 +49,6 @@
 
   <!-- =========================== Pipelines ================================= -->
   <map:pipelines>
-         <!--+
-             | (Re)Define global parameters, used in the input modules GlobalInputModule
demo.
-    <map:component-configurations>
-      <global-variables>
-         <global-sub-sitemap>This value is defined in the samples/modules/sitemap.xmap</global-sub-sitemap>
-         <global-sitemap-override>This value was defined in the samples/sitemap.xmap,
but was overridden by samples/modules/sitemap.xmap</global-sitemap-override>
-      </global-variables>
-    </map:component-configurations>
-             +-->
-
     <map:pipeline>
 
       <!-- Default URL matcher. Matches '/' URLs-->

Added: cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/properties/variables.properties
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/properties/variables.properties?rev=410131&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/properties/variables.properties
(added)
+++ cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/properties/variables.properties
Mon May 29 10:48:16 2006
@@ -0,0 +1,18 @@
+#  Copyright 2006 The Apache Software Foundation
+#
+#  Licensed 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.
+#
+
+# Define global parameters, used in the input modules demo.
+global-sitemap=This value is defined in the samples/sitemap.xmap
+global-sitemap-override=This value is defined in the samples/sitemap.xmap, should be overridden
by samples/modules/sitemap.xmap

Propchange: cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/properties/variables.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/properties/variables.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/sitemap.xmap?rev=410131&r1=410130&r2=410131&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-sample/src/main/resources/COB-INF/sitemap.xmap
Mon May 29 10:48:16 2006
@@ -21,7 +21,7 @@
 
   <!-- ========================= Components ================================ -->
 
-  <map:components>
+  <map:components property-dir="properties">
     <map:generators default="file">
       <map:generator name="linkstatus" src="org.apache.cocoon.generation.LinkStatusGenerator"/>
       <map:generator name="calendar" src="org.apache.cocoon.generation.CalendarGenerator"/>
@@ -57,16 +57,6 @@
   <!-- ========================== Pipelines ================================ -->
 
   <map:pipelines>
-         <!--+
-             | Define global parameters, used in the input modules GlobalInputModule demo.
-    <map:component-configurations>
-      <global-variables>
-         <global-sitemap>This value is defined in the samples/sitemap.xmap</global-sitemap>
-         <global-sitemap-override>This value is defined in the samples/sitemap.xmap,
should be overridden by samples/modules/sitemap.xmap</global-sitemap-override>
-      </global-variables>
-    </map:component-configurations>
-             +-->
-
     <map:pipeline>
       <map:match pattern="v">
         <map:generate type="virtual"/>

Added: cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/properties/variables.properties
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/properties/variables.properties?rev=410131&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/properties/variables.properties
(added)
+++ cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/properties/variables.properties
Mon May 29 10:48:16 2006
@@ -0,0 +1,26 @@
+#  Copyright 2006 The Apache Software Foundation
+#
+#  Licensed 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.
+#
+
+# the name of the Session Attribute, used to store History
+history=_query_bean_history_
+# the name of the Lucene Analyzer to use	
+lucene-analyzer=org.apache.lucene.analysis.standard.StandardAnalyzer
+#The path to the Lucene Index to use. 
+#
+# If you supply an absolute path, this will be used as-is
+# If you supply a non-absolute path, this will be used inside the 
+# servlet's work-directory. If stored here, it will be destroyed on shutdown.
+lucene-directory=cocoon-docs
+

Propchange: cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/properties/variables.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/properties/variables.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/sitemap.xmap?rev=410131&r1=410130&r2=410131&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/src/main/resources/COB-INF/sitemap.xmap
Mon May 29 10:48:16 2006
@@ -19,7 +19,7 @@
 
 <!-- =========================== Components =================================== -->
 
-	<map:components>
+	<map:components property-dir="properties">
 		<map:transformers default="xslt">
 			<map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
 				<catalogues default="forms">
@@ -61,23 +61,6 @@
 <!-- =========================== Pipelines ================================= -->
 
 <map:pipelines>
-
-		<map:component-configurations>
-			<global-variables>
-				<history>_query_bean_history_</history><!-- the name of the Session Attribute,
used to store History -->
-				<lucene-analyzer>org.apache.lucene.analysis.standard.StandardAnalyzer</lucene-analyzer><!--
the name of the Lucene Analyzer to use -->	
-				<!--+
-						|		The path to the Lucene Index to use. 
-						|
-						| 	If you supply an absolute path, this will be used as-is
-						| 	If you supply a non-absolute path, this will be used inside the 
-						|		servlet's work-directory. If stored here, it will be destroyed on shutdown.
-						|
-						+-->
-				<lucene-directory>cocoon-docs</lucene-directory>
-			</global-variables>
-		</map:component-configurations>
-
 		<map:pipeline internal-only="true">
 		
 			<map:act type="locale">

Added: cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/src/main/resources/COB-INF/properties/variables.properties
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/src/main/resources/COB-INF/properties/variables.properties?rev=410131&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/src/main/resources/COB-INF/properties/variables.properties
(added)
+++ cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/src/main/resources/COB-INF/properties/variables.properties
Mon May 29 10:48:16 2006
@@ -0,0 +1,19 @@
+#  Copyright 2006 The Apache Software Foundation
+#
+#  Licensed 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.
+#
+
+namespace=cocoon
+base=/samples/blocks/slide
+
+

Propchange: cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/src/main/resources/COB-INF/properties/variables.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/src/main/resources/COB-INF/properties/variables.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/src/main/resources/COB-INF/sitemap.xmap?rev=410131&r1=410130&r2=410131&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/src/main/resources/COB-INF/sitemap.xmap
Mon May 29 10:48:16 2006
@@ -17,6 +17,9 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
+  <map:components property-dir="properties">
+  </map:components>
+
 <!-- ========================== Flowscript ================================= -->
 
   <map:flow language="javascript">
@@ -38,14 +41,6 @@
 <!-- =========================== Pipelines ================================= -->
 
  <map:pipelines>
-   
-   <map:component-configurations>
-     <global-variables>
-       <namespace>cocoon</namespace>
-       <base>/samples/blocks/slide</base>
-     </global-variables>
-   </map:component-configurations>
-
 <!-- =========================== Screens ================================= -->
    
    <map:pipeline internal-only="false" type="noncaching">

Added: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/davmap/properties/variables.properties
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/davmap/properties/variables.properties?rev=410131&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/davmap/properties/variables.properties
(added)
+++ cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/davmap/properties/variables.properties
Mon May 29 10:48:16 2006
@@ -0,0 +1,19 @@
+#  Copyright 2006 The Apache Software Foundation
+#
+#  Licensed 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.
+#
+
+staging=repository:./repo/
+    
+
+

Propchange: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/davmap/properties/variables.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/davmap/properties/variables.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/davmap/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/davmap/sitemap.xmap?rev=410131&r1=410130&r2=410131&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/davmap/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/davmap/sitemap.xmap
Mon May 29 10:48:16 2006
@@ -18,7 +18,7 @@
 
 <!-- =========================== Components ================================ -->
 
-  <map:components>
+  <map:components property-dir="properties">
   
     <map:generators default="file">
       <map:generator 
@@ -81,13 +81,6 @@
   </map:views>
 
   <map:pipelines>
-    
-    <map:component-configurations>
-      <global-variables>
-        <staging>repository:./repo/</staging>
-      </global-variables>
-    </map:component-configurations>
-    
 <!-- ========================= Private Resources =========================== -->
 
     <map:pipeline type="noncaching" internal-only="true">

Added: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/flowsample/properties/variables.properties
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/flowsample/properties/variables.properties?rev=410131&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/flowsample/properties/variables.properties
(added)
+++ cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/flowsample/properties/variables.properties
Mon May 29 10:48:16 2006
@@ -0,0 +1,20 @@
+#  Copyright 2006 The Apache Software Foundation
+#
+#  Licensed 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.
+#
+
+staging=
+#staging>webdav://localhost/webdav/flowsample/
+    
+
+

Propchange: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/flowsample/properties/variables.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/flowsample/properties/variables.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/flowsample/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/flowsample/sitemap.xmap?rev=410131&r1=410130&r2=410131&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/flowsample/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/flowsample/sitemap.xmap
Mon May 29 10:48:16 2006
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-<map:components>
+<map:components property-dir="properties">
   <map:generators default="file">
     <map:generator name="traverse" src="org.apache.cocoon.generation.TraversableGenerator"/>
     <map:generator name="jx" src="org.apache.cocoon.generation.JXTemplateGenerator"/>
@@ -29,13 +29,6 @@
 </map:flow>
 
 <map:pipelines>
-  <map:component-configurations>
-    <global-variables>
-      <staging></staging>
-      <!--staging>webdav://localhost/webdav/flowsample/</staging-->
-    </global-variables>
-  </map:component-configurations>
-
   <map:pipeline>
     <map:match pattern="**/*.kont">
       <map:call continuation="{2}"/>

Added: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step1/properties/variables.properties
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step1/properties/variables.properties?rev=410131&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step1/properties/variables.properties
(added)
+++ cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step1/properties/variables.properties
Mon May 29 10:48:16 2006
@@ -0,0 +1,19 @@
+#  Copyright 2006 The Apache Software Foundation
+#
+#  Licensed 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.
+#
+
+staging=
+#staging=webdav://localhost/webdav/step1/
+
+

Propchange: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step1/properties/variables.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step1/properties/variables.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step1/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step1/sitemap.xmap?rev=410131&r1=410130&r2=410131&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step1/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step1/sitemap.xmap
Mon May 29 10:48:16 2006
@@ -16,21 +16,13 @@
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-<map:components>
+<map:components property-dir="properties">
   <map:generators default="file">
     <map:generator name="traverse" src="org.apache.cocoon.generation.TraversableGenerator"/>
   </map:generators>
 </map:components>
 
 <map:pipelines>
-
-  <map:component-configurations>
-    <global-variables>
-      <staging></staging>
-      <!--staging>webdav://localhost/webdav/step1/</staging-->
-    </global-variables>
-  </map:component-configurations>
-
   <map:pipeline>
 
     <map:match pattern="repo/">

Added: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step2/properties/variables.properties
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step2/properties/variables.properties?rev=410131&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step2/properties/variables.properties
(added)
+++ cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step2/properties/variables.properties
Mon May 29 10:48:16 2006
@@ -0,0 +1,19 @@
+#  Copyright 2006 The Apache Software Foundation
+#
+#  Licensed 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.
+#
+
+staging=
+#staging=webdav://localhost/webdav/step2/
+
+

Propchange: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step2/properties/variables.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step2/properties/variables.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step2/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step2/sitemap.xmap?rev=410131&r1=410130&r2=410131&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step2/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step2/sitemap.xmap
Mon May 29 10:48:16 2006
@@ -16,21 +16,13 @@
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-<map:components>
+<map:components property-dir="properties">
   <map:generators default="file">
     <map:generator name="traverse" src="org.apache.cocoon.generation.TraversableGenerator"/>
   </map:generators>
 </map:components>
 
 <map:pipelines>
-
-  <map:component-configurations>
-    <global-variables>
-      <staging></staging>
-      <!--staging>webdav://localhost/webdav/step2/</staging-->
-    </global-variables>
-  </map:component-configurations>
-
   <map:pipeline>
 
     <map:match pattern="repo/">

Added: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step3/properties/variables.properties
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step3/properties/variables.properties?rev=410131&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step3/properties/variables.properties
(added)
+++ cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step3/properties/variables.properties
Mon May 29 10:48:16 2006
@@ -0,0 +1,21 @@
+#  Copyright 2006 The Apache Software Foundation
+#
+#  Licensed 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.
+#
+
+staging=
+#staging=webdav://localhost/webdav/step3/
+
+    
+
+

Propchange: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step3/properties/variables.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step3/properties/variables.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step3/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step3/sitemap.xmap?rev=410131&r1=410130&r2=410131&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step3/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step3/sitemap.xmap
Mon May 29 10:48:16 2006
@@ -16,21 +16,13 @@
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-<map:components>
+<map:components property-dir="properties">
   <map:generators default="file">
     <map:generator name="traverse" src="org.apache.cocoon.generation.TraversableGenerator"/>
   </map:generators>
 </map:components>
 
 <map:pipelines>
-
-  <map:component-configurations>
-    <global-variables>
-      <staging></staging>
-      <!--staging>webdav://localhost/webdav/step3/</staging-->
-    </global-variables>
-  </map:component-configurations>
-
   <map:pipeline>
 
     <map:match pattern="repo/">

Added: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step4/properties/variables.properties
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step4/properties/variables.properties?rev=410131&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step4/properties/variables.properties
(added)
+++ cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step4/properties/variables.properties
Mon May 29 10:48:16 2006
@@ -0,0 +1,21 @@
+#  Copyright 2006 The Apache Software Foundation
+#
+#  Licensed 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.
+#
+
+staging=
+#staging=webdav://localhost/webdav/step4/
+
+    
+
+

Propchange: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step4/properties/variables.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step4/properties/variables.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step4/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step4/sitemap.xmap?rev=410131&r1=410130&r2=410131&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step4/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step4/sitemap.xmap
Mon May 29 10:48:16 2006
@@ -16,21 +16,13 @@
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-<map:components>
+<map:components property-dir="properties">
   <map:generators default="file">
     <map:generator name="traverse" src="org.apache.cocoon.generation.TraversableGenerator"/>
   </map:generators>
 </map:components>
 
 <map:pipelines>
-
-  <map:component-configurations>
-    <global-variables>
-      <staging></staging>
-      <!--staging>webdav://localhost/webdav/step4/</staging-->
-    </global-variables>
-  </map:component-configurations>
-
   <map:pipeline>
 
     <map:match pattern="repo/">

Added: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step5/properties/variables.properties
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step5/properties/variables.properties?rev=410131&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step5/properties/variables.properties
(added)
+++ cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step5/properties/variables.properties
Mon May 29 10:48:16 2006
@@ -0,0 +1,21 @@
+#  Copyright 2006 The Apache Software Foundation
+#
+#  Licensed 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.
+#
+
+staging=
+#staging=webdav://localhost/webdav/step5/
+
+    
+
+

Propchange: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step5/properties/variables.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step5/properties/variables.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step5/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step5/sitemap.xmap?rev=410131&r1=410130&r2=410131&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step5/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-sample/src/main/resources/COB-INF/step5/sitemap.xmap
Mon May 29 10:48:16 2006
@@ -16,21 +16,13 @@
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-<map:components>
+<map:components property-dir="properties">
   <map:generators default="file">
     <map:generator name="traverse" src="org.apache.cocoon.generation.TraversableGenerator"/>
   </map:generators>
 </map:components>
 
 <map:pipelines>
-
-  <map:component-configurations>
-    <global-variables>
-      <staging></staging>
-      <!--staging>webdav://localhost/webdav/step5/</staging-->
-    </global-variables>
-  </map:component-configurations>
-
   <map:pipeline>
 
     <map:match pattern="repo/">



Mime
View raw message