Merge branch 'master' into boost-client

wyona · Sep 20, 2012 · 1bafc0b · 1bafc0b
2 parents 15f2f5c + 1ce9b1d
commit 1bafc0b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...ces/navigation/src/java/org/wyona/yanel/impl/resources/navigation/NavigationResource.java b/...ces/navigation/src/java/org/wyona/yanel/impl/resources/navigation/NavigationResource.java
@@ -115,7 +115,7 @@ public View getView(String viewId, String revisionName) throws Exception {
             log.warn("No current path set, hence use request path: " + currentPath);
         }
         if (activePath == null) {
-            log.warn("No active path set explicitely, hence use current path: " + currentPath);
+            log.info("No active path set explicitely, hence use current path: " + currentPath);
             activePath = currentPath;
         }
 

diff --git a/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java b/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
@@ -639,10 +639,10 @@ private void getContent(HttpServletRequest request, HttpServletResponse response
                                 // TODO: Make this configurable per resource (or rather workflowable interface) or per realm?!
                                 if (displayMostRecentVersion) {
                                     // INFO: Because of backwards compatibility the default should display the most recent version
-                                    log.warn("Instead the live version, the most recent version will be displayed!");
+                                    log.warn("Instead a live/published version, the most recent version will be displayed!");
                                     view = ((ViewableV2) res).getView(viewId);
                                 } else {
-                                    log.warn("Instead the live version, a 404 will be displayed!");
+                                    log.warn("Instead a live/published version, a 404 will be displayed!");
                                     // TODO: Instead a 404 one might want to show a different kind of screen
                                     do404(request, response, doc, message);
                                     return;