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/04/16 12:45:32 UTC
svn commit: r529195 - in /lenya/trunk/src:
impl/java/org/apache/lenya/cms/publication/
java/org/apache/lenya/cms/publication/ modules-core/ac/usecases/
modules-core/acusecases/java/src/org/apache/lenya/cms/ac/usecases/
pubs/default/config/ webapp/lenya...
Author: andreas
Date: Mon Apr 16 03:45:27 2007
New Revision: 529195
URL: http://svn.apache.org/viewvc?view=rev&rev=529195
Log:
Added Publication.getName(), use it on the login screen
Modified:
lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/PublicationConfiguration.java
lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/PublicationImpl.java
lenya/trunk/src/java/org/apache/lenya/cms/publication/Publication.java
lenya/trunk/src/modules-core/ac/usecases/login.jx
lenya/trunk/src/modules-core/acusecases/java/src/org/apache/lenya/cms/ac/usecases/Login.java
lenya/trunk/src/pubs/default/config/publication.xconf
lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml
Modified: lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/PublicationConfiguration.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/PublicationConfiguration.java?view=diff&rev=529195&r1=529194&r2=529195
==============================================================================
--- lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/PublicationConfiguration.java (original)
+++ lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/PublicationConfiguration.java Mon Apr 16 03:45:27 2007
@@ -37,6 +37,7 @@
public class PublicationConfiguration extends AbstractLogEnabled implements Publication {
private String id;
+ private String name;
private File servletContext;
private DocumentIdToPathMapper mapper = null;
private ArrayList languages = new ArrayList();
@@ -136,6 +137,8 @@
try {
config = builder.buildFromFile(configFile);
+
+ this.name = config.getChild(ELEMENT_NAME).getValue();
try {
// one sanity check for the proper namespace. we should really do that for every element,
@@ -532,6 +535,11 @@
public DocumentBuilder getDocumentBuilder() {
return null;
+ }
+
+ public String getName() {
+ loadConfiguration();
+ return this.name;
}
}
Modified: lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/PublicationImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/PublicationImpl.java?view=diff&rev=529195&r1=529194&r2=529195
==============================================================================
--- lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/PublicationImpl.java (original)
+++ lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/PublicationImpl.java Mon Apr 16 03:45:27 2007
@@ -213,4 +213,8 @@
return getId();
}
+ public String getName() {
+ return delegate.getName();
+ }
+
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/Publication.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/publication/Publication.java?view=diff&rev=529195&r1=529194&r2=529195
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/Publication.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/Publication.java Mon Apr 16 03:45:27 2007
@@ -88,6 +88,11 @@
* @return A string value.
*/
String getId();
+
+ /**
+ * @return The name of the publication as specified in the configuration file.
+ */
+ String getName();
/**
* Returns the servlet context this publication belongs to (usually, the
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=529195&r1=529194&r2=529195
==============================================================================
--- lenya/trunk/src/modules-core/ac/usecases/login.jx (original)
+++ lenya/trunk/src/modules-core/ac/usecases/login.jx Mon Apr 16 03:45:27 2007
@@ -23,7 +23,7 @@
xmlns="http://www.w3.org/1999/xhtml"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1" >
- <jx:set var="pubId" value="${usecase.getParameterAsString('publicationId')}"/>
+ <jx:set var="pub" value="${usecase.getParameter('publication')}"/>
<page:title>
<jx:choose>
@@ -33,7 +33,7 @@
<jx:otherwise>
<i18n:translate>
<i18n:text i18n:key="login-to-pub"/>
- <i18n:param><jx:out value="${pubId.toUpperCase()}"/></i18n:param>
+ <i18n:param><jx:out value="${pub.getName()}"/></i18n:param>
</i18n:translate>
</jx:otherwise>
</jx:choose>
@@ -58,7 +58,7 @@
</jx:if>
<jx:choose>
- <jx:when test="${pubId.equals('default')}">
+ <jx:when test="${pub.getId().equals('default')}">
<p>
<strong> <i18n:text>NOTE</i18n:text>: </strong>
<i18n:translate>
@@ -70,7 +70,7 @@
</i18n:translate>
</p>
</jx:when>
- <jx:when test="${pubId.equals('blog')}">
+ <jx:when test="${pub.getId().equals('blog')}">
<p>
<strong> <i18n:text>NOTE</i18n:text>: </strong>
<i18n:translate>
Modified: lenya/trunk/src/modules-core/acusecases/java/src/org/apache/lenya/cms/ac/usecases/Login.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/acusecases/java/src/org/apache/lenya/cms/ac/usecases/Login.java?view=diff&rev=529195&r1=529194&r2=529195
==============================================================================
--- lenya/trunk/src/modules-core/acusecases/java/src/org/apache/lenya/cms/ac/usecases/Login.java (original)
+++ lenya/trunk/src/modules-core/acusecases/java/src/org/apache/lenya/cms/ac/usecases/Login.java Mon Apr 16 03:45:27 2007
@@ -38,7 +38,7 @@
protected static final String PASSWORD = "password";
protected static final String USERNAME = "username";
protected static final String REFERRER_QUERY_STRING = "referrerQueryString";
- protected static final String PUBLICATION_ID = "publicationId";
+ protected static final String PUBLICATION = "publication";
protected static final String CURRENT_USER = "currentUser";
/**
@@ -53,7 +53,7 @@
publication = PublicationUtil.getPublicationFromUrl(this.manager, getDocumentFactory(),
getSourceURL());
if (publication.exists()) {
- setParameter(PUBLICATION_ID, publication.getId());
+ setParameter(PUBLICATION, publication);
}
Identity identity = this.getSession().getIdentity();
if (identity != null && identity.getUser() != null) {
Modified: lenya/trunk/src/pubs/default/config/publication.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/config/publication.xconf?view=diff&rev=529195&r1=529194&r2=529195
==============================================================================
--- lenya/trunk/src/pubs/default/config/publication.xconf (original)
+++ lenya/trunk/src/pubs/default/config/publication.xconf Mon Apr 16 03:45:27 2007
@@ -20,7 +20,7 @@
<publication xmlns="http://apache.org/cocoon/lenya/publication/1.1" >
- <name>Default Publication</name>
+ <name>Default</name>
<description>This publication is a best practice, getting started publication.</description>
<!-- the @...@ macros are evaluated by ant at build time -->
<version>@lenya.version@</version>
Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml?view=diff&rev=529195&r1=529194&r2=529195
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml Mon Apr 16 03:45:27 2007
@@ -112,7 +112,7 @@
<message key="publish complete subtree">den gesamten Teilbaum veröffentlichen</message>
<!-- logn screen -->
- <message key="login-to-pub">Anmelden an {0} Publikation</message>
+ <message key="login-to-pub">Anmelden an der {0}-Publikation</message>
<message key="Login">Anmelden</message>
<message key="Password">Passwort</message>
<message key="Username">Benutzername</message>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org