svn commit: r611198 - in /lenya/trunk/src: impl/java/org/apache/lenya/cms/publication/PublicationConfiguration.java pubs/default/java/src/org/apache/lenya/defaultpub/cms/publication/templating/Instantiator.java

Author: andreas
Date: Fri Jan 11 07:06:38 2008
New Revision: 611198

URL: http://svn.apache.org/viewvc?rev=611198&view=rev
Log:
Use pub ID instead of 'New Publication' for missing pub names.

Modified:
    lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/PublicationConfiguration.java
    lenya/trunk/src/pubs/default/java/src/org/apache/lenya/defaultpub/cms/publication/templating/Instantiator.java

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?rev=611198&r1=611197&r2=611198&view=diff
==============================================================================
--- 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 Fri Jan 11 07:06:38 2008
@@ -140,7 +140,7 @@
             if (pubName == null) {
                 getLogger().warn("No publication name set for publication [" + getId() +
                         "], using default name.");
-                this.name = "New Publication";
+                this.name = getId();
             }
             else {
                 this.name = pubName;

Modified: lenya/trunk/src/pubs/default/java/src/org/apache/lenya/defaultpub/cms/publication/templating/Instantiator.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/java/src/org/apache/lenya/defaultpub/cms/publication/templating/Instantiator.java?rev=611198&r1=611197&r2=611198&view=diff
==============================================================================
--- lenya/trunk/src/pubs/default/java/src/org/apache/lenya/defaultpub/cms/publication/templating/Instantiator.java (original)
+++ lenya/trunk/src/pubs/default/java/src/org/apache/lenya/defaultpub/cms/publication/templating/Instantiator.java Fri Jan 11 07:06:38 2008
@@ -101,7 +101,7 @@
         Assert.notNull("name", name);
         
         if (name.equals("")) {
-            name = "New Publication";
+            name = newPublicationId;
         }
 
         SourceResolver resolver = null;