Author: andreas
Date: Wed Aug 10 02:47:10 2005
New Revision: 231204
URL: http://svn.apache.org/viewcvs?rev=231204&view=rev
Log:
Use path from context://lenya in usecase view template URIs. This allows to
provide usecase views by publets. The JCR import usecase view was moved to the
JCR publet.
Added:
lenya/trunk/src/publets/jcr/config/usecases.xconf
lenya/trunk/src/publets/jcr/usecases/
lenya/trunk/src/publets/jcr/usecases/import.jx
Removed:
lenya/trunk/src/webapp/lenya/usecases/jcr/
Modified:
lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl
lenya/trunk/src/webapp/lenya/usecases/usecase.xmap
Added: lenya/trunk/src/publets/jcr/config/usecases.xconf
URL:
http://svn.apache.org/viewcvs/lenya/trunk/src/publets/jcr/config/usecases.xconf?rev=231204&view=auto
==============================================================================
--- lenya/trunk/src/publets/jcr/config/usecases.xconf (added)
+++ lenya/trunk/src/publets/jcr/config/usecases.xconf Wed Aug 10 02:47:10 2005
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--
+ 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
+
+ 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: doctypes.xconf 164635 2005-04-25 20:01:43Z tschlabach $ -->
+
+<xconf xpath="/cocoon/usecases"
unless="/cocoon/usecases/component-instance[@name = 'jcr.import']">
+
+ <component-instance name="jcr.import" logger="lenya.jcr"
+ class="org.apache.lenya.cms.jcr.usecases.Import">
+ <view template="publets/jcr/usecases/import.jx" menu="false" publet="jcr"/>
+ </component-instance>
+
+</xconf>
Added: lenya/trunk/src/publets/jcr/usecases/import.jx
URL:
http://svn.apache.org/viewcvs/lenya/trunk/src/publets/jcr/usecases/import.jx?rev=231204&view=auto
==============================================================================
--- lenya/trunk/src/publets/jcr/usecases/import.jx (added)
+++ lenya/trunk/src/publets/jcr/usecases/import.jx Wed Aug 10 02:47:10 2005
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<!--
+ 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
+
+ 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: renameLabel.jx 123364 2004-12-26 16:11:27Z gregor $ -->
+<page:page xmlns:c="http://apache.org/cocoon/templates/jx/1.0";
+ xmlns="http://www.w3.org/1999/xhtml";
+ xmlns:i18n="http://apache.org/cocoon/i18n/2.1";
+ xmlns:page="http://apache.org/cocoon/lenya/cms-page/1.0";
+ xmlns:jx="http://apache.org/cocoon/templates/jx/1.0";
+ >
+
+ <page:title>
+ <i18n:text>Import Publication into JCR</i18n:text>
+ </page:title>
+ <page:body>
+ <div class="lenya-box">
+ <div class="lenya-box-title">
+ <i18n:text>Import Publication into JCR</i18n:text>
+ </div>
+ <div class="lenya-box-body">
+ <form method="get" action="">
+ <input type="hidden" name="lenya.continuation"
value="${continuation.id}"/>
+ <input type="hidden" name="lenya.usecase"
value="${request.getParameter('lenya.usecase')}"/>
+ <table class="lenya-table-noborder">
+ <tr>
+ <td colspan="2">
+ <jx:import uri="templates/messages.jx"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="lenya-entry-caption"><label
for="publication"><i18n:text>Publication</i18n:text>:</label></td>
+ <td>
+ <select name="publication" class="lenya-form-element">
+ <jx:forEach var="publication"
items="${usecase.getParameter('publications')}">
+ <jx:choose>
+ <jx:when
test="${publication.equals(usecase.getParameter('publication'))}">
+ <option value="${publication.getId()}"
selected="selected"><jx:out value="${publication.getId()}"/></option>
+ </jx:when>
+ <jx:otherwise>
+ <option value="${publication.getId()}"><jx:out
value="${publication.getId()}"/></option>
+ </jx:otherwise>
+ </jx:choose>
+ </jx:forEach>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td/>
+ <td>
+ <br/>
+ <input i18n:attr="value" type="submit" name="submit"
value="Import"/>
+  
+ <input i18n:attr="value" type="submit" name="cancel"
value="Cancel"/>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </div>
+ </div>
+ </page:body>
+</page:page>
\ No newline at end of file
Modified: lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl
URL:
http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl?rev=231204&r1=231203&r2=231204&view=diff
==============================================================================
--- lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl (original)
+++ lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl Wed Aug 10 02:47:10 2005
@@ -242,11 +242,11 @@
+-->
<component-instance name="ac.login" logger="lenya.ac"
class="org.apache.lenya.cms.ac.usecases.Login">
- <view template="ac/login"/>
+ <view template="usecases/ac/login.jx"/>
</component-instance>
<component-instance name="ac.logout" logger="lenya.ac"
class="org.apache.lenya.cms.ac.usecases.Logout">
- <view template="ac/logout"/>
+ <view template="usecases/ac/logout.jx"/>
</component-instance>
<!--+
@@ -254,145 +254,145 @@
+-->
<component-instance name="admin.users" logger="lenya.admin"
class="org.apache.lenya.cms.ac.usecases.Users">
- <view template="admin/users" menu="true">
+ <view template="usecases/admin/users.jx" menu="true">
<parameter name="tab" value="users"/>
</view>
<exit usecase="admin.users"/>
</component-instance>
<component-instance name="admin.user" logger="lenya.admin"
class="org.apache.lenya.cms.ac.usecases.User">
- <view template="admin/user" menu="true">
+ <view template="usecases/admin/user.jx" menu="true">
<parameter name="tab" value="users"/>
</view>
<exit usecase="admin.users"/>
</component-instance>
<component-instance name="admin.addUser" logger="lenya.admin"
class="org.apache.lenya.cms.ac.usecases.AddUser">
- <view template="admin/addUser" menu="true">
+ <view template="usecases/admin/addUser.jx" menu="true">
<parameter name="tab" value="users"/>
</view>
<exit usecase="admin.user"/>
</component-instance>
<component-instance name="admin.userProfile" logger="lenya.admin"
class="org.apache.lenya.cms.ac.usecases.UserProfile">
- <view template="admin/userProfile" menu="true">
+ <view template="usecases/admin/userProfile.jx" menu="true">
<parameter name="tab" value="users"/>
</view>
<exit usecase="admin.user"/>
</component-instance>
<component-instance name="admin.changePassword" logger="lenya.admin"
class="org.apache.lenya.cms.ac.usecases.UserPassword">
- <view template="admin/changePassword" menu="true">
+ <view template="usecases/admin/changePassword.jx" menu="true">
<parameter name="tab" value="users"/>
</view>
<exit usecase="admin.user"/>
</component-instance>
<component-instance name="admin.userGroups" logger="lenya.admin"
class="org.apache.lenya.cms.ac.usecases.UserGroups">
- <view template="admin/userGroups" menu="true">
+ <view template="usecases/admin/userGroups.jx" menu="true">
<parameter name="tab" value="users"/>
</view>
<exit usecase="admin.user"/>
</component-instance>
<component-instance name="admin.deleteUser" logger="lenya.admin"
class="org.apache.lenya.cms.ac.usecases.DeleteUser">
- <view template="admin/deleteUser" menu="true">
+ <view template="usecases/admin/deleteUser.jx" menu="true">
<parameter name="tab" value="users"/>
</view>
<exit usecase="admin.users"/>
</component-instance>
<component-instance name="admin.groups" logger="lenya.admin"
class="org.apache.lenya.cms.ac.usecases.Groups">
- <view template="admin/groups" menu="true">
+ <view template="usecases/admin/groups.jx" menu="true">
<parameter name="tab" value="groups"/>
</view>
<exit usecase="admin.groups"/>
</component-instance>
<component-instance name="admin.addGroup" logger="lenya.admin"
class="org.apache.lenya.cms.ac.usecases.AddGroup">
- <view template="admin/addGroup" menu="true">
+ <view template="usecases/admin/addGroup.jx" menu="true">
<parameter name="tab" value="groups"/>
</view>
<exit usecase="admin.group"/>
</component-instance>
<component-instance name="admin.group" logger="lenya.admin"
class="org.apache.lenya.cms.ac.usecases.Group">
- <view template="admin/group" menu="true">
+ <view template="usecases/admin/group.jx" menu="true">
<parameter name="tab" value="groups"/>
</view>
<exit usecase="admin.groups"/>
</component-instance>
<component-instance name="admin.groupProfile" logger="lenya.admin"
class="org.apache.lenya.cms.ac.usecases.GroupProfile">
- <view template="admin/groupProfile" menu="true">
+ <view template="usecases/admin/groupProfile.jx" menu="true">
<parameter name="tab" value="groups"/>
</view>
<exit usecase="admin.group"/>
</component-instance>
<component-instance name="admin.groupMembers" logger="lenya.admin"
class="org.apache.lenya.cms.ac.usecases.GroupMembers">
- <view template="admin/groupMembers" menu="true">
+ <view template="usecases/admin/groupMembers.jx" menu="true">
<parameter name="tab" value="groups"/>
</view>
<exit usecase="admin.group"/>
</component-instance>
<component-instance name="admin.deleteGroup" logger="lenya.admin"
class="org.apache.lenya.cms.ac.usecases.DeleteGroup">
- <view template="admin/deleteGroup" menu="true">
+ <view template="usecases/admin/deleteGroup.jx" menu="true">
<parameter name="tab" value="groups"/>
</view>
<exit usecase="admin.groups"/>
</component-instance>
<component-instance name="admin.ipRanges" logger="lenya.admin"
class="org.apache.lenya.cms.ac.usecases.IPRanges">
- <view template="admin/ipRanges" menu="true">
+ <view template="usecases/admin/ipRanges.jx" menu="true">
<parameter name="tab" value="ipRanges"/>
</view>
<exit usecase="admin.ipRanges"/>
</component-instance>
<component-instance name="admin.addIPRange" logger="lenya.admin"
class="org.apache.lenya.cms.ac.usecases.AddIPRange">
- <view template="admin/addIPRange" menu="true">
+ <view template="usecases/admin/addIPRange.jx" menu="true">
<parameter name="tab" value="ipRanges"/>
</view>
<exit usecase="admin.ipRanges"/>
</component-instance>
<component-instance name="admin.ipRange" logger="lenya.admin"
class="org.apache.lenya.cms.ac.usecases.IPRange">
- <view template="admin/ipRange" menu="true">
+ <view template="usecases/admin/ipRange.jx" menu="true">
<parameter name="tab" value="ipRanges"/>
</view>
<exit usecase="admin.ipRanges"/>
</component-instance>
<component-instance name="admin.ipRangeProfile" logger="lenya.admin"
class="org.apache.lenya.cms.ac.usecases.IPRangeProfile">
- <view template="admin/ipRangeProfile" menu="true">
+ <view template="usecases/admin/ipRangeProfile.jx" menu="true">
<parameter name="tab" value="ipRanges"/>
</view>
<exit usecase="admin.ipRange"/>
</component-instance>
<component-instance name="admin.ipRangeGroups" logger="lenya.admin"
class="org.apache.lenya.cms.ac.usecases.IPRangeGroups">
- <view template="admin/ipRangeGroups" menu="true">
+ <view template="usecases/admin/ipRangeGroups.jx" menu="true">
<parameter name="tab" value="ipRanges"/>
</view>
<exit usecase="admin.ipRange"/>
</component-instance>
<component-instance name="admin.deleteIPRange" logger="lenya.admin"
class="org.apache.lenya.cms.ac.usecases.DeleteIPRange">
- <view template="admin/deleteIPRange" menu="true">
+ <view template="usecases/admin/deleteIPRange.jx" menu="true">
<parameter name="tab" value="ipRanges"/>
</view>
<exit usecase="admin.ipRanges"/>
</component-instance>
<component-instance name="admin.emptyTrash" logger="lenya.admin"
class="org.apache.lenya.cms.site.usecases.EmptyTrash">
- <view template="admin/emptyTrash" menu="true">
+ <view template="usecases/admin/emptyTrash.jx" menu="true">
<parameter name="tab" value="trash"/>
</view>
<exit usecase="admin.emptyTrash"/>
</component-instance>
<component-instance name="admin.serverStatus" logger="lenya.admin"
class="org.apache.lenya.cms.usecase.DummyUsecase">
- <view template="admin/serverStatus" menu="true">
+ <view template="usecases/admin/serverStatus.jx" menu="true">
<parameter name="tab" value="serverStatus"/>
</view>
<exit usecase="admin.serverStatus"/>
</component-instance>
<component-instance name="admin.search" logger="lenya.admin"
class="org.apache.lenya.cms.usecase.DummyUsecase">
- <view template="admin/search" menu="true">
+ <view template="usecases/admin/search.jx" menu="true">
<parameter name="tab" value="search"/>
</view>
<exit usecase="admin.search"/>
</component-instance>
<component-instance name="admin.sessions" logger="lenya.admin"
class="org.apache.lenya.cms.ac.usecases.SessionViewer">
- <view template="admin/sessions" menu="true">
+ <view template="usecases/admin/sessions.jx" menu="true">
<parameter name="tab" value="sessions"/>
</view>
<exit usecase="admin.sessions"/>
</component-instance>
<component-instance name="admin.siteOverview" logger="lenya.admin"
class="org.apache.lenya.cms.site.usecases.SiteOverview">
- <view template="admin/siteOverview" menu="true">
+ <view template="usecases/admin/siteOverview.jx" menu="true">
<parameter name="tab" value="siteOverview"/>
</view>
<exit usecase="admin.siteOverview"/>
@@ -403,7 +403,7 @@
+-->
<component-instance name="search.search" logger="lenya.search"
class="org.apache.lenya.cms.search.usecases.Search">
- <view template="search/search"/>
+ <view template="usecases/search/search.jx"/>
</component-instance>
<!--+
@@ -411,79 +411,79 @@
+-->
<component-instance name="site.create" logger="lenya.site"
class="org.apache.lenya.cms.site.usecases.CreateDocument">
- <view template="site/create"/>
+ <view template="usecases/site/create.jx"/>
</component-instance>
<component-instance name="site.createLanguage" logger="lenya.site"
class="org.apache.lenya.cms.site.usecases.CreateLanguage">
- <view template="site/createLanguage"/>
+ <view template="usecases/site/createLanguage.jx"/>
</component-instance>
<component-instance name="site.delete" logger="lenya.site"
class="org.apache.lenya.cms.site.usecases.Delete">
- <view template="site/delete"/>
+ <view template="usecases/site/delete.jx"/>
</component-instance>
<component-instance name="site.deleteLanguage" logger="lenya.site"
class="org.apache.lenya.cms.site.usecases.DeleteLanguage">
- <view template="site/deleteLanguage"/>
+ <view template="usecases/site/deleteLanguage.jx"/>
</component-instance>
<component-instance name="site.changeLabel" logger="lenya.site"
class="org.apache.lenya.cms.site.usecases.ChangeLabel">
- <view template="site/changeLabel"/>
+ <view template="usecases/site/changeLabel.jx"/>
</component-instance>
<component-instance name="site.changeNodeID" logger="lenya.site"
class="org.apache.lenya.cms.site.usecases.ChangeNodeID">
- <view template="site/changeNodeID"/>
+ <view template="usecases/site/changeNodeID.jx"/>
</component-instance>
<component-instance name="site.cut" logger="lenya.site"
class="org.apache.lenya.cms.site.usecases.Cut">
- <view template="site/cut"/>
+ <view template="usecases/site/cut.jx"/>
</component-instance>
<component-instance name="site.copy" logger="lenya.site"
class="org.apache.lenya.cms.site.usecases.Copy">
- <view template="site/copy"/>
+ <view template="usecases/site/copy.jx"/>
</component-instance>
<component-instance name="site.paste" logger="lenya.site"
class="org.apache.lenya.cms.site.usecases.Paste">
- <view template="site/paste"/>
+ <view template="usecases/site/paste.jx"/>
</component-instance>
<component-instance name="site.archive" logger="lenya.site"
class="org.apache.lenya.cms.site.usecases.Archive">
- <view template="site/archive"/>
+ <view template="usecases/site/archive.jx"/>
</component-instance>
<component-instance name="site.restore" logger="lenya.site"
class="org.apache.lenya.cms.site.usecases.Restore">
- <view template="site/restore"/>
+ <view template="usecases/site/restore.jx"/>
</component-instance>
<component-instance name="tab.acArchive" logger="lenya.site"
class="org.apache.lenya.cms.ac.usecases.AccessControl">
- <view template="tab/acArchive" menu="true"/>
+ <view template="usecases/tab/acArchive.jx" menu="true"/>
<exit usecase="tab.acArchive"/>
</component-instance>
<component-instance name="tab.acAuthoring" logger="lenya.site"
class="org.apache.lenya.cms.ac.usecases.AccessControl">
- <view template="tab/acAuthoring" menu="true"/>
+ <view template="usecases/tab/acAuthoring.jx" menu="true"/>
<parameter name="acArea" value="authoring"/>
<exit usecase="tab.acAuthoring"/>
</component-instance>
<component-instance name="tab.acLive" logger="lenya.site"
class="org.apache.lenya.cms.ac.usecases.AccessControl">
- <view template="tab/acLive" menu="true"/>
+ <view template="usecases/tab/acLive.jx" menu="true"/>
<parameter name="acArea" value="live"/>
<exit usecase="tab.acLive"/>
</component-instance>
<component-instance name="tab.acTrash" logger="lenya.site"
class="org.apache.lenya.cms.ac.usecases.AccessControl">
- <view template="tab/acTrash" menu="true"/>
+ <view template="usecases/tab/acTrash.jx" menu="true"/>
<exit usecase="tab.acTrash"/>
</component-instance>
<component-instance name="tab.assets" logger="lenya.site"
class="org.apache.lenya.cms.site.usecases.Assets">
- <view template="tab/assets" menu="true"/>
+ <view template="usecases/tab/assets.jx" menu="true"/>
<exit usecase="tab.assets"/>
</component-instance>
<component-instance name="tab.meta" logger="lenya.site"
class="org.apache.lenya.cms.metadata.usecases.Metadata">
- <view template="tab/meta" menu="true"/>
+ <view template="usecases/tab/meta.jx" menu="true"/>
<exit usecase="tab.meta"/>
</component-instance>
<component-instance name="tab.overview" logger="lenya.site"
class="org.apache.lenya.cms.site.usecases.Overview">
- <view template="tab/overview" menu="true"/>
+ <view template="usecases/tab/overview.jx" menu="true"/>
<exit usecase="tab.overview"/>
</component-instance>
<component-instance name="tab.revisions" logger="lenya.site"
class="org.apache.lenya.cms.site.usecases.Revisions">
- <view template="tab/revisions" menu="true"/>
+ <view template="usecases/tab/revisions.jx" menu="true"/>
<exit usecase="tab.revisions"/>
</component-instance>
<component-instance name="tab.workflow" logger="lenya.site"
class="org.apache.lenya.cms.workflow.usecases.History">
- <view template="tab/workflow" menu="true"/>
+ <view template="usecases/tab/workflow.jx" menu="true"/>
<exit usecase="tab.workflow"/>
</component-instance>
<component-instance name="tab.scheduler" logger="lenya.site"
class="org.apache.lenya.cms.usecase.scheduling.ManageJobs">
- <view template="tab/scheduler" menu="true"/>
+ <view template="usecases/tab/scheduler.jx" menu="true"/>
<exit usecase="tab.scheduler"/>
</component-instance>
@@ -498,7 +498,7 @@
</component-instance>
<component-instance name="edit.insertImage" logger="lenya.publication"
class="org.apache.lenya.cms.editors.InsertAsset">
- <view template="edit/insertAsset" menu="false">
+ <view template="usecases/edit/insertAsset.jx" menu="false">
<parameter name="callbackFunction" value="insertImage"/>
</view>
<parameter name="mimeTypePrefix" value="image/"/>
@@ -506,7 +506,7 @@
</component-instance>
<component-instance name="edit.insertAsset" logger="lenya.publication"
class="org.apache.lenya.cms.editors.InsertAsset">
- <view template="edit/insertAsset" menu="false">
+ <view template="usecases/edit/insertAsset.jx" menu="false">
<parameter name="callbackFunction" value="insertAsset"/>
</view>
<parameter name="asset-usecase" value="tab.assets"/>
@@ -514,28 +514,24 @@
<component-instance name="edit.forms" logger="lenya.publication"
class="org.apache.lenya.cms.editors.forms.FormsEditor">
<transaction policy="pessimistic"/>
- <view template="edit/forms/forms" menu="false"/>
+ <view template="usecases/edit/forms/forms.jx" menu="false"/>
</component-instance>
<component-instance name="edit.oneform" logger="lenya.publication"
class="org.apache.lenya.cms.editors.forms.OneFormEditor">
<transaction policy="pessimistic"/>
- <view template="edit/forms/oneform" menu="false"/>
+ <view template="usecases/edit/forms/oneform.jx" menu="false"/>
</component-instance>
<component-instance name="edit.bxe" logger="lenya.publication"
class="org.apache.lenya.cms.editors.bxe.BXE">
<transaction policy="pessimistic"/>
- <view template="edit/bxe/bxe" menu="false"/>
+ <view template="usecases/edit/bxe/bxe.jx" menu="false"/>
</component-instance>
<component-instance name="edit.kupu" logger="lenya.publication"
class="org.apache.lenya.cms.editors.kupu.Kupu">
<transaction policy="pessimistic"/>
- <view template="edit/kupu/kupu" menu="false"/>
- </component-instance>
- <component-instance name="jcr.import" logger="lenya.jcr"
- class="org.apache.lenya.cms.jcr.usecases.Import">
- <view template="jcr/import" menu="false"/>
+ <view template="usecases/edit/kupu/kupu.jx" menu="false"/>
</component-instance>
</usecases>
Modified: lenya/trunk/src/webapp/lenya/usecases/usecase.xmap
URL:
http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/usecase.xmap?rev=231204&r1=231203&r2=231204&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/usecase.xmap (original)
+++ lenya/trunk/src/webapp/lenya/usecases/usecase.xmap Wed Aug 10 02:47:10 2005
@@ -47,7 +47,7 @@
-->
<map:match pattern="view/*/**" internal-only="true">
- <map:generate type="jx" src="fallback://lenya/usecases/{2}.jx"/>
+ <map:generate type="jx" src="fallback://lenya/{2}"/>
<map:transform type="cinclude"/>
<map:transform type="i18n">
<map:parameter name="locale" value="{request:locale}"/>
|
