svn commit: r515992 - in /lenya/branches/BRANCH_1_2_X/src/webapp: lenya/usecases/neutron/neutron.js lenya/usecases/neutron/usecase-neutron.xmap sitemap.xmap

Author: jann
Date: Thu Mar  8 01:52:02 2007
New Revision: 515992

URL: http://svn.apache.org/viewvc?view=rev&rev=515992
Log:
Fixing some neutron issues. Credit goes to thomas comiotto

Modified:
    lenya/branches/BRANCH_1_2_X/src/webapp/lenya/usecases/neutron/neutron.js
    
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/usecases/neutron/usecase-neutron.xmap
    lenya/branches/BRANCH_1_2_X/src/webapp/sitemap.xmap

Modified: 
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/usecases/neutron/neutron.js
URL: 
http://svn.apache.org/viewvc/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/usecases/neutron/neutron.js?view=diff&rev=515992&r1=515991&r2=515992
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/usecases/neutron/neutron.js 
(original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/usecases/neutron/neutron.js 
Thu Mar  8 01:52:02 2007
@@ -39,7 +39,7 @@
    var document = flowHelper.getPageEnvelope(cocoon).getDocument();
 
    var path = "/" + document.getId() + "/index_" + document.getLanguage() + 
".xml";
-   cocoon.sendPage("xml/" + path);
+   cocoon.sendPage("xmlsource/" + path);
   
 }
 
@@ -96,10 +96,13 @@
     
   } catch (e) {
     cocoon.response.setStatus(500);
-    cocoon.sendPage("exception-checkout.jx", {"message": e});
+
+    var user = e.getCheckOutUsername();
+    var date = e.getCheckOutDate(); 
+    cocoon.sendPage("exception-checkout.jx", {"user": user, "date": date });
     return;
   }
-  cocoon.sendPage("xml/" + path);
+  cocoon.sendPage("xmlsource/" + path);
 }
 
 
@@ -153,7 +156,7 @@
     cocoon.sendPage("exception-checkout.jx", {"message" : e});
     return;
   }
-  cocoon.sendPage("xml/" + path);
+  cocoon.sendPage("xmlsource/" + path);
  
 }
 

Modified: 
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/usecases/neutron/usecase-neutron.xmap
URL: 
http://svn.apache.org/viewvc/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/usecases/neutron/usecase-neutron.xmap?view=diff&rev=515992&r1=515991&r2=515992
==============================================================================
--- 
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/usecases/neutron/usecase-neutron.xmap
 (original)
+++ 
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/usecases/neutron/usecase-neutron.xmap
 Thu Mar  8 01:52:02 2007
@@ -38,7 +38,7 @@
     <map:pipeline type="noncaching">
  
       <map:match pattern="*.jx">
-        <map:generate type="jx" src="lenya/usecases/neutron/jx/{1}.jx"/>
+        <map:generate type="jx" src="jx/{1}.jx"/>
         <map:serialize type="xml"/>
       </map:match>
 
@@ -53,7 +53,7 @@
       </map:match>
 
 
-      <map:match pattern="xml/**">
+      <map:match pattern="xmlsource/**">
         <map:act type="resource-exists" 
src="context://lenya/pubs/{page-envelope:publication-id}/content/authoring/{1}">
           <map:generate 
src="context://lenya/pubs/{page-envelope:publication-id}/content/authoring/{../1}"/>
           <map:serialize type="xml"/>
@@ -81,7 +81,7 @@
      <map:match type="usecase" pattern="neutron">
      
        <map:match type="step" pattern="introspect">
-         <map:generate type="jx" 
src="{fallback:usecases/neutron/jx/introspection.jx}">
+         <map:generate type="jx" src="jx/introspection.jx">
            <map:parameter name="base-url" 
value="{page-envelope:context-prefix}/{page-envelope:publication-id}/authoring"/>
            <map:parameter name="document-url" 
value="{page-envelope:document-url}"/>
            <map:parameter name="document-label" 
value="{page-envelope:document-label}"/>
@@ -108,22 +108,6 @@
         
         <map:match type="step" pattern="checkin">
           <map:call function="checkin"/>
-        </map:match>
-        
-        <map:match type="step" pattern="xsl">
-          <map:act 
src="context://lenya/pubs/{page-envelope:publication-id}/lenya/usecases/neutron/neutron-styles.xmap"
 type="resource-exists">
-            <map:mount check-reload="true" reload-method="synchron" 
src="context://lenya/pubs/{page-envelope:publication-id}/lenya/usecases/neutron/neutron-styles.xmap"
 uri-prefix=""/>
-          </map:act>
-          <map:generate src="context://lenya/content/util/empty.xml"/> 
-          <map:serialize status-code="404"/> 
-        </map:match>
-
-        <map:match type="step" pattern="template">
-          <map:act 
src="context://lenya/pubs/{page-envelope:publication-id}/lenya/usecases/neutron/neutron-styles.xmap"
 type="resource-exists">
-            <map:mount check-reload="true" reload-method="synchron" 
src="context://lenya/pubs/{page-envelope:publication-id}/lenya/usecases/neutron/neutron-styles.xmap"
 uri-prefix=""/>
-          </map:act>
-          <map:generate src="context://lenya/content/util/empty.xml"/>
-          <map:serialize status-code="404"/> 
         </map:match>
 
      

Modified: lenya/branches/BRANCH_1_2_X/src/webapp/sitemap.xmap
URL: 
http://svn.apache.org/viewvc/lenya/branches/BRANCH_1_2_X/src/webapp/sitemap.xmap?view=diff&rev=515992&r1=515991&r2=515992
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/sitemap.xmap (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/sitemap.xmap Thu Mar  8 01:52:02 2007
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You 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
+  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
 
@@ -522,11 +521,11 @@
       <map:read mime-type="text/javascript" src="resources/scripts/{1}.js"/>
     </map:match>
 
-  <!-- Neutron introspection -->
+    <!-- Neutron introspection -->
     
     <map:match type="usecase" pattern="neutron">
       <map:match type="step" pattern="introspect">
-        <map:mount uri-prefix="" 
src="lenya/usecases/neutron/usecase-neutron.xmap" check-reload="true" 
reload-method="synchron"/>
+        <map:mount uri-prefix="" src="lenya/usecase.xmap" check-reload="true" 
reload-method="synchron"/>
       </map:match>
     </map:match>