oscom-lenya-notimes/pubs/notimes publication-sitemap.xmap,1.3,1.4 usecase.xmap,1.2,1.3

Michael Wechner <[email protected]> Wed, 28 May 2003 06:18:17 +0200
Newsgroups gmane.comp.cms.wyona.cvs
Message-ID <[email protected]>
Update of /usr/local/repositories/oscom-lenya-notimes/pubs/notimes
In directory erbium:/tmp/cvs-serv28772/pubs/notimes

Modified Files:
	publication-sitemap.xmap usecase.xmap 
Log Message:
Article creator added

Index: publication-sitemap.xmap
===================================================================
RCS file: /usr/local/repositories/oscom-lenya-notimes/pubs/notimes/publication-sitemap.xmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** publication-sitemap.xmap	19 May 2003 21:33:38 -0000	1.3
--- publication-sitemap.xmap	28 May 2003 04:18:14 -0000	1.4
***************
*** 68,71 ****
--- 68,79 ----
          <map:serialize type="xml"/>
        </map:match>
+       <map:match pattern="authoring/menubar/section.xml">
+         <map:generate type="serverpages" src="../ina/config/menus/section.xsp"/>
+         <map:serialize type="xml"/>
+       </map:match>
+       <map:match pattern="authoring/menubar/sections.xml">
+         <map:generate type="serverpages" src="../ina/config/menus/sections.xsp"/>
+         <map:serialize type="xml"/>
+       </map:match>
        <map:match pattern="live/menubar/article.xml">
          <map:generate type="serverpages" src="../../content/menus/live.xsp"/>
***************
*** 123,127 ****
        <map:match pattern="*/*/*/*/index.xml">
          <map:aggregate element="lenya">
!           <map:part src="cocoon:/{1}/menubar/article.xml"/>
            <map:part src="cocoon:/{1}/{2}/{3}/{4}/page.xml"/>
          </map:aggregate>
--- 131,135 ----
        <map:match pattern="*/*/*/*/index.xml">
          <map:aggregate element="lenya">
!           <map:part src="cocoon:/{1}/menubar/sections.xml"/>
            <map:part src="cocoon:/{1}/{2}/{3}/{4}/page.xml"/>
          </map:aggregate>
***************
*** 165,169 ****
        <map:match pattern="*/*/*/*/*/index.xml">
          <map:aggregate element="lenya">
!           <map:part src="cocoon:/{1}/menubar/article.xml"/>
            <map:part src="cocoon:/{1}/{2}/{3}/{4}/{5}/page.xml"/>
          </map:aggregate>
--- 173,177 ----
        <map:match pattern="*/*/*/*/*/index.xml">
          <map:aggregate element="lenya">
!           <map:part src="cocoon:/{1}/menubar/section.xml"/>
            <map:part src="cocoon:/{1}/{2}/{3}/{4}/{5}/page.xml"/>
          </map:aggregate>
***************
*** 171,174 ****
--- 179,183 ----
        </map:match>
      </map:pipeline>    
+     <!-- Section (View) -->
      <map:pipeline>
        <map:match pattern="*/*/*/*/*/index.html">
***************
*** 211,244 ****
      </map:pipeline>
  
!     <!-- Article (HTML View and Publish) -->
      <map:pipeline>
        <map:match pattern="*/*/*/*/*/*.html">
- <!--
-         <map:match type="lenya-usecase" pattern="publish">
- 
-           <map:match type="lenya-step" pattern="showscreen">
- 	    <map:generate type="serverpages" src="../../content/publishing/publish-screen.xsp"/>
- 	    <map:transform src="../../xslt/publishing/main-new.xsl">
- 	      <map:parameter name="use-request-parameters" value="true"/>
- 	    </map:transform>
- 	    <map:serialize type="html"/>
-           </map:match>
- 
-           <map:match type="lenya-step" pattern="execute">
- 	    <map:act type="request">
- 	      <map:parameter name="parameters" value="true"/>
- 	      <map:act type="task">
- 		<map:parameter name="task-id" value="publish"/>
- 		<map:redirect-to uri="{parent_uri}" session="true"/>
- 	      </map:act>
- 	    </map:act>
-           </map:match>
- 
-           <!++ No lenya-step matches! ++>
-           <map:generate src="cocoon:/{../1}/{../2}/{../3}/{../4}/{../5}/{../6}.xml"/>
-           <map:serialize type="xml"/>
-         </map:match>
- -->
- 
          <map:generate src="cocoon:/{1}/{2}/{3}/{4}/{5}/{6}.xml" label="aggregate"/>
          <map:transform src="../ina/xslt/{1}-article.xsl"/>
--- 220,226 ----
      </map:pipeline>
  
!     <!-- Article (View) -->
      <map:pipeline>
        <map:match pattern="*/*/*/*/*/*.html">
          <map:generate src="cocoon:/{1}/{2}/{3}/{4}/{5}/{6}.xml" label="aggregate"/>
          <map:transform src="../ina/xslt/{1}-article.xsl"/>

Index: usecase.xmap
===================================================================
RCS file: /usr/local/repositories/oscom-lenya-notimes/pubs/notimes/usecase.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** usecase.xmap	19 May 2003 21:33:38 -0000	1.2
--- usecase.xmap	28 May 2003 04:18:14 -0000	1.3
***************
*** 26,34 ****
    <map:pipelines>
  
!     <!-- Article (HTML View and Publish) -->
      <map:pipeline>
        <map:match pattern="*/*/*/*/*/*.html">
          <map:match type="lenya-usecase" pattern="publish">
- 
            <map:match type="lenya-step" pattern="showscreen">
  	    <map:generate type="serverpages" src="../../content/publishing/publish-screen.xsp"/>
--- 26,56 ----
    <map:pipelines>
  
!     <!-- Section (Create) -->
!     <map:pipeline>
!       <map:match pattern="*/*/*/*/*/index.html">
!         <map:match type="lenya-usecase" pattern="create">
!           <map:match type="lenya-step" pattern="showscreen">
!             <map:generate type="serverpages" src="../ina/content/util/create.xsp"/>
!             <map:transform src="../ina/xslt/create.xsl"/>
! 	    <map:serialize type="html"/>
!           </map:match>
! 
!           <map:match type="lenya-step" pattern="execute">
! 	    <map:act type="request">
! 	      <map:parameter name="parameters" value="true"/>
! 	      <map:act type="task">
! 		<map:parameter name="task-id" value="publish"/>
! 		<map:redirect-to uri="{parent_uri}" session="true"/>
! 	      </map:act>
! 	    </map:act>
!           </map:match>
!         </map:match>
!       </map:match>
!     </map:pipeline>    
! 
!     <!-- Article (Publish) -->
      <map:pipeline>
        <map:match pattern="*/*/*/*/*/*.html">
          <map:match type="lenya-usecase" pattern="publish">
            <map:match type="lenya-step" pattern="showscreen">
  	    <map:generate type="serverpages" src="../../content/publishing/publish-screen.xsp"/>
***************
*** 48,54 ****
  	    </map:act>
            </map:match>
- 
          </map:match>
- 
        </map:match>
      </map:pipeline>    
--- 70,74 ----