Getting ready for release

Author: gaynor@illinois.edu

.idea/workspace.xml

@@ -32,7 +32,7 @@
          <dependency>
              <groupId>commons-codec</groupId>
              <artifactId>commons-codec</artifactId>
-             <version>1.10</version>
+             <version>1.11</version>
          </dependency>
          <dependency>
              <groupId>javax.inject</groupId>

core/pom.xml

@@ -52,7 +52,7 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.10</version>
+            <version>1.11</version>
         </dependency>
     </dependencies>
 </project>

crypto/pom.xml

@@ -13,7 +13,10 @@
 public class ServletDebugUtil extends DebugUtil {
 
     public static  void printAllParameters(Class klasse, HttpServletRequest request) {
-        if(!isEnabled()) {return;}
+            printAllParameters(klasse,request,isEnabled());
+    }
+    public static  void printAllParameters(Class klasse, HttpServletRequest request, boolean printIt) {
+        if(!printIt) {return;}
           String reqUrl = request.getRequestURL().toString();
           String queryString = request.getQueryString();   // d=789
           if (queryString != null) {
@@ -59,5 +62,4 @@ public static  void printAllParameters(Class klasse, HttpServletRequest request)
           }
       }
 
-
 }

servlet/src/main/java/edu/uiuc/ncsa/security/servlet/ServletDebugUtil.java

@@ -67,7 +67,7 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.10</version>
+            <version>1.11</version>
         </dependency>
         <dependency>
             <groupId>commons-cli</groupId>

util/pom.xml

@@ -189,8 +189,16 @@ protected String doRepeatCommand(String cmdLine) {
             say(REPEAT_LAST_COMMAND + " = repeat the last command. Identical to " + HISTORY_LIST_COMMAND + " 0");
             return null;
         }
+        cmdLine = cmdLine.substring(REPEAT_LAST_COMMAND.length());
         if (0 < commandHistory.size()) {
-            return commandHistory.get(0);
+            String current = commandHistory.get(0);
+            if(cmdLine.trim().length() == 0){
+                return current;
+            }
+            current = current + " " + cmdLine;
+            commandHistory.add(0, current);
+            return current;
+            //return commandHistory.get(0) + " " + cmdLine;
         }
         say("no commands found");
         return null;
@@ -215,10 +223,23 @@ protected String doHistory(String cmdLine) {
         if (st.hasMoreTokens()) {
             try {
                 int lineNo = Integer.parseInt(st.nextToken());
+                String rest = "";
+                while(st.hasMoreTokens()){
+                    rest = rest + " " + st.nextToken();
+                }
+
                 // allow signed command history numbers. so /h -1 is ok.
                 lineNo = lineNo <0 ? (commandHistory.size() + lineNo): lineNo;
-                if (0 <= lineNo && lineNo < commandHistory.size()) {
-                    return commandHistory.get(lineNo);
+                if(rest.trim().length() == 0){
+                    if (0 <= lineNo && lineNo < commandHistory.size()) {
+                        return commandHistory.get(lineNo);
+                    }
+                }else{
+                    if (0 <= lineNo && lineNo < commandHistory.size()) {
+                        String current = commandHistory.get(lineNo) + rest;
+                        commandHistory.add(0, current);
+                        return current;
+                    }
                 }
             } catch (Throwable t) {
                 // do nothing, just print out the history.