Author: andreas
Date: Mon Sep 18 08:08:14 2006
New Revision: 447426
URL: http://svn.apache.org/viewvc?view=rev&rev=447426
Log:
Use prefixes for dublin core parameters on create screen. This fixes bug 40452.
Modified:
lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java
lenya/trunk/src/modules-core/sitemanagement/usecases/site/create.jx
lenya/trunk/src/modules-core/sitemanagement/usecases/site/createLanguage.jx
Modified:
lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java
URL:
http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java?view=diff&rev=447426&r1=447425&r2=447426
==============================================================================
---
lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java
(original)
+++
lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java
Mon Sep 18 08:08:14 2006
@@ -103,7 +103,7 @@
* @see
org.apache.lenya.cms.usecase.AbstractUsecase#doCheckExecutionConditions()
*/
protected void doCheckExecutionConditions() throws Exception {
- String navigationTitle =
getParameterAsString(DublinCore.ELEMENT_TITLE);
+ String navigationTitle =
getDublinCoreParameter(DublinCore.ELEMENT_TITLE);
if (navigationTitle.equals("")) {
addErrorMessage("The navigation title is required.");
}
@@ -158,12 +158,12 @@
String sampleUri = resourceType.getSampleURI(sample);
document = documentManager.add(getDocumentFactory(),
resourceType, sampleUri,
getPublication(), getArea(), getNewDocumentPath(),
language,
- getSourceExtension(),
getParameterAsString(DublinCore.ELEMENT_TITLE),
+ getSourceExtension(),
getDublinCoreParameter(DublinCore.ELEMENT_TITLE),
getVisibleInNav());
} else {
document = documentManager.add(initialDocument, getArea(),
getNewDocumentPath(), language,
getSourceExtension(),
- getParameterAsString(DublinCore.ELEMENT_TITLE),
getVisibleInNav());
+ getDublinCoreParameter(DublinCore.ELEMENT_TITLE),
getVisibleInNav());
}
}
@@ -184,6 +184,14 @@
}
}
}
+
+ protected String getDublinCoreParameter(String name) {
+ return getParameterAsString(DUBLIN_CORE_PREFIX + name, null);
+ }
+
+ protected void setDublinCoreParameter(String name, String value) {
+ setParameter(DUBLIN_CORE_PREFIX + name, value);
+ }
protected abstract boolean createVersion();
@@ -216,6 +224,8 @@
* @return The type of the created document.
*/
protected abstract String getDocumentTypeName();
+
+ protected static final String DUBLIN_CORE_PREFIX = "dublincore.";
/**
* Sets the meta data of the created document.
@@ -232,7 +242,7 @@
String[] dcKeys = dcMetaData.getAvailableKeys();
for (int i=0; i < dcKeys.length; i++) {
- String param = getParameterAsString(dcKeys[i], null);
+ String param = getDublinCoreParameter(dcKeys[i]);
if (param != null) {
dcMetaData.setValue(dcKeys[i], param);
}
@@ -252,13 +262,13 @@
Identity identity = (Identity)
session.getAttribute(Identity.class.getName());
User user = identity.getUser();
if (user != null) {
- setParameter(DublinCore.ELEMENT_CREATOR, user.getId());
+ setDublinCoreParameter(DublinCore.ELEMENT_CREATOR, user.getId());
} else {
- setParameter(DublinCore.ELEMENT_CREATOR, "");
+ setDublinCoreParameter(DublinCore.ELEMENT_CREATOR, "");
}
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- setParameter(DublinCore.ELEMENT_DATE, format.format(new
GregorianCalendar().getTime()));
+ setDublinCoreParameter(DublinCore.ELEMENT_DATE, format.format(new
GregorianCalendar().getTime()));
String doctypeName = getDocumentTypeName();
if (doctypeName != null) {
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=447426&r1=447425&r2=447426
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/site/create.jx
(original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/site/create.jx Mon Sep
18 08:08:14 2006
@@ -69,9 +69,10 @@
</jx:choose>
<tr>
<td class="lenya-entry-caption">
- <label for="title"><i18n:text>Navigation Title</i18n:text>*:
</label></td>
+ <label for="dublincore.title"><i18n:text>Navigation
Title</i18n:text>*: </label></td>
<td>
- <input class="lenya-form-element" type="text" name="title"
value="${usecase.getParameter('title')}"/>
+ <input class="lenya-form-element" type="text"
+ name="dublincore.title"
value="${usecase.getParameter('dublincore.title')}"/>
</td>
</tr>
<tr>
@@ -141,37 +142,37 @@
</jx:choose>
<tr>
<td class="lenya-entry-caption">
- <label
for="creator"><i18n:text>Creator</i18n:text>:</label></td>
+ <label
for="dublincore.creator"><i18n:text>Creator</i18n:text>:</label></td>
<td>
- <input class="lenya-form-element" type="text" name="creator"
value="${usecase.getParameter('creator')}"/>
+ <input class="lenya-form-element" type="text"
name="dublincore.creator"
value="${usecase.getParameter('dublincore.creator')}"/>
</td>
</tr>
<tr>
<td class="lenya-entry-caption">
- <label
for="subject"><i18n:text>Subject</i18n:text>:</label></td>
+ <label
for="dublincore.subject"><i18n:text>Subject</i18n:text>:</label></td>
<td>
- <input class="lenya-form-element" type="text" name="subject"
value="${usecase.getParameter('subject')}"/>
+ <input class="lenya-form-element" type="text"
name="dublincore.subject"
value="${usecase.getParameter('dublincore.subject')}"/>
</td>
</tr>
<tr>
<td class="lenya-entry-caption">
- <label
for="publisher"><i18n:text>Publisher</i18n:text>:</label></td>
+ <label
for="dublincore.publisher"><i18n:text>Publisher</i18n:text>:</label></td>
<td>
- <input class="lenya-form-element" type="text" name="publisher"
value="${usecase.getParameter('publisher')}"/>
+ <input class="lenya-form-element" type="text"
name="dublincore.publisher"
value="${usecase.getParameter('dublincore.publisher')}"/>
</td>
</tr>
<tr>
<td class="lenya-entry-caption">
<i18n:text>Date</i18n:text>:</td>
<td>
- <jx:out value="${usecase.getParameter('date')}"/>
+ <jx:out value="${usecase.getParameter('dublincore.date')}"/>
</td>
</tr>
<tr>
<td class="lenya-entry-caption">
- <label for="rights"><i18n:text>Rights</i18n:text>:</label></td>
+ <label
for="dublincore.rights"><i18n:text>Rights</i18n:text>:</label></td>
<td>
- <input class="lenya-form-element" type="text" name="rights"
value="${usecase.getParameter('rights')}"/>
+ <input class="lenya-form-element" type="text"
name="dublincore.rights" value="${usecase.getParameter('dublincore.rights')}"/>
</td>
</tr>
<tr>
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=447426&r1=447425&r2=447426
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/usecases/site/createLanguage.jx
(original)
+++ lenya/trunk/src/modules-core/sitemanagement/usecases/site/createLanguage.jx
Mon Sep 18 08:08:14 2006
@@ -38,16 +38,16 @@
<table class="lenya-table-noborder">
<tr>
<td class="lenya-entry-caption">
- <i18n:text>Document ID</i18n:text>: </td>
+ <i18n:text>Document Path</i18n:text>: </td>
<td>
- <jx:out value="${usecase.getParameter('documentId')}"/>
- <br/> (<i18n:text>No whitespace, no special
characters</i18n:text>)</td>
+ <jx:out value="${usecase.getParameter('path')}"/>
+ </td>
</tr>
<tr>
<td class="lenya-entry-caption">
- <label for="title"><i18n:text>Navigation Title</i18n:text>*:
</label></td>
+ <label for="dublincore.title"><i18n:text>Navigation
Title</i18n:text>*: </label></td>
<td>
- <input class="lenya-form-element" type="text" name="title"
value="${usecase.getParameter('title')}"/>
+ <input class="lenya-form-element" type="text"
name="dublincore.title" value="${usecase.getParameter('dublincore.title')}"/>
</td>
</tr>
<tr>
@@ -63,37 +63,37 @@
</tr>
<tr>
<td class="lenya-entry-caption">
- <label
for="creator"><i18n:text>Creator</i18n:text>:</label></td>
+ <label
for="dublincore.creator"><i18n:text>Creator</i18n:text>:</label></td>
<td>
- <input class="lenya-form-element" type="text" name="creator"
value="${usecase.getParameter('creator')}"/>
+ <input class="lenya-form-element" type="text"
name="dublincore.creator"
value="${usecase.getParameter('dublincore.creator')}"/>
</td>
</tr>
<tr>
<td class="lenya-entry-caption">
- <label
for="subject"><i18n:text>Subject</i18n:text>:</label></td>
+ <label
for="dublincore.subject"><i18n:text>Subject</i18n:text>:</label></td>
<td>
- <input class="lenya-form-element" type="text" name="subject"
value="${usecase.getParameter('subject')}"/>
+ <input class="lenya-form-element" type="text"
name="dublincore.subject"
value="${usecase.getParameter('dublincore.subject')}"/>
</td>
</tr>
<tr>
<td class="lenya-entry-caption">
- <label
for="publisher"><i18n:text>Publisher</i18n:text>:</label></td>
+ <label
for="dublincore.publisher"><i18n:text>Publisher</i18n:text>:</label></td>
<td>
- <input class="lenya-form-element" type="text"
name="publisher" value="${usecase.getParameter('publisher')}"/>
+ <input class="lenya-form-element" type="text"
name="dublincore.publisher"
value="${usecase.getParameter('dublincore.publisher')}"/>
</td>
</tr>
<tr>
<td class="lenya-entry-caption">
<i18n:text>Date</i18n:text>:</td>
<td>
- <jx:out value="${usecase.getParameter('date')}"/>
+ <jx:out value="${usecase.getParameter('dublincore.date')}"/>
</td>
</tr>
<tr>
<td class="lenya-entry-caption">
- <label
for="rights"><i18n:text>Rights</i18n:text>:</label></td>
+ <label
for="dublincore.rights"><i18n:text>Rights</i18n:text>:</label></td>
<td>
- <input class="lenya-form-element" type="text" name="rights"
value="${usecase.getParameter('rights')}"/>
+ <input class="lenya-form-element" type="text"
name="dublincore.rights" value="${usecase.getParameter('dublincore.rights')}"/>
</td>
</tr>
<tr>
|
