You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2005/04/11 10:14:50 UTC

svn commit: r160845 - in lenya/trunk/src/webapp: global-sitemap.xmap lenya/admin.xmap lenya/usecases/admin/serverStatus.jx lenya/usecases/admin/usecase.xmap

Author: andreas
Date: Mon Apr 11 01:14:44 2005
New Revision: 160845

URL: http://svn.apache.org/viewcvs?view=rev&rev=160845
Log:
replace admin.xmap by usecases/admin/usecase.xmap

Added:
    lenya/trunk/src/webapp/lenya/usecases/admin/usecase.xmap
Removed:
    lenya/trunk/src/webapp/lenya/admin.xmap
Modified:
    lenya/trunk/src/webapp/global-sitemap.xmap
    lenya/trunk/src/webapp/lenya/usecases/admin/serverStatus.jx

Modified: lenya/trunk/src/webapp/global-sitemap.xmap
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/global-sitemap.xmap?view=diff&r1=160844&r2=160845
==============================================================================
--- lenya/trunk/src/webapp/global-sitemap.xmap (original)
+++ lenya/trunk/src/webapp/global-sitemap.xmap Mon Apr 11 01:14:44 2005
@@ -295,14 +295,22 @@
         <map:mount uri-prefix="{1}/policies" src="lenya/pubs/{1}/policies-sitemap.xmap" check-reload="true" reload-method="synchron"/>
       </map:match>
       
-      <!-- Admin Area -->
+      <!-- Admin area entry point: redirect to admin.users usecase -->
       <map:match pattern="*/admin/**">
-        <map:mount uri-prefix="{1}/admin" src="lenya/admin.xmap" check-reload="true" reload-method="synchron"/>
+        <map:select type="parameter">
+          <map:parameter name="parameter-selector-test" value="{request-param:lenya.usecase}"/>
+          <map:when test="">
+            <map:redirect-to session="true" uri="{request:requestURI}?lenya.usecase=admin.users"/>
+          </map:when>
+        </map:select>
       </map:match>
       
       <!-- Internal usecases -->
       <map:pipeline internal-only="true">
         <map:match type="usecase" pattern="*">
+          <map:match pattern="core/*/**">
+            <map:mount uri-prefix="core/{1}" src="lenya/usecases/{1}/usecase.xmap"></map:mount>
+          </map:match>
           <map:match pattern="*/**">
             <map:mount uri-prefix="{1}" src="lenya/pubs/{1}/sitemap.xmap" check-reload="true" reload-method="synchron"/>
           </map:match>

Modified: lenya/trunk/src/webapp/lenya/usecases/admin/serverStatus.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/admin/serverStatus.jx?view=diff&r1=160844&r2=160845
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/serverStatus.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/admin/serverStatus.jx Mon Apr 11 01:14:44 2005
@@ -12,7 +12,7 @@
       <jx:import uri="templates/messages.jx"/>
       
       <cinclude:includexml>
-        <cinclude:src>cocoon://ignore/admin/internal/status.xml</cinclude:src>
+        <cinclude:src>cocoon://core/admin/status.xml</cinclude:src>
       </cinclude:includexml>
       
     </div>

Added: lenya/trunk/src/webapp/lenya/usecases/admin/usecase.xmap
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/admin/usecase.xmap?view=auto&rev=160845
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/usecase.xmap (added)
+++ lenya/trunk/src/webapp/lenya/usecases/admin/usecase.xmap Mon Apr 11 01:14:44 2005
@@ -0,0 +1,36 @@
+<?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: admin.xmap 160670 2005-04-09 09:12:12Z andreas $ -->
+
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+
+  <map:pipelines>
+    <map:pipeline>
+
+      <map:match pattern="status.xml">
+        <map:generate src="status" type="status"/>
+        <map:transform src="fallback://lenya/xslt/admin/status2html.xslt">
+          <map:parameter name="contextPath" value="{request:contextPath}"/>
+        </map:transform>
+        <map:serialize type="xml"/>
+      </map:match>
+    
+    </map:pipeline>
+  </map:pipelines>
+  
+</map:sitemap>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org