cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r265571 - in /cocoon: blocks/asciiart/trunk/WEB-INF/sitemap-additions/ blocks/asciiart/trunk/conf/ blocks/authentication-fw/trunk/WEB-INF/sitemap-additions/ blocks/authentication-fw/trunk/conf/ blocks/batik/trunk/WEB-INF/sitemap-additions/ ...
Date Wed, 31 Aug 2005 20:14:20 GMT
Author: cziegeler
Date: Wed Aug 31 13:13:55 2005
New Revision: 265571

URL: http://svn.apache.org/viewcvs?rev=265571&view=rev
Log:
Use includes for sitemap components (no more patching for this)
Refactor blocks from a-b

Added:
    cocoon/blocks/asciiart/trunk/WEB-INF/sitemap-additions/
    cocoon/blocks/asciiart/trunk/WEB-INF/sitemap-additions/cocoon-asciiart.xconf   (with props)
    cocoon/blocks/authentication-fw/trunk/WEB-INF/sitemap-additions/
    cocoon/blocks/authentication-fw/trunk/WEB-INF/sitemap-additions/cocoon-authentication-fw.xconf
  (with props)
    cocoon/blocks/batik/trunk/WEB-INF/sitemap-additions/
    cocoon/blocks/batik/trunk/WEB-INF/sitemap-additions/cocoon-batik.xconf   (with props)
    cocoon/blocks/bsf/trunk/WEB-INF/sitemap-additions/
    cocoon/blocks/bsf/trunk/WEB-INF/sitemap-additions/cocoon-bsf.xconf   (with props)
    cocoon/blocks/fop/trunk/WEB-INF/sitemap-additions/
    cocoon/blocks/fop/trunk/WEB-INF/sitemap-additions/cocoon-fop.xconf   (with props)
    cocoon/trunk/src/webapp/WEB-INF/sitemap-additions/
    cocoon/trunk/src/webapp/WEB-INF/sitemap-additions/cocoon-core.xconf   (with props)
Removed:
    cocoon/blocks/asciiart/trunk/conf/asciiart-generator.xmap
    cocoon/blocks/authentication-fw/trunk/conf/authentication-act.xmap
    cocoon/blocks/authentication-fw/trunk/conf/authentication-gen.xmap
    cocoon/blocks/batik/trunk/conf/svg.generation.xmap
    cocoon/blocks/batik/trunk/conf/svg.serializer.xmap
    cocoon/blocks/batik/trunk/conf/svg.transformer.xmap
    cocoon/blocks/bsf/trunk/conf/bsf.xmap
    cocoon/blocks/fop/trunk/conf/fop.xmap
    cocoon/trunk/src/webapp/sitemap-additions.xconf
Modified:
    cocoon/trunk/src/webapp/sitemap.xmap
    cocoon/trunk/tools/targets/webapp-build.xml

Added: cocoon/blocks/asciiart/trunk/WEB-INF/sitemap-additions/cocoon-asciiart.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/asciiart/trunk/WEB-INF/sitemap-additions/cocoon-asciiart.xconf?rev=265571&view=auto
==============================================================================
--- cocoon/blocks/asciiart/trunk/WEB-INF/sitemap-additions/cocoon-asciiart.xconf (added)
+++ cocoon/blocks/asciiart/trunk/WEB-INF/sitemap-additions/cocoon-asciiart.xconf Wed Aug 31
13:13:55 2005
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 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.
+-->
+<!--+
+    |
+    | $Id$
+    +-->
+<map:components xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+  <map:generators>
+    <map:generator name="asciiart-svg" logger="sitemap.generator.asciiart-svg"
+                   src="org.apache.cocoon.generation.asciiart.AsciiArtSVGGenerator"/>
+  </map:generators>
+</map:components>

Propchange: cocoon/blocks/asciiart/trunk/WEB-INF/sitemap-additions/cocoon-asciiart.xconf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/asciiart/trunk/WEB-INF/sitemap-additions/cocoon-asciiart.xconf
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/blocks/authentication-fw/trunk/WEB-INF/sitemap-additions/cocoon-authentication-fw.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/authentication-fw/trunk/WEB-INF/sitemap-additions/cocoon-authentication-fw.xconf?rev=265571&view=auto
==============================================================================
--- cocoon/blocks/authentication-fw/trunk/WEB-INF/sitemap-additions/cocoon-authentication-fw.xconf
(added)
+++ cocoon/blocks/authentication-fw/trunk/WEB-INF/sitemap-additions/cocoon-authentication-fw.xconf
Wed Aug 31 13:13:55 2005
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 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.
+-->
+<!--+
+    |
+    | $Id$
+    +-->
+<map:components xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+  <map:generators>
+    <map:generator name="auth-conf"
+                   src="org.apache.cocoon.webapps.authentication.generation.ConfigurationGenerator"
+                   label="content"/>
+  </map:generators>
+  <map:actions>
+    <map:action name="auth-protect"
+                src="org.apache.cocoon.webapps.authentication.acting.AuthAction"/>
+    <map:action name="auth-login"
+                src="org.apache.cocoon.webapps.authentication.acting.LoginAction"/>
+    <map:action name="auth-logout"
+                src="org.apache.cocoon.webapps.authentication.acting.LogoutAction"/>
+    <map:action name="auth-loggedIn"
+                src="org.apache.cocoon.webapps.authentication.acting.LoggedInAction"/>
+  </map:actions>
+</map:components>

Propchange: cocoon/blocks/authentication-fw/trunk/WEB-INF/sitemap-additions/cocoon-authentication-fw.xconf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/authentication-fw/trunk/WEB-INF/sitemap-additions/cocoon-authentication-fw.xconf
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/blocks/batik/trunk/WEB-INF/sitemap-additions/cocoon-batik.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/batik/trunk/WEB-INF/sitemap-additions/cocoon-batik.xconf?rev=265571&view=auto
==============================================================================
--- cocoon/blocks/batik/trunk/WEB-INF/sitemap-additions/cocoon-batik.xconf (added)
+++ cocoon/blocks/batik/trunk/WEB-INF/sitemap-additions/cocoon-batik.xconf Wed Aug 31 13:13:55
2005
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 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.
+-->
+<!--+
+    |
+    | $Id$
+    +-->
+<map:components xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+  <map:generators>
+    <map:generator label="content" logger="sitemap.generator.extractor" name="extractor"
src="org.apache.cocoon.generation.FragmentExtractorGenerator"/>
+  </map:generators>
+  <map:transformers>
+    <map:transformer logger="sitemap.transformer.extractor" name="extractor" src="org.apache.cocoon.transformation.FragmentExtractorTransformer"/>
+  </map:transformers>
+  <map:serializers>
+    <map:serializer logger="sitemap.serializer.svg2jpeg" name="svg2jpeg" src="org.apache.cocoon.serialization.SVGSerializer"
mime-type="image/jpeg">
+      <parameter name="quality" type="float" value="0.9"/>
+    </map:serializer>
+    <map:serializer logger="sitemap.serializer.svg2png" name="svg2png" src="org.apache.cocoon.serialization.SVGSerializer"
mime-type="image/png"/>
+  </map:serializers>
+</map:components>

Propchange: cocoon/blocks/batik/trunk/WEB-INF/sitemap-additions/cocoon-batik.xconf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/batik/trunk/WEB-INF/sitemap-additions/cocoon-batik.xconf
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/blocks/bsf/trunk/WEB-INF/sitemap-additions/cocoon-bsf.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/bsf/trunk/WEB-INF/sitemap-additions/cocoon-bsf.xconf?rev=265571&view=auto
==============================================================================
--- cocoon/blocks/bsf/trunk/WEB-INF/sitemap-additions/cocoon-bsf.xconf (added)
+++ cocoon/blocks/bsf/trunk/WEB-INF/sitemap-additions/cocoon-bsf.xconf Wed Aug 31 13:13:55
2005
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 1999-2004 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.
+-->
+<!--+
+    |
+    | $Id$
+    +-->
+<map:components xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+  <map:generators>
+    <map:generator name="script" src="org.apache.cocoon.generation.ScriptGenerator" logger="sitemap.generation.scriptgenerator">
+        <!-- Groovy support -->
+        <add-languages>
+            <language name="groovy" src="org.codehaus.groovy.bsf.GroovyEngine">
+              <extension>groovy</extension>
+              <extension>gy</extension>
+            </language>
+        </add-languages>
+    </map:generator>
+  </map:generators>
+</map:components>

Propchange: cocoon/blocks/bsf/trunk/WEB-INF/sitemap-additions/cocoon-bsf.xconf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/bsf/trunk/WEB-INF/sitemap-additions/cocoon-bsf.xconf
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/blocks/fop/trunk/WEB-INF/sitemap-additions/cocoon-fop.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/fop/trunk/WEB-INF/sitemap-additions/cocoon-fop.xconf?rev=265571&view=auto
==============================================================================
--- cocoon/blocks/fop/trunk/WEB-INF/sitemap-additions/cocoon-fop.xconf (added)
+++ cocoon/blocks/fop/trunk/WEB-INF/sitemap-additions/cocoon-fop.xconf Wed Aug 31 13:13:55
2005
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 1999-2005 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.
+-->
+<!--+
+    |
+    | $Id$
+    +-->
+<map:components xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+  <map:serializers>
+    <map:serializer name="fo2pdf" logger="sitemap.serializer.fo2pdf" src="org.apache.cocoon.serialization.FOPSerializer"
mime-type="application/pdf">
+      <!-- This element specifies URL to FOP user configuration file.
+           It can be absolute file URL or relative to the servlet context.
+           Examples:
+
+      <user-config>file:/C:/cocoon/fop-config.xml</user-config>
+      <user-config>WEB-INF/fop-config.xml</user-config>
+      -->
+
+      <!-- Should serializer set content length header or not?
+           Default is true.
+      <set-content-length>true</set-content-length>
+      -->
+    </map:serializer>
+
+    <map:serializer logger="sitemap.serializer.fo2ps" name="fo2ps" src="org.apache.cocoon.serialization.FOPSerializer"
mime-type="application/postscript"/>
+
+    <map:serializer logger="sitemap.serializer.fo2pcl" name="fo2pcl" src="org.apache.cocoon.serialization.FOPSerializer"
mime-type="vnd.hp-PCL"/>
+  </map:serializers>
+</map:components>

Propchange: cocoon/blocks/fop/trunk/WEB-INF/sitemap-additions/cocoon-fop.xconf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/fop/trunk/WEB-INF/sitemap-additions/cocoon-fop.xconf
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/trunk/src/webapp/WEB-INF/sitemap-additions/cocoon-core.xconf
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/WEB-INF/sitemap-additions/cocoon-core.xconf?rev=265571&view=auto
==============================================================================
--- cocoon/trunk/src/webapp/WEB-INF/sitemap-additions/cocoon-core.xconf (added)
+++ cocoon/trunk/src/webapp/WEB-INF/sitemap-additions/cocoon-core.xconf Wed Aug 31 13:13:55
2005
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 1999-2005 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.
+-->
+<!--+
+    | This file defines some additional components for the sitemap.
+    |
+    | SVN $Id$
+    +-->
+
+<map:components xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+  <map:generators>
+  	<map:generator label="content" logger="sitemap.generator.mp3directory" name="mp3directory"
src="org.apache.cocoon.generation.MP3DirectoryGenerator"/>
+  </map:generators>
+
+  <map:transformers>
+    <map:transformer logger="sitemap.transformer.jpath" name="jpath" src="org.apache.cocoon.transformation.JPathTransformer"/>
+    <map:transformer logger="sitemap.transformer.filter" name="filter" src="org.apache.cocoon.transformation.FilterTransformer"/>
+  </map:transformers>
+
+  <map:serializers>
+    <map:serializer logger="sitemap.serializer.vrml" mime-type="model/vrml" name="vrml"
src="org.apache.cocoon.serialization.TextSerializer"/>
+  </map:serializers>
+
+</map:components>
\ No newline at end of file

Propchange: cocoon/trunk/src/webapp/WEB-INF/sitemap-additions/cocoon-core.xconf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/src/webapp/WEB-INF/sitemap-additions/cocoon-core.xconf
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/src/webapp/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/sitemap.xmap?rev=265571&r1=265570&r2=265571&view=diff
==============================================================================
--- cocoon/trunk/src/webapp/sitemap.xmap (original)
+++ cocoon/trunk/src/webapp/sitemap.xmap Wed Aug 31 13:13:55 2005
@@ -441,7 +441,7 @@
    </map:pipes>
    
    <!-- include some additional components -->
-   <include src="sitemap-additions.xconf"/>
+   <map:include dir="context://WEB-INF/sitemap-additions" pattern="*.xconf"/>
 
  </map:components>
 

Modified: cocoon/trunk/tools/targets/webapp-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/webapp-build.xml?rev=265571&r1=265570&r2=265571&view=diff
==============================================================================
--- cocoon/trunk/tools/targets/webapp-build.xml (original)
+++ cocoon/trunk/tools/targets/webapp-build.xml Wed Aug 31 13:13:55 2005
@@ -28,7 +28,6 @@
     <copy file="${webapp}/not-found.xml" tofile="${build.webapp}/not-found.xml" filtering="on"/>
     <copy file="${webapp}/welcome.xslt" tofile="${build.webapp}/welcome.xslt" filtering="on"/>
     <copy file="${webapp}/sitemap.xmap" tofile="${build.webapp}/sitemap.xmap"/>
-    <copy file="${webapp}/sitemap-additions.xconf" tofile="${build.webapp}/sitemap-additions.xconf"/>
     <copy file="${webapp}/wiring.xml" tofile="${build.webapp}/wiring.xml" filtering="on"/>
 
     <!-- generate sitemap entries



Mime
View raw message