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 2007/01/16 15:12:42 UTC

svn commit: r496697 - in /lenya/trunk/src: modules-core/ac/usecases/ modules-core/administration/usecases/ modules-core/sitemanagement/usecases/site/ modules-core/sitemanagement/usecases/tab/ modules-core/sitemanagement/usecases/tab/ac/ modules-core/te...

Author: andreas
Date: Tue Jan 16 06:12:36 2007
New Revision: 496697

URL: http://svn.apache.org/viewvc?view=rev&rev=496697
Log:
Refactoring: moved usecase-related resources from core to usecase module

Added:
    lenya/trunk/src/modules-core/usecase/edit-document.js
      - copied unchanged from r496339, lenya/trunk/src/webapp/lenya/usecases/edit-document.js
    lenya/trunk/src/modules-core/usecase/search/
      - copied from r496339, lenya/trunk/src/webapp/lenya/usecases/search/
    lenya/trunk/src/modules-core/usecase/templates/
      - copied from r496339, lenya/trunk/src/webapp/lenya/usecases/templates/
    lenya/trunk/src/modules-core/usecase/usecase.xmap
      - copied, changed from r496339, lenya/trunk/src/webapp/lenya/usecases/usecase.xmap
    lenya/trunk/src/modules-core/usecase/usecases.js
      - copied, changed from r496339, lenya/trunk/src/webapp/lenya/usecases/usecases.js
Removed:
    lenya/trunk/src/webapp/lenya/usecases/edit-document.js
    lenya/trunk/src/webapp/lenya/usecases/search/
    lenya/trunk/src/webapp/lenya/usecases/templates/
    lenya/trunk/src/webapp/lenya/usecases/usecase.xmap
    lenya/trunk/src/webapp/lenya/usecases/usecases.js
Modified:
    lenya/trunk/src/modules-core/ac/usecases/login.jx
    lenya/trunk/src/modules-core/ac/usecases/logout.jx
    lenya/trunk/src/modules-core/administration/usecases/addGroup.jx
    lenya/trunk/src/modules-core/administration/usecases/addIPRange.jx
    lenya/trunk/src/modules-core/administration/usecases/addUser.jx
    lenya/trunk/src/modules-core/administration/usecases/changePasswordAdmin.jx
    lenya/trunk/src/modules-core/administration/usecases/deleteGroup.jx
    lenya/trunk/src/modules-core/administration/usecases/deleteUser.jx
    lenya/trunk/src/modules-core/administration/usecases/emptyTrash.jx
    lenya/trunk/src/modules-core/administration/usecases/group.jx
    lenya/trunk/src/modules-core/administration/usecases/groupMembers.jx
    lenya/trunk/src/modules-core/administration/usecases/groupProfile.jx
    lenya/trunk/src/modules-core/administration/usecases/groups.jx
    lenya/trunk/src/modules-core/administration/usecases/ipRange.jx
    lenya/trunk/src/modules-core/administration/usecases/ipRangeGroups.jx
    lenya/trunk/src/modules-core/administration/usecases/ipRangeProfile.jx
    lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx
    lenya/trunk/src/modules-core/administration/usecases/passwordForm.jx
    lenya/trunk/src/modules-core/administration/usecases/serverStatus.jx
    lenya/trunk/src/modules-core/administration/usecases/sessions.jx
    lenya/trunk/src/modules-core/administration/usecases/siteOverview.jx
    lenya/trunk/src/modules-core/administration/usecases/usecases.jx
    lenya/trunk/src/modules-core/administration/usecases/user.jx
    lenya/trunk/src/modules-core/administration/usecases/userGroups.jx
    lenya/trunk/src/modules-core/administration/usecases/userProfile.jx
    lenya/trunk/src/modules-core/administration/usecases/users.jx
    lenya/trunk/src/modules-core/sitemanagement/usecases/site/archive.jx
    lenya/trunk/src/modules-core/sitemanagement/usecases/site/changeLabel.jx
    lenya/trunk/src/modules-core/sitemanagement/usecases/site/changeNodeID.jx
    lenya/trunk/src/modules-core/sitemanagement/usecases/site/copy.jx
    lenya/trunk/src/modules-core/sitemanagement/usecases/site/create.jx
    lenya/trunk/src/modules-core/sitemanagement/usecases/site/createLanguage.jx
    lenya/trunk/src/modules-core/sitemanagement/usecases/site/cut.jx
    lenya/trunk/src/modules-core/sitemanagement/usecases/site/delete.jx
    lenya/trunk/src/modules-core/sitemanagement/usecases/site/deleteLanguage.jx
    lenya/trunk/src/modules-core/sitemanagement/usecases/site/paste.jx
    lenya/trunk/src/modules-core/sitemanagement/usecases/site/restore.jx
    lenya/trunk/src/modules-core/sitemanagement/usecases/tab/ac/ac.jx
    lenya/trunk/src/modules-core/sitemanagement/usecases/tab/assets.jx
    lenya/trunk/src/modules-core/sitemanagement/usecases/tab/meta.jx
    lenya/trunk/src/modules-core/sitemanagement/usecases/tab/overview.jx
    lenya/trunk/src/modules-core/sitemanagement/usecases/tab/revisions.jx
    lenya/trunk/src/modules-core/sitemanagement/usecases/tab/scheduler.jx
    lenya/trunk/src/modules-core/sitemanagement/usecases/tab/workflow.jx
    lenya/trunk/src/modules-core/templating/usecases/createPublicationFromTemplate.jx
    lenya/trunk/src/modules-core/usecase/search/search.jx
    lenya/trunk/src/modules-core/workflow/usecases/multiWorkflow.jx
    lenya/trunk/src/modules/blog/usecases/site/create.jx
    lenya/trunk/src/modules/blog/usecases/workflow/deactivate.jx
    lenya/trunk/src/modules/blog/usecases/workflow/delete.jx
    lenya/trunk/src/modules/bxe/usecases/bxe.jx
    lenya/trunk/src/modules/bxe/usecases/insertAsset.jx
    lenya/trunk/src/modules/contactform/usecases/contactForm.jx
    lenya/trunk/src/modules/editors/usecases/forms/forms.jx
    lenya/trunk/src/modules/editors/usecases/forms/oneform.jx
    lenya/trunk/src/modules/export/usecases/import.jx
    lenya/trunk/src/modules/export/usecases/importExampleContent.jx
    lenya/trunk/src/modules/fckeditor/usecases/fckeditor.jx
    lenya/trunk/src/modules/fckeditor/usecases/insertAsset.jx
    lenya/trunk/src/modules/notification/usecases/inbox.jx
    lenya/trunk/src/modules/notification/usecases/sendMessage.jx
    lenya/trunk/src/modules/opendocument/usecases/upload.jx
    lenya/trunk/src/modules/resource/usecases/create-resource.jx
    lenya/trunk/src/modules/resource/usecases/upload-resource.jx
    lenya/trunk/src/modules/tinymce/usecases/insertAsset.jx
    lenya/trunk/src/modules/usecasedocument/usecases/createUsecaseDocument.jx
    lenya/trunk/src/webapp/global-sitemap.xmap
    lenya/trunk/src/webapp/lenya/config/sitemap/pipelines.xmap
    lenya/trunk/src/webapp/lenya/usecase.xmap

Modified: lenya/trunk/src/modules-core/ac/usecases/login.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/ac/usecases/login.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/ac/usecases/login.jx (original)
+++ lenya/trunk/src/modules-core/ac/usecases/login.jx Tue Jan 16 06:12:36 2007
@@ -87,7 +87,7 @@
         <i18n:text>Login</i18n:text>
       </div>
       
-      <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+      <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
 
       <div class="lenya-box-body">
         <form name="login" id="login" method="post" action="?lenya.continuation=${continuation.id}&amp;lenya.usecase=${request.getParameter('lenya.usecase')}">

Modified: lenya/trunk/src/modules-core/ac/usecases/logout.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/ac/usecases/logout.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/ac/usecases/logout.jx (original)
+++ lenya/trunk/src/modules-core/ac/usecases/logout.jx Tue Jan 16 06:12:36 2007
@@ -35,8 +35,8 @@
         <i18n:text>Logout</i18n:text>
       </div>
 
-      <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
-
+      <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
+      
       <div class="lenya-box-body">
         <form id="form-logout">
           <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>

Modified: lenya/trunk/src/modules-core/administration/usecases/addGroup.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/addGroup.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/addGroup.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/addGroup.jx Tue Jan 16 06:12:36 2007
@@ -25,7 +25,7 @@
   >
   
   <page:body>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
       <h1><i18n:text>Add Group</i18n:text></h1>
     
@@ -36,7 +36,7 @@
       <table class="lenya-table-noborder">
         <tr>
           <td colspan="2">
-            <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+            <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
           </td>
         </tr>
         <tr>

Modified: lenya/trunk/src/modules-core/administration/usecases/addIPRange.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/addIPRange.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/addIPRange.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/addIPRange.jx Tue Jan 16 06:12:36 2007
@@ -7,7 +7,7 @@
   >
   
   <page:body>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
       
     <h1><i18n:text>Add IP Range</i18n:text></h1>
@@ -19,7 +19,7 @@
       <table class="lenya-table-noborder">
         <tr>
           <td colspan="2">
-            <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+            <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
           </td>
         </tr>
         <tr>

Modified: lenya/trunk/src/modules-core/administration/usecases/addUser.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/addUser.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/addUser.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/addUser.jx Tue Jan 16 06:12:36 2007
@@ -25,7 +25,7 @@
   >
   
   <page:body>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
     
     <h1><i18n:text>Add <jx:out value="${request.getParameter('userType')}"/></i18n:text></h1>
@@ -37,7 +37,7 @@
       <table class="lenya-table-noborder">
         <tr>
           <td colspan="2">
-            <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+            <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
           </td>
         </tr>
         <tr>

Modified: lenya/trunk/src/modules-core/administration/usecases/changePasswordAdmin.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/changePasswordAdmin.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/changePasswordAdmin.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/changePasswordAdmin.jx Tue Jan 16 06:12:36 2007
@@ -24,7 +24,7 @@
   >
   
   <page:body>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
     
       <h1>

Modified: lenya/trunk/src/modules-core/administration/usecases/deleteGroup.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/deleteGroup.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/deleteGroup.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/deleteGroup.jx Tue Jan 16 06:12:36 2007
@@ -25,7 +25,7 @@
   >
   
   <page:body>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
     <h1><i18n:text>Delete Group</i18n:text></h1>
     
@@ -36,7 +36,7 @@
       <table class="lenya-table-noborder">
         <tr>
           <td colspan="2">
-            <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+            <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
           </td>
         </tr>
         <tr>

Modified: lenya/trunk/src/modules-core/administration/usecases/deleteUser.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/deleteUser.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/deleteUser.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/deleteUser.jx Tue Jan 16 06:12:36 2007
@@ -25,7 +25,7 @@
   >
   
   <page:body>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
     <h1><i18n:text>Delete User</i18n:text></h1>    
     <form id="form-delete_user">
@@ -35,7 +35,7 @@
       <table class="lenya-table-noborder">
         <tr>
           <td colspan="2">
-            <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+            <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
           </td>
         </tr>
         <tr>

Modified: lenya/trunk/src/modules-core/administration/usecases/emptyTrash.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/emptyTrash.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/emptyTrash.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/emptyTrash.jx Tue Jan 16 06:12:36 2007
@@ -25,12 +25,12 @@
   >
   
   <page:body>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
     <h1><i18n:text>Delete Trash</i18n:text></h1>
       
-    <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
-    <p>
+      <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
+      <p>
       <jx:choose>
         <jx:when test="${usecase.getParameter('documents').isEmpty()}">
           <i18n:text>The trash is empty.</i18n:text>

Modified: lenya/trunk/src/modules-core/administration/usecases/group.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/group.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/group.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/group.jx Tue Jan 16 06:12:36 2007
@@ -25,7 +25,7 @@
   >
   
   <page:body>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
     <h1><i18n:text>Group Profile</i18n:text></h1>
       
@@ -34,7 +34,7 @@
       <table class="lenya-table-noborder">
         <tr>
           <td colspan="2">
-            <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+            <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
           </td>
         </tr>
         <tr>

Modified: lenya/trunk/src/modules-core/administration/usecases/groupMembers.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/groupMembers.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/groupMembers.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/groupMembers.jx Tue Jan 16 06:12:36 2007
@@ -25,7 +25,7 @@
   >
   
   <page:body>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
     <h1><i18n:text>Group Affiliation</i18n:text></h1>
     
@@ -36,7 +36,7 @@
        <table class="lenya-table-noborder">
         <tr>
           <td colspan="2">
-            <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+            <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
           </td>
         </tr>
       </table>

Modified: lenya/trunk/src/modules-core/administration/usecases/groupProfile.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/groupProfile.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/groupProfile.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/groupProfile.jx Tue Jan 16 06:12:36 2007
@@ -25,7 +25,7 @@
   >
   
   <page:body>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
     <h1><i18n:text>Edit Group Profile</i18n:text></h1>
     
@@ -36,7 +36,7 @@
       <table class="lenya-table-noborder">
         <tr>
           <td colspan="2">
-            <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+            <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
           </td>
         </tr>
         <tr>

Modified: lenya/trunk/src/modules-core/administration/usecases/groups.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/groups.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/groups.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/groups.jx Tue Jan 16 06:12:36 2007
@@ -25,13 +25,13 @@
   >
   
   <page:body>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
     
       <table class="lenya-table-noborder">
         <tr>
           <td colspan="2">
-            <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+            <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
           </td>
         </tr>
       </table>

Modified: lenya/trunk/src/modules-core/administration/usecases/ipRange.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/ipRange.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/ipRange.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/ipRange.jx Tue Jan 16 06:12:36 2007
@@ -25,7 +25,7 @@
   >
   
   <page:body>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
     <h1><i18n:text>IP Range Profile</i18n:text></h1>
     
@@ -34,7 +34,7 @@
       <table class="lenya-table-noborder">
         <tr>
           <td colspan="2">
-            <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+            <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
           </td>
         </tr>
         <tr>

Modified: lenya/trunk/src/modules-core/administration/usecases/ipRangeGroups.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/ipRangeGroups.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/ipRangeGroups.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/ipRangeGroups.jx Tue Jan 16 06:12:36 2007
@@ -25,7 +25,7 @@
   >
   
   <page:body>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
       <h1><i18n:text>Group Affiliation</i18n:text></h1>
     <form id="form-group_affiliation">
@@ -35,7 +35,7 @@
        <table class="lenya-table-noborder">
         <tr>
           <td colspan="2">
-            <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+            <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
           </td>
         </tr>
       </table>

Modified: lenya/trunk/src/modules-core/administration/usecases/ipRangeProfile.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/ipRangeProfile.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/ipRangeProfile.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/ipRangeProfile.jx Tue Jan 16 06:12:36 2007
@@ -23,7 +23,7 @@
   >
   
   <page:body>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
       
     <h1><i18n:text>IP Range Profile</i18n:text></h1>
@@ -35,7 +35,7 @@
       <table class="lenya-table-noborder">
         <tr>
           <td colspan="2">
-            <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+            <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
           </td>
         </tr>
         <tr>

Modified: lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx Tue Jan 16 06:12:36 2007
@@ -25,13 +25,13 @@
   >
   
   <page:body>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
     
       <table class="lenya-table-noborder">
         <tr>
           <td colspan="2">
-            <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+            <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
           </td>
         </tr>
       </table>

Modified: lenya/trunk/src/modules-core/administration/usecases/passwordForm.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/passwordForm.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/passwordForm.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/passwordForm.jx Tue Jan 16 06:12:36 2007
@@ -29,7 +29,7 @@
     <table class="lenya-table-noborder">
       <tr>
         <td colspan="2">
-          <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+          <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
         </td>
       </tr>
       <jx:if test="${usecase.getView().getParameter('checkPassword').equals('true')}">

Modified: lenya/trunk/src/modules-core/administration/usecases/serverStatus.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/serverStatus.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/serverStatus.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/serverStatus.jx Tue Jan 16 06:12:36 2007
@@ -26,9 +26,9 @@
   >
   
   <page:body>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
-      <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+      <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
       
       <cinclude:includexml>
         <cinclude:src>cocoon://modules/administration/status.xml</cinclude:src>

Modified: lenya/trunk/src/modules-core/administration/usecases/sessions.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/sessions.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/sessions.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/sessions.jx Tue Jan 16 06:12:36 2007
@@ -25,13 +25,13 @@
   >
   
   <page:body>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
     
       <table class="lenya-table-noborder">
         <tr>
           <td colspan="2">
-            <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+            <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
           </td>
         </tr>
       </table>

Modified: lenya/trunk/src/modules-core/administration/usecases/siteOverview.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/siteOverview.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/siteOverview.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/siteOverview.jx Tue Jan 16 06:12:36 2007
@@ -25,12 +25,12 @@
   >
   
   <page:body>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
     <h1><i18n:text>Overview</i18n:text></h1>
       
-    <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
-    <form id="form-overview">
+      <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
+      <form id="form-overview">
       <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
       <input type="hidden" name="lenya.usecase" value="${request.getParameter('lenya.usecase')}"/>
       

Modified: lenya/trunk/src/modules-core/administration/usecases/usecases.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/usecases.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/usecases.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/usecases.jx Tue Jan 16 06:12:36 2007
@@ -25,7 +25,7 @@
   >
   
   <page:body>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
       <h1><i18n:text>Usecases</i18n:text></h1>
       
@@ -47,7 +47,7 @@
             </jx:forEach>).
           </p>
         </jx:if>
-        <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+        <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
         <table class="lenya-table">
           <jx:set var="i" value="0"/>
           <jx:forEach var="usecaseName" items="${usecase.getParameter('usecases')}">

Modified: lenya/trunk/src/modules-core/administration/usecases/user.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/user.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/user.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/user.jx Tue Jan 16 06:12:36 2007
@@ -25,7 +25,7 @@
   >
   
   <page:body>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
     <h1><i18n:text>User Profile</i18n:text></h1>
     
@@ -35,7 +35,7 @@
           <table class="lenya-table-noborder">
             <tr>
               <td colspan="2">
-                <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+                <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
               </td>
             </tr>
             <tr>

Modified: lenya/trunk/src/modules-core/administration/usecases/userGroups.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/userGroups.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/userGroups.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/userGroups.jx Tue Jan 16 06:12:36 2007
@@ -25,7 +25,7 @@
   >
   
   <page:body>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
       <h1><i18n:text>Group Affiliation</i18n:text></h1>
     <form id="form-user_group_affiliation">
@@ -35,7 +35,7 @@
        <table class="lenya-table-noborder">
         <tr>
           <td colspan="2">
-            <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+            <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
           </td>
         </tr>
       </table>

Modified: lenya/trunk/src/modules-core/administration/usecases/userProfile.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/userProfile.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/userProfile.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/userProfile.jx Tue Jan 16 06:12:36 2007
@@ -25,7 +25,7 @@
   >
   
   <page:body>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
     <h1><i18n:text>Edit User Profile</i18n:text></h1>
     
@@ -36,7 +36,7 @@
       <table class="lenya-table-noborder">
         <tr>
           <td colspan="2">
-            <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+            <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
           </td>
         </tr>
         <tr>

Modified: lenya/trunk/src/modules-core/administration/usecases/users.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/users.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/users.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/users.jx Tue Jan 16 06:12:36 2007
@@ -23,13 +23,13 @@
   >
   
   <page:body>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
     
       <table class="lenya-table-noborder">
         <tr>
           <td colspan="2">
-            <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+            <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
           </td>
         </tr>
       </table>

Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/site/archive.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/site/archive.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/site/archive.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/site/archive.jx Tue Jan 16 06:12:36 2007
@@ -49,7 +49,7 @@
             </tr>
             <tr>
               <td>
-                <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+                <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
               </td>
             </tr>
             <tr>

Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/site/changeLabel.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/site/changeLabel.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/site/changeLabel.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/site/changeLabel.jx Tue Jan 16 06:12:36 2007
@@ -45,7 +45,7 @@
           <table class="lenya-table-noborder">
             <tr>
               <td colspan="2">
-                <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+                <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
               </td>
             </tr>
             <tr>

Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/site/changeNodeID.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/site/changeNodeID.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/site/changeNodeID.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/site/changeNodeID.jx Tue Jan 16 06:12:36 2007
@@ -45,7 +45,7 @@
           <table class="lenya-table-noborder">
             <tr>
               <td colspan="2">
-                <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+                <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
               </td>
             </tr>
             <tr>

Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/site/copy.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/site/copy.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/site/copy.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/site/copy.jx Tue Jan 16 06:12:36 2007
@@ -45,7 +45,7 @@
           <table class="lenya-table-noborder">
             <tr>
               <td>
-                <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+                <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
               </td>
             </tr>
             <tr>

Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/site/create.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/site/create.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/site/create.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/site/create.jx Tue Jan 16 06:12:36 2007
@@ -38,7 +38,7 @@
         </i18n:translate>
       </div>
       
-      <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+      <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
       
       <div class="lenya-box-body">
         <form id="form-create">

Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/site/createLanguage.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/site/createLanguage.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/site/createLanguage.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/site/createLanguage.jx Tue Jan 16 06:12:36 2007
@@ -30,8 +30,8 @@
         <i18n:text>New Language Version</i18n:text>
       </div>
 
-      <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
-
+      <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
+      
       <div class="lenya-box-body">
         <form id="form-create_language">
           <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>

Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/site/cut.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/site/cut.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/site/cut.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/site/cut.jx Tue Jan 16 06:12:36 2007
@@ -45,7 +45,7 @@
           <table class="lenya-table-noborder">
             <tr>
               <td>
-                <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+                <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
               </td>
             </tr>
             <tr>

Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/site/delete.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/site/delete.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/site/delete.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/site/delete.jx Tue Jan 16 06:12:36 2007
@@ -39,7 +39,7 @@
           <table class="lenya-table-noborder">
             <tr>
               <td>
-                <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+                <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
               </td>
             </tr>
             <tr>

Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/site/deleteLanguage.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/site/deleteLanguage.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/site/deleteLanguage.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/site/deleteLanguage.jx Tue Jan 16 06:12:36 2007
@@ -36,7 +36,7 @@
           <table class="lenya-table-noborder">
             <tr>
               <td colspan="2">
-                <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+                <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
               </td>
             </tr>
               <tr>

Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/site/paste.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/site/paste.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/site/paste.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/site/paste.jx Tue Jan 16 06:12:36 2007
@@ -45,7 +45,7 @@
           <table class="lenya-table-noborder">
             <tr>
               <td>
-                <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+                <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
               </td>
             </tr>
             <tr>

Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/site/restore.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/site/restore.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/site/restore.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/site/restore.jx Tue Jan 16 06:12:36 2007
@@ -39,7 +39,7 @@
       <div class="lenya-box-body">
         <jx:choose>
           <jx:when test="${usecase.hasErrors()}">		
-            <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+            <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
             <input type="button" class="lenya-form-element" onClick="location.href='${requesturi}';" value="Back"/>
           </jx:when>
           <jx:otherwise>

Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/tab/ac/ac.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/tab/ac/ac.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/tab/ac/ac.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/tab/ac/ac.jx Tue Jan 16 06:12:36 2007
@@ -26,7 +26,7 @@
   <page:body>
     <jx:import
       uri="fallback://lenya/modules/sitemanagement/usecases/tab/sitetree.jx"/>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     
     <jx:set var="area" value="${usecase.getParameter('acArea')}"/>
     
@@ -46,7 +46,7 @@
       <table class="lenya-table">
         <tr>
           <td colspan="5" style="border-left: 0; border-right: 0; border-top: 0px;">
-            <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+            <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
           </td>
         </tr>
         <tr>

Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/tab/assets.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/tab/assets.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/tab/assets.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/tab/assets.jx Tue Jan 16 06:12:36 2007
@@ -26,7 +26,7 @@
   <jx:import uri="fallback://lenya/modules/sitemanagement/usecases/tab/head.jx"/>
   <page:body>
     <jx:import uri="fallback://lenya/modules/sitemanagement/usecases/tab/sitetree.jx"/>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab-sitetree">
 
       <table class="lenya-table">

Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/tab/meta.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/tab/meta.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/tab/meta.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/tab/meta.jx Tue Jan 16 06:12:36 2007
@@ -25,13 +25,13 @@
   <jx:import uri="fallback://lenya/modules/sitemanagement/usecases/tab/head.jx"/>
   <page:body>
     <jx:import uri="fallback://lenya/modules/sitemanagement/usecases/tab/sitetree.jx"/>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab-sitetree">
       <form id="form-meta">
         <table class="lenya-table-noborder">
           <tr>
             <td colspan="2">
-              <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+              <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
             </td>
           </tr>
           

Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/tab/overview.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/tab/overview.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/tab/overview.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/tab/overview.jx Tue Jan 16 06:12:36 2007
@@ -25,14 +25,14 @@
   <jx:import uri="fallback://lenya/modules/sitemanagement/usecases/tab/head.jx"/>
   <page:body>
     <jx:import uri="fallback://lenya/modules/sitemanagement/usecases/tab/sitetree.jx"/>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab-sitetree">
       <jx:choose>
         <jx:when test="${not(empty(usecase.getParameter('title')))}">
           <table class="lenya-table-noborder">
             <tr>
               <td colspan="2">
-                <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+                <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
               </td>
             </tr>
             <tr>

Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/tab/revisions.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/tab/revisions.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/tab/revisions.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/tab/revisions.jx Tue Jan 16 06:12:36 2007
@@ -26,7 +26,7 @@
   <jx:import uri="fallback://lenya/modules/sitemanagement/usecases/tab/head.jx"/>
   <page:body>
     <jx:import uri="fallback://lenya/modules/sitemanagement/usecases/tab/sitetree.jx"/>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab-sitetree">
     <table class="lenya-table-noborder">
       <jx:forEach var="item" items="${usecase.getParameter('entries')}" end="0">

Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/tab/scheduler.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/tab/scheduler.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/tab/scheduler.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/tab/scheduler.jx Tue Jan 16 06:12:36 2007
@@ -25,7 +25,7 @@
   <jx:import uri="fallback://lenya/modules/sitemanagement/usecases/tab/head.jx"/>
   <page:body>
     <jx:import uri="fallback://lenya/modules/sitemanagement/usecases/tab/sitetree.jx"/>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab-sitetree">
       
       <table class="lenya-table">

Modified: lenya/trunk/src/modules-core/sitemanagement/usecases/tab/workflow.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/usecases/tab/workflow.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/tab/workflow.jx (original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/tab/workflow.jx Tue Jan 16 06:12:36 2007
@@ -25,7 +25,7 @@
   <jx:import uri="fallback://lenya/modules/sitemanagement/usecases/tab/head.jx"/>
   <page:body>
     <jx:import uri="fallback://lenya/modules/sitemanagement/usecases/tab/sitetree.jx"/>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab-sitetree">
       <h2><i18n:text>Variables</i18n:text></h2>
       <table class="lenya-table">

Modified: lenya/trunk/src/modules-core/templating/usecases/createPublicationFromTemplate.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/templating/usecases/createPublicationFromTemplate.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/templating/usecases/createPublicationFromTemplate.jx (original)
+++ lenya/trunk/src/modules-core/templating/usecases/createPublicationFromTemplate.jx Tue Jan 16 06:12:36 2007
@@ -38,7 +38,7 @@
           <table class="lenya-table-noborder">
             <tr>
               <td colspan="2">
-                <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+                <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
               </td>
             </tr>
             <tr>

Modified: lenya/trunk/src/modules-core/usecase/search/search.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/search/search.jx?view=diff&rev=496697&r1=496339&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/usecase/search/search.jx (original)
+++ lenya/trunk/src/modules-core/usecase/search/search.jx Tue Jan 16 06:12:36 2007
@@ -31,8 +31,8 @@
     <div class="lenya-box">
         <div class="lenya-box-title">Search <jx:out value="${usecase.getParameter('publication')}"/></div>
   
-      <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
-
+      <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
+      
       <div class="lenya-box-body">
           <form id="form-search">
             <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>

Copied: lenya/trunk/src/modules-core/usecase/usecase.xmap (from r496339, lenya/trunk/src/webapp/lenya/usecases/usecase.xmap)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/usecase.xmap?view=diff&rev=496697&p1=lenya/trunk/src/webapp/lenya/usecases/usecase.xmap&r1=496339&p2=lenya/trunk/src/modules-core/usecase/usecase.xmap&r2=496697
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/usecase.xmap (original)
+++ lenya/trunk/src/modules-core/usecase/usecase.xmap Tue Jan 16 06:12:36 2007
@@ -36,7 +36,7 @@
   <!-- =========================== FlowScript =============================== -->
 
   <map:flow language="javascript">
-    <map:script src="fallback://lenya/usecases/usecases.js"/>
+    <map:script src="fallback://lenya/modules/usecase/usecases.js"/>
   </map:flow>
   
   <!-- =========================== Pipelines ================================ -->

Copied: lenya/trunk/src/modules-core/usecase/usecases.js (from r496339, lenya/trunk/src/webapp/lenya/usecases/usecases.js)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/usecases.js?view=diff&rev=496697&p1=lenya/trunk/src/webapp/lenya/usecases/usecases.js&r1=496339&p2=lenya/trunk/src/modules-core/usecase/usecases.js&r2=496697
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/usecases.js (original)
+++ lenya/trunk/src/modules-core/usecase/usecases.js Tue Jan 16 06:12:36 2007
@@ -331,8 +331,8 @@
         // of several steps; repeated until the user chooses to submit or cancel.
         do {
             // show the view:
-            try {
                 loopFlow(view, proxy, generic); //usecase must be released here!
+            try {
             } catch (exception) {
                 // if something went wrong, try and rollback the usecase:
                 log("error", "Exception during loopFlow(): " + exception, usecaseName);

Modified: lenya/trunk/src/modules-core/workflow/usecases/multiWorkflow.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow/usecases/multiWorkflow.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules-core/workflow/usecases/multiWorkflow.jx (original)
+++ lenya/trunk/src/modules-core/workflow/usecases/multiWorkflow.jx Tue Jan 16 06:12:36 2007
@@ -48,7 +48,7 @@
     
     <br/><br/>
     
-    <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
     
     <table class="lenya-table-list">
       

Modified: lenya/trunk/src/modules/blog/usecases/site/create.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/blog/usecases/site/create.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules/blog/usecases/site/create.jx (original)
+++ lenya/trunk/src/modules/blog/usecases/site/create.jx Tue Jan 16 06:12:36 2007
@@ -30,8 +30,8 @@
         <i18n:text>New Entry</i18n:text>
       </div>
 
-      <jx:import uri="templates/messages.jx"/>
-
+      <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
+      
       <div class="lenya-box-body">
         <form id="form-create">
           <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>

Modified: lenya/trunk/src/modules/blog/usecases/workflow/deactivate.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/blog/usecases/workflow/deactivate.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules/blog/usecases/workflow/deactivate.jx (original)
+++ lenya/trunk/src/modules/blog/usecases/workflow/deactivate.jx Tue Jan 16 06:12:36 2007
@@ -30,8 +30,8 @@
         <i18n:text>Deactivate</i18n:text>
       </div>
 
-      <jx:import uri="templates/messages.jx"/>
-
+      <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
+      
       <div class="lenya-box-body">
         <form id="form-deactivate">
           <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>

Modified: lenya/trunk/src/modules/blog/usecases/workflow/delete.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/blog/usecases/workflow/delete.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules/blog/usecases/workflow/delete.jx (original)
+++ lenya/trunk/src/modules/blog/usecases/workflow/delete.jx Tue Jan 16 06:12:36 2007
@@ -30,8 +30,8 @@
         <i18n:text>Delete</i18n:text>
       </div>
 
-      <jx:import uri="templates/messages.jx"/>
-
+      <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
+      
       <div class="lenya-box-body">
         <form id="form-delete">
           <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>

Modified: lenya/trunk/src/modules/bxe/usecases/bxe.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/bxe/usecases/bxe.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules/bxe/usecases/bxe.jx (original)
+++ lenya/trunk/src/modules/bxe/usecases/bxe.jx Tue Jan 16 06:12:36 2007
@@ -28,7 +28,7 @@
   <jx:choose>
     <jx:when test="${usecase.hasErrors()}">
       <page:body>
-        <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+        <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
       </page:body>
     </jx:when>
     <jx:otherwise>

Modified: lenya/trunk/src/modules/bxe/usecases/insertAsset.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/bxe/usecases/insertAsset.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules/bxe/usecases/insertAsset.jx (original)
+++ lenya/trunk/src/modules/bxe/usecases/insertAsset.jx Tue Jan 16 06:12:36 2007
@@ -122,7 +122,7 @@
             <table class="lenya-table-noborder">
               <tr>
                 <td colspan="2">
-                  <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+                  <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
                 </td>
               </tr>
               <tr>

Modified: lenya/trunk/src/modules/contactform/usecases/contactForm.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/contactform/usecases/contactForm.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules/contactform/usecases/contactForm.jx (original)
+++ lenya/trunk/src/modules/contactform/usecases/contactForm.jx Tue Jan 16 06:12:36 2007
@@ -39,7 +39,7 @@
           <table style="font-size: small">
             <tr>
               <td colspan="2">
-                <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+                <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
               </td>
             </tr>
             

Modified: lenya/trunk/src/modules/editors/usecases/forms/forms.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/editors/usecases/forms/forms.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules/editors/usecases/forms/forms.jx (original)
+++ lenya/trunk/src/modules/editors/usecases/forms/forms.jx Tue Jan 16 06:12:36 2007
@@ -27,8 +27,8 @@
   <page:title><i18n:text>Edit</i18n:text></page:title>
   <page:body>
     
-    <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
-
+    <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
+    
     <form method="post" id="form-edit">
       <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
       <input type="hidden" name="lenya.usecase" value="${usecase.getName()}"/>

Modified: lenya/trunk/src/modules/editors/usecases/forms/oneform.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/editors/usecases/forms/oneform.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules/editors/usecases/forms/oneform.jx (original)
+++ lenya/trunk/src/modules/editors/usecases/forms/oneform.jx Tue Jan 16 06:12:36 2007
@@ -27,8 +27,8 @@
   <page:title><i18n:text>Edit</i18n:text></page:title>
   <page:body>
     
-    <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
-
+    <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
+    
     <form method="post" id="form-onformeditor">
       <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
       <input type="hidden" name="lenya.usecase" value="${usecase.getName()}"/>

Modified: lenya/trunk/src/modules/export/usecases/import.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/export/usecases/import.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules/export/usecases/import.jx (original)
+++ lenya/trunk/src/modules/export/usecases/import.jx Tue Jan 16 06:12:36 2007
@@ -27,7 +27,7 @@
   <page:title><i18n:text>Import</i18n:text></page:title>
   <page:body>
     
-    <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
     
     <form method="post">
       <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>

Modified: lenya/trunk/src/modules/export/usecases/importExampleContent.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/export/usecases/importExampleContent.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules/export/usecases/importExampleContent.jx (original)
+++ lenya/trunk/src/modules/export/usecases/importExampleContent.jx Tue Jan 16 06:12:36 2007
@@ -27,7 +27,7 @@
   <page:title><i18n:text>getting-started</i18n:text></page:title>
   <page:body>
     
-    <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
     
     <jx:choose>
       <jx:when test="${! usecase.hasErrors()}">

Modified: lenya/trunk/src/modules/fckeditor/usecases/fckeditor.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/fckeditor/usecases/fckeditor.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules/fckeditor/usecases/fckeditor.jx (original)
+++ lenya/trunk/src/modules/fckeditor/usecases/fckeditor.jx Tue Jan 16 06:12:36 2007
@@ -36,8 +36,8 @@
 	<page:title>FCKeditor - Sample</page:title>
 
 	<page:body>
-		<jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
-          
+	  <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
+	  
                 <div class="lenya-box">
                   <div class="lenya-box-title">Information</div>
                   <div class="lenya-box-body">

Modified: lenya/trunk/src/modules/fckeditor/usecases/insertAsset.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/fckeditor/usecases/insertAsset.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules/fckeditor/usecases/insertAsset.jx (original)
+++ lenya/trunk/src/modules/fckeditor/usecases/insertAsset.jx Tue Jan 16 06:12:36 2007
@@ -110,7 +110,7 @@
         <table class="lenya-table-noborder">
           <tr>
             <td colspan="2">
-              <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+              <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
             </td>
           </tr>
           <jx:choose>

Modified: lenya/trunk/src/modules/notification/usecases/inbox.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/notification/usecases/inbox.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules/notification/usecases/inbox.jx (original)
+++ lenya/trunk/src/modules/notification/usecases/inbox.jx Tue Jan 16 06:12:36 2007
@@ -25,7 +25,7 @@
   >
   
   <page:body>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
       <h1>
         <i18n:translate>
@@ -37,7 +37,7 @@
       <table class="lenya-table-noborder">
         <tr>
           <td colspan="2">
-            <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+            <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
           </td>
         </tr>
       </table>

Modified: lenya/trunk/src/modules/notification/usecases/sendMessage.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/notification/usecases/sendMessage.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules/notification/usecases/sendMessage.jx (original)
+++ lenya/trunk/src/modules/notification/usecases/sendMessage.jx Tue Jan 16 06:12:36 2007
@@ -25,14 +25,14 @@
   >
   
   <page:body>
-    <jx:import uri="fallback://lenya/usecases/templates/tabs.jx"/>
+    <jx:import uri="fallback://lenya/modules/usecase/templates/tabs.jx"/>
     <div id="contentblock1" class="lenya-tab">
       <h1><i18n:text>new-message</i18n:text></h1>
       
       <table class="lenya-table-noborder">
         <tr>
           <td colspan="2">
-            <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+            <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
           </td>
         </tr>
       </table>

Modified: lenya/trunk/src/modules/opendocument/usecases/upload.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/opendocument/usecases/upload.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules/opendocument/usecases/upload.jx (original)
+++ lenya/trunk/src/modules/opendocument/usecases/upload.jx Tue Jan 16 06:12:36 2007
@@ -38,7 +38,7 @@
         <table class="lenya-table-noborder">
           <tr>
             <td colspan="2">
-              <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+              <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
             </td>
           </tr>
           <tr>

Modified: lenya/trunk/src/modules/resource/usecases/create-resource.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/resource/usecases/create-resource.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules/resource/usecases/create-resource.jx (original)
+++ lenya/trunk/src/modules/resource/usecases/create-resource.jx Tue Jan 16 06:12:36 2007
@@ -35,7 +35,7 @@
         <table class="lenya-table-noborder">
           <tr>
             <td colspan="2">
-              <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+              <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
             </td>
           </tr>
           <tr>

Modified: lenya/trunk/src/modules/resource/usecases/upload-resource.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/resource/usecases/upload-resource.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules/resource/usecases/upload-resource.jx (original)
+++ lenya/trunk/src/modules/resource/usecases/upload-resource.jx Tue Jan 16 06:12:36 2007
@@ -38,7 +38,7 @@
         <table class="lenya-table-noborder">
           <tr>
             <td colspan="2">
-              <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+              <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
             </td>
           </tr>
           <tr>

Modified: lenya/trunk/src/modules/tinymce/usecases/insertAsset.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/tinymce/usecases/insertAsset.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules/tinymce/usecases/insertAsset.jx (original)
+++ lenya/trunk/src/modules/tinymce/usecases/insertAsset.jx Tue Jan 16 06:12:36 2007
@@ -108,7 +108,7 @@
         <table class="lenya-table-noborder">
           <tr>
             <td colspan="2">
-              <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+              <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
             </td>
           </tr>
           <jx:choose>

Modified: lenya/trunk/src/modules/usecasedocument/usecases/createUsecaseDocument.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/usecasedocument/usecases/createUsecaseDocument.jx?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/modules/usecasedocument/usecases/createUsecaseDocument.jx (original)
+++ lenya/trunk/src/modules/usecasedocument/usecases/createUsecaseDocument.jx Tue Jan 16 06:12:36 2007
@@ -30,7 +30,7 @@
         <i18n:text>New Usecase Document</i18n:text>
       </div>
       
-      <jx:import uri="fallback://lenya/usecases/templates/messages.jx"/>
+      <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
       
       <div class="lenya-box-body">
         <form id="form-create">

Modified: lenya/trunk/src/webapp/global-sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/global-sitemap.xmap?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/webapp/global-sitemap.xmap (original)
+++ lenya/trunk/src/webapp/global-sitemap.xmap Tue Jan 16 06:12:36 2007
@@ -246,16 +246,6 @@
         <map:mount uri-prefix="{1}/policies" src="lenya/pubs/{1}/policies-sitemap.xmap" check-reload="true" reload-method="synchron"/>
       </map:match>
       
-      <!-- Admin area entry point: redirect to admin.users usecase -->
-      <map:match pattern="*/admin/**">
-        <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>
-      
     </map:pipeline>
     
     <map:pipeline>
@@ -294,9 +284,6 @@
     
    <!-- Internal usecases -->
     <map:pipeline internal-only="true">
-      <map:match pattern="core/*/**">
-        <map:mount uri-prefix="core/{1}" src="lenya/usecases/{1}/usecase.xmap"/>
-      </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/config/sitemap/pipelines.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/config/sitemap/pipelines.xmap?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/webapp/lenya/config/sitemap/pipelines.xmap (original)
+++ lenya/trunk/src/webapp/lenya/config/sitemap/pipelines.xmap Tue Jan 16 06:12:36 2007
@@ -57,10 +57,10 @@
       </map:match>
       
       <map:match pattern="ac.login" type="usecase">
-        <map:mount src="lenya/usecases/usecase.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
+        <map:mount src="fallback://lenya/modules/usecase/usecase.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
       </map:match>
       <map:match pattern="ac.logout" type="usecase">
-        <map:mount src="lenya/usecases/usecase.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
+        <map:mount src="fallback://lenya/modules/usecase/usecase.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
       </map:match>
 
     <!-- favicon -->

Modified: lenya/trunk/src/webapp/lenya/usecase.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/usecase.xmap?view=diff&rev=496697&r1=496696&r2=496697
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecase.xmap (original)
+++ lenya/trunk/src/webapp/lenya/usecase.xmap Tue Jan 16 06:12:36 2007
@@ -54,7 +54,7 @@
     
     <map:pipeline>
       <map:match type="registered-usecase">
-          <map:mount src="{fallback://lenya/usecases/usecase.xmap}" uri-prefix="" check-reload="yes" reload-method="synchron"/>
+        <map:mount src="fallback://lenya/modules/usecase/usecase.xmap" uri-prefix="" check-reload="yes" reload-method="synchron"/>
       </map:match>
     </map:pipeline>
  



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