svn commit: r595837 - in /cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources: COB-INF/misc-samples.xml COB-INF/samples.xml COB-INF/sitemap.xmap META-INF/cocoon/spring/cocoon-core-additional-sample.xml

[vg...@apache.org]

Author: vgritsenko
Date: Fri Nov 16 13:41:28 2007
New Revision: 595837

URL: http://svn.apache.org/viewvc?rev=595837&view=rev
Log:
cleanup

Removed:
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/misc-samples.xml
Modified:
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/samples.xml
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-additional-sample.xml

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/samples.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/samples.xml?rev=595837&r1=595836&r2=595837&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/samples.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/samples.xml Fri Nov 16 13:41:28 2007
@@ -31,8 +31,8 @@
       Some samples of various components that are included with the core,
       e.g. Stream Generators, Paginator Transformers, Image Readers.
     </sample>
-    <sample href="misc" name="Miscellaneous samples">
-      Some stuff that does not fit into the other groups of samples.
+    <sample href="text-wrap/" name="Text wrap">
+      Addresses the problem of wrapping long lines of text in source elements.
     </sample>
   </group>
 

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sitemap.xmap?rev=595837&r1=595836&r2=595837&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/COB-INF/sitemap.xmap Fri Nov 16 13:41:28 2007
@@ -104,15 +104,6 @@
 
       <map:match pattern="components">
         <map:generate src="components-samples.xml" />
-        <!-- Make use of servlet services -->
-        <map:serialize type="servletService">
-          <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
-        </map:serialize>
-      </map:match>
-
-      <map:match pattern="misc">
-        <map:generate src="misc-samples.xml" />
-        <!-- Make use of servlet services -->
         <map:serialize type="servletService">
           <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html" />
         </map:serialize>
@@ -120,7 +111,6 @@
 
       <map:match pattern="request.html">
         <map:generate type="request" />
-        <!-- Make use of servlet services -->
         <map:serialize type="servletService">
           <map:parameter name="service" value="servlet:style-default:/service/system/xml2html" />
         </map:serialize>
@@ -151,7 +141,7 @@
           <map:transform type="i18n">
           <map:parameter name="default-catalogue-id" value="messages"/>
           <map:parameter name="locale" value="{request-param:lang}"/>
-          </map:transform> 
+          </map:transform>
         -->
         <map:serialize />
       </map:match>

Modified: cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-additional-sample.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-additional-sample.xml?rev=595837&r1=595836&r2=595837&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-additional-sample.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-sample/cocoon-core-additional-sample/src/main/resources/META-INF/cocoon/spring/cocoon-core-additional-sample.xml Fri Nov 16 13:41:28 2007
@@ -16,14 +16,16 @@
   limitations under the License.
 -->
 
-<!-- @version $Id$ -->
+<!--
+  - $Id$
+  -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:servlet="http://cocoon.apache.org/schema/servlet"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
-  <bean id="org.apache.cocoon.core.additional.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+  <bean name="org.apache.cocoon.core.additional.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
     <servlet:context mount-path="/cocoon-core-additional-sample" context-path="blockcontext:/cocoon-core-additional-sample/">
       <servlet:connections>
         <entry key="style-default" value-ref="org.apache.cocoon.samples.style.default.servlet" />