[Yanel-commits] rev 46929 - public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet

[michi at wyona.com]

Author: michi
Date: 2010-01-07 10:48:56 +0100 (Thu, 07 Jan 2010)
New Revision: 46929

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
revision name clarified

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2010-01-07 09:42:09 UTC (rev 46928)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2010-01-07 09:48:56 UTC (rev 46929)
@@ -133,7 +133,7 @@
     public static final String YANEL_USECASE = "yanel.usecase";
     public static final String YANEL_RESOURCE = "yanel.resource";
     public static final String YANEL_RESOURCE_USECASE = YANEL_RESOURCE + ".usecase";
-    public static final String YANEL_RESOURCE_REVN = YANEL_RESOURCE + ".revision";
+    public static final String YANEL_RESOURCE_REVISION = YANEL_RESOURCE + ".revision";
     public static final String YANEL_RESOURCE_WORKFLOW_TRANSITION = YANEL_RESOURCE + ".workflow.transition";
     public static final String YANEL_RESOURCE_WORKFLOW_TRANSITION_OUTPUT = YANEL_RESOURCE_WORKFLOW_TRANSITION + ".output";
     public static final String VIEW_ID_PARAM_NAME = "yanel.resource.viewid";
@@ -276,7 +276,7 @@
         if (transition != null) {
             executeWorkflowTransition(request,
                                       response,
-                                      request.getParameter(YANEL_RESOURCE_REVN),
+                                      request.getParameter(YANEL_RESOURCE_REVISION),
                                       transition);
             return;
         }
@@ -321,7 +321,7 @@
                 return;
             } else if (value != null && value.equals("roll-back")) {
                 log.debug("Roll back ...");
-                org.wyona.yanel.core.util.VersioningUtil.rollBack(resource, request.getParameter(YANEL_RESOURCE_REVN), getIdentity(request, map).getUsername());
+                org.wyona.yanel.core.util.VersioningUtil.rollBack(resource, request.getParameter(YANEL_RESOURCE_REVISION), getIdentity(request, map).getUsername());
                 // TODO: Send confirmation screen
                 getContent(request, response);
                 return;
@@ -447,7 +447,7 @@
 
                     String viewId = request.getParameter(VIEW_ID_PARAM_NAME);
                     try {
-                        String revisionName = request.getParameter(YANEL_RESOURCE_REVN);
+                        String revisionName = request.getParameter(YANEL_RESOURCE_REVISION);
                         // NOTE: Check also if usecase is not roll-back, because roll-back is also using the yanel.resource.revision
                         if (revisionName != null && ResourceAttributeHelper.hasAttributeImplemented(res, "Versionable", "2") && !isRollBack(request)) {
                             view = ((VersionableV2) res).getView(viewId, revisionName);
@@ -633,7 +633,7 @@
         if (transition != null) {
             executeWorkflowTransition(request,
                                       response,
-                                      request.getParameter(YANEL_RESOURCE_REVN),
+                                      request.getParameter(YANEL_RESOURCE_REVISION),
                                       transition);
             return;
         }
@@ -1047,6 +1047,8 @@
                 } else {
                     log.warn("SSL does not seem to be configured!");
                 }
+            } else {
+                log.info("This connection is via SSL.");
             }
 
             if(doAuthenticate(request, response) != null) {