Renamed SshContext->SshCommandContext for clarity of purpose

diff --git a/src/main/java/com/gitblit/transport/ssh/SshCommandContext.java b/src/main/java/com/gitblit/transport/ssh/SshCommandContext.java
new file mode 100644 (file)
index 0000000..de79dac
--- /dev/null
+++ b/src/main/java/com/gitblit/transport/ssh/SshCommandContext.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2014 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gitblit.transport.ssh;
+
+public class SshCommandContext {
+
+       private final SshDaemonClient client;
+       private final String commandLine;
+
+       public SshCommandContext(SshDaemonClient client, String commandLine) {
+               this.client = client;
+               this.commandLine = commandLine;
+       }
+
+       public SshDaemonClient getClient() {
+               return client;
+       }
+
+       public String getCommandLine() {
+               return commandLine;
+       }
+}

diff --git a/src/main/java/com/gitblit/transport/ssh/SshCommandFactory.java b/src/main/java/com/gitblit/transport/ssh/SshCommandFactory.java
index a52e62b89a8f223d1c81b77b654a70cc5d0ed394..788bdfb3376e2aee7ec5e353622b0e910572c37a 100644 (file)
--- a/src/main/java/com/gitblit/transport/ssh/SshCommandFactory.java
+++ b/src/main/java/com/gitblit/transport/ssh/SshCommandFactory.java
@@ -133,7 +133,7 @@ public class SshCommandFactory implements CommandFactory {
 
            private void onStart() throws IOException {
              synchronized (this) {
-                   SshContext ctx = new SshContext(session.getAttribute(SshDaemonClient.KEY), cmdLine);
+                   SshCommandContext ctx = new SshCommandContext(session.getAttribute(SshDaemonClient.KEY), cmdLine);
                try {
                  cmd = dispatcher;
                  cmd.setArguments(argv);

diff --git a/src/main/java/com/gitblit/transport/ssh/SshContext.java b/src/main/java/com/gitblit/transport/ssh/SshContext.java
deleted file mode 100644 (file)
index 4c5786e..0000000
--- a/src/main/java/com/gitblit/transport/ssh/SshContext.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2014 gitblit.com.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gitblit.transport.ssh;
-
-public class SshContext {
-
-       private final SshDaemonClient client;
-       private final String commandLine;
-
-       public SshContext(SshDaemonClient client, String commandLine) {
-               this.client = client;
-               this.commandLine = commandLine;
-       }
-
-       public SshDaemonClient getClient() {
-               return client;
-       }
-
-       public String getCommandLine() {
-               return commandLine;
-       }
-}

diff --git a/src/main/java/com/gitblit/transport/ssh/commands/BaseCommand.java b/src/main/java/com/gitblit/transport/ssh/commands/BaseCommand.java
index a04c505f4db0ca25fd0bdd999fb640f6e9e07ec3..f7ef2aa30c068b46bb09134ef8956ed588c0e3d7 100644 (file)
--- a/src/main/java/com/gitblit/transport/ssh/commands/BaseCommand.java
+++ b/src/main/java/com/gitblit/transport/ssh/commands/BaseCommand.java
@@ -33,7 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.gitblit.transport.ssh.AbstractSshCommand;
-import com.gitblit.transport.ssh.SshContext;
+import com.gitblit.transport.ssh.SshCommandContext;
 import com.gitblit.utils.IdGenerator;
 import com.gitblit.utils.WorkQueue;
 import com.gitblit.utils.WorkQueue.CancelableRunnable;
@@ -52,7 +52,7 @@ public abstract class BaseCommand extends AbstractSshCommand {
   private String[] argv;
 
   /** Ssh context */
-  protected SshContext ctx;
+  protected SshCommandContext ctx;
 
   /** The task, as scheduled on a worker thread. */
   private final AtomicReference<Future<?>> task;
@@ -66,7 +66,7 @@ public abstract class BaseCommand extends AbstractSshCommand {
     this.executor = w.getDefaultQueue();
   }
 
-  public void setContext(SshContext ctx) {
+  public void setContext(SshCommandContext ctx) {
        this.ctx = ctx;
   }